1 files changed, 38 insertions, 11 deletions

diff --git a/java/jaf/Makefile b/java/jaf/Makefile
index 4fa357dbb61a..43d71a6c6166 100644
--- a/java/jaf/Makefile
+++ b/java/jaf/Makefile
@@ -7,33 +7,60 @@
 
 PORTNAME=	jaf
 PORTVERSION=	1.0.2
-PORTREVISION=	1
-CATEGORIES=	java
+PORTREVISION=	2
+CATEGORIES=	java devel
 MASTER_SITES=	#
-DISTNAME=	${PORTNAME}-1_0_2
+DISTNAME=	${PORTNAME}-${PORTVERSION:S,.,_,g}-upd
 
 MAINTAINER=	java@freebsd.org
 COMMENT=	JavaBeansTM Activation Framework
 
 USE_ZIP=	YES
-USE_JAVA=	1.1+
+USE_JAVA=	YES
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 NO_BUILD=	yes
 NO_CDROM=	"See the license"
-TARGET_DIR=	${PREFIX}/share/java/${PKGNAME}
-PLIST_SUB+=	T=${TARGET_DIR:S/^${PREFIX}\///}
 DOWNLOAD_URL=	http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22\&PartDetailId=7017-jaf-1.0.2-oth-JPR\&SiteId=JSC\&TransactionId=noreg
 
+.if !defined(NOPORTDOCS)
+DOCFILES1=	JAF-1.0.pdf JAF-1.0.ps javadocs
+DOCFILES2=	LICENSE.txt README.txt RELNOTES.txt
+PORTDOCS=	${DOCFILES1} ${DOCFILES2}
+.endif
+
+PLIST_FILES=	%%JAVAJARDIR%%/activation.jar
+
 .include <bsd.port.pre.mk>
 .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
-IGNORE=	"You must manually fetch the distribution from ${DOWNLOAD_URL} and place it in ${DISTDIR} then run make again"
+IGNORE=		"You must manually fetch the distribution from ${DOWNLOAD_URL} and place it in ${DISTDIR} then run make again"
 .endif
 
 do-install:
-	${MKDIR} ${PREFIX}/share/java/classes
-	${MKDIR} ${TARGET_DIR}
-	${CP} -R ${WRKSRC}/* ${TARGET_DIR}
-	${LN} -sf ${TARGET_DIR}/activation.jar ${PREFIX}/share/java/classes/activation.jar
+	@${ECHO_MSG} -n ">> Installing demo files in ${EXAMPLESDIR}..."
+	@${MKDIR} ${EXAMPLESDIR}
+	@cd ${WRKSRC} && ${FIND} demo \
+	  | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR} > /dev/null 2>&1
+	@${ECHO_MSG} " [ DONE ]"
+	@${ECHO_MSG} -n ">> Installing JAR file as ${JAVAJARDIR}/activation.jar..."
+	@${MKDIR} ${JAVAJARDIR}
+	@${INSTALL_DATA} ${WRKSRC}/activation.jar ${JAVAJARDIR}/
+	@${ECHO_MSG} " [ DONE ]"
+.if !defined(NOPORTDOCS)
+	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
+	@${MKDIR} ${DOCSDIR}
+	@cd ${WRKSRC}/docs && ${FIND} ${DOCFILES1} \
+	  | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} > /dev/null 2>&1
+	@cd ${WRKSRC} && ${FIND} ${DOCFILES2} \
+	  | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} > /dev/null 2>&1
+	@${ECHO_MSG} " [ DONE ]"
+.endif
+
+post-install:
+	@${FIND} -s ${WRKSRC}/demo -not -type d 2>/dev/null \
+	  | ${SED} -ne 's,^${WRKSRC},${EXAMPLESDIR:S,^${PREFIX}/,,},p' >> ${TMPPLIST}
+	@${FIND} -s -d ${WRKSRC}/demo -type d 2>/dev/null \
+	  | ${SED} -ne 's,^${WRKSRC},@dirrm ${EXAMPLESDIR:S,^${PREFIX}/,,},p' >> ${TMPPLIST}
+	@${ECHO_CMD} '@dirrm ${EXAMPLESDIR:S,^${PREFIX}/,,}' >> ${TMPPLIST}
 
 .include <bsd.port.post.mk>