Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 20 Nov 2002 00:27:46 -0600
From:      Dave Glowacki <dglo@hyde.ssec.wisc.edu>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/45511: MAINTAINER UPDATE: Update Makefile for java/jakarta-regexp
Message-ID:  <200211200627.gAK6RkK23543@hyde.ssec.wisc.edu>

next in thread | raw e-mail | index | archive | help

>Number:         45511
>Category:       ports
>Synopsis:       MAINTAINER UPDATE: Update Makefile for java/jakarta-regexp
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Nov 19 22:30:01 PST 2002
>Closed-Date:
>Last-Modified:
>Originator:     Dave Glowacki
>Release:        FreeBSD 4.7-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD eusebius.glowacki.org 4.7-PRERELEASE FreeBSD 4.7-PRERELEASE #1: Fri Sep 6 16:22:07 CDT 2002 dglo@eusebius.glowacki.org:/usr/src/sys/compile/EUSEBIUS i386


	
>Description:
	I've cleaned up the Makefiles on all the Java ports I maintain
	so that they're all as identical as possible.
>How-To-Repeat:
>Fix:

Remove java/jakarta-regexp/pkg-plist and apply this patch.

diff -ru java/jakarta-regexp/Makefile java/jakarta-regexp/Makefile
--- java/jakarta-regexp/Makefile	Wed Nov 13 17:20:17 2002
+++ java/jakarta-regexp/Makefile	Tue Nov 19 23:44:56 2002
@@ -7,31 +7,47 @@
 PORTNAME=	jakarta-regexp
 PORTVERSION=	1.2
 CATEGORIES=	java
-MASTER_SITES=	http://jakarta.apache.org/builds/jakarta-regexp/release/v${PORTVERSION}/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
+MASTER_SITES=	http://jakarta.apache.org/builds/${PORTNAME}/release/v${PORTVERSION}/
 
 MAINTAINER=	dglo@ssec.wisc.edu
 
-BUILD_DEPENDS=	${JAVA_HOME}/bin/javac:${PORTSDIR}/java/jdk12
-RUN_DEPENDS=	${JAVA_HOME}/bin/java:${PORTSDIR}/java/jdk12
+BUILD_DEPENDS=	${LOCALBASE}/bin/ant:${PORTSDIR}/devel/jakarta-ant
 
-JAVA_HOME?=	${LOCALBASE}/jdk1.2.2
+USE_JAVA=	1.2+
+NEED_JAVAC=	YES
+
+PLIST=	${WRKDIR}/PLIST
+
+JAVALIBNAME=	${PORTNAME}-${PORTVERSION}
+APIDOCSDIR=	${DOCSDIR}/${JAVALIBNAME}
+
+pre-install:
+	@${RM} -f ${PLIST}
+	@${TOUCH} ${PLIST}
 
 do-build:
-	@cd ${WRKSRC}/build && PATH=$$PATH:${JAVA_HOME}/bin JAVA_HOME=${JAVA_HOME} ${SH} build-regexp.sh package
+	@cd ${WRKSRC}/build && \
+		${SETENV} PATH=$$PATH:${JAVA_HOME}/bin JAVA_HOME=${JAVA_HOME} sh build-regexp.sh package
+
+do-install: do-install-jar do-install-apidocs
 
-do-install:
-	@${MKDIR} ${PREFIX}/share/java/classes
-	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-${PORTVERSION}.jar ${LOCALBASE}/share/java/classes/${PORTNAME}.jar
+do-install-jar:
+	@${MKDIR} ${JAVAJARDIR}
+	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-${PORTVERSION}.jar ${JAVAJARDIR}/${PORTNAME}.jar
+	@${ECHO} ${JAVAJARDIR}/${PORTNAME}.jar | \
+		${SED} "s,${PREFIX}/*,," >> ${PLIST}
+	@${ECHO} "@unexec ${RMDIR} ${JAVAJARDIR} 2>/dev/null || true" | \
+		${SED} "s,${PREFIX}/*,," >> ${PLIST}
 
-post-install:
+do-install-apidocs:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/${PORTNAME}
-	@(cd ${WRKSRC}/docs/api && ${TAR} -c -f - .) \
-		| (cd ${PREFIX}/share/doc/${PORTNAME} && ${TAR} --unlink -x -f -)
-	@${CHOWN} -h -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/${PORTNAME} 
-	@(cd ${PREFIX} \
-		&& find share/doc/${PORTNAME} -type f -print >> ${TMPPLIST})
+	@${MKDIR} ${APIDOCSDIR}
+	@${CP} -r ${WRKSRC}/docs/api/* ${APIDOCSDIR}
+	@${CHOWN} -h -R ${SHAREOWN}:${SHAREGRP} ${APIDOCSDIR}
+	@${FIND} ${APIDOCSDIR} -type f -print | \
+		${SED} "s,${PREFIX}/*,," >> ${PLIST}
+	@${FIND} ${APIDOCSDIR} -type d -print | sort -r | \
+		${SED} -e "s,${PREFIX}/*,," -e "s,^,@dirrm ,g" >> ${PLIST}
 .endif
 
-.include <bsd.port.mk> END-of-jakarta-regexp/Makefile
+.include <bsd.port.mk>
diff -ru java/jakarta-regexp/pkg-descr java/jakarta-regexp/pkg-descr
--- java/jakarta-regexp/pkg-descr	Sun Nov 25 05:49:30 2001
+++ java/jakarta-regexp/pkg-descr	Tue Nov 19 20:18:10 2002
@@ -1,3 +1,3 @@
 A 100% Pure Java Regular Expression package by Jonathan Locke.
 
-WWW: http://jakarta.apache.org/regexp/
+WWW: http://jakarta.apache.org/regexp/
>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




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