Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 02 Dec 2003 21:31:03 -0600
From:      Dave Glowacki <dglo@glowacki.dyndns.org>
To:        Greg Lewis <glewis@FreeBSD.org>
Cc:        freebsd-ports-bugs@FreeBSD.org
Subject:   Re: ports/59187: Maintainer update: java/java-checkstyle 
Message-ID:  <200312030331.hB33V3kG007142@glowacki.dyndns.org>
In-Reply-To: Your message of "Tue, 18 Nov 2003 12:30:59 PST." <200311182030.hAIKUxD9091341@freefall.freebsd.org> 

next in thread | previous in thread | raw e-mail | index | archive | help
> Synopsis: Maintainer update: java/java-checkstyle
> 
> State-Changed-From-To: open->feedback
> State-Changed-By: glewis
> State-Changed-When: Tue Nov 18 12:28:08 PST 2003
> State-Changed-Why: 
> Dave, as it is the PR breaks the packing list since the packing list
> contains the port version (checkstyle-3.1) currently.  Can you please
> submit an updated patch which addresses this?

Hmmm ... not sure why the pkg-plist is still there.  It can be
deleted.

> Also, why are you placing the docs in a subdirectory of DOCSDIR instead
> of just DOCSDIR?  This doesn't seem to provide any benefits since one
> can only have one version of the port installed at once.  You might want
> to consider using the new PORTDOCS macro to do the documentation too,
> see databases/mysql-connector-java for an example.

I tried following what was done in mysql-connector-java.
Does this look better?

diff -ru java-checkstyle.old/Makefile java-checkstyle/Makefile
--- java-checkstyle.old/Makefile	Wed Jul 23 09:30:27 2003
+++ java-checkstyle/Makefile	Tue Dec  2 20:00:16 2003
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	checkstyle
-PORTVERSION=	3.1
+PORTVERSION=	3.2
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -24,9 +24,13 @@
 PLIST=	${WRKDIR}/PLIST
 
 JAVALIBNAME=	${PORTNAME}-${PORTVERSION}
-APIDOCSDIR=	${DOCSDIR}/${JAVALIBNAME}
+APIDOCSDIR=	${DOCSDIR}/javadoc
 STYLEDIR=	${JAVASHAREDIR}/${PORTNAME}
 
+.if !defined(NOPORTDOCS)
+PORTDOCS=	*
+.endif
+
 pre-install:
 	@${RM} -f ${PLIST}
 	@${TOUCH} ${PLIST}
@@ -41,6 +45,9 @@
 	@${MKDIR} ${JAVAJARDIR}
 	@${INSTALL_DATA} ${WRKSRC}/target/dist/${PORTNAME}-${PORTVERSION}/${PORTNAME}-all-${PORTVERSION}.jar ${JAVAJARDIR}/${PORTNAME}.jar
 	@${ECHO} ${JAVAJARDIR}/${PORTNAME}.jar | \
+		${SED} "s,${PREFIX}/*,," >> ${PLIST}
+	@${INSTALL_DATA} ${WRKSRC}/target/dist/${PORTNAME}-${PORTVERSION}/${PORTNAME}-${PORTVERSION}-optional.jar ${JAVAJARDIR}/${PORTNAME}-optional.jar
+	@${ECHO} ${JAVAJARDIR}/${PORTNAME}-optional.jar | \
 		${SED} "s,${PREFIX}/*,," >> ${PLIST}
 	@${ECHO} "@unexec ${RMDIR} ${JAVAJARDIR} 2>/dev/null || true" | \
 		${SED} "s,${PREFIX}/*,," >> ${PLIST}
diff -ru java-checkstyle.old/distinfo java-checkstyle/distinfo
--- java-checkstyle.old/distinfo	Fri Jul 11 02:10:46 2003
+++ java-checkstyle/distinfo	Mon Nov 10 12:58:45 2003
@@ -1 +1 @@
-MD5 (checkstyle-src-3.1.tar.gz) = 4c33e303911cb340b7dcfbf25da611d8
+MD5 (checkstyle-src-3.2.tar.gz) = 8ce757fb53069f2eab098c454cc5b7d5



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200312030331.hB33V3kG007142>