From owner-freebsd-java@FreeBSD.ORG Wed Apr 28 13:10:18 2004 Return-Path: Delivered-To: freebsd-java@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A72C716A4D2 for ; Wed, 28 Apr 2004 13:10:18 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5F39743D58 for ; Wed, 28 Apr 2004 13:10:12 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i3SKACaR026482 for ; Wed, 28 Apr 2004 13:10:12 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i3SKACiZ026480; Wed, 28 Apr 2004 13:10:12 -0700 (PDT) (envelope-from gnats) Resent-Date: Wed, 28 Apr 2004 13:10:12 -0700 (PDT) Resent-Message-Id: <200404282010.i3SKACiZ026480@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-java@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Dave Glowacki Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EA9E316A4CE for ; Wed, 28 Apr 2004 13:02:53 -0700 (PDT) Received: from glowacki.dyndns.org (mdsnwi13-vlan436-33.dsl.tds.net [66.222.30.33]) by mx1.FreeBSD.org (Postfix) with ESMTP id 741FD43D1D for ; Wed, 28 Apr 2004 13:02:53 -0700 (PDT) (envelope-from dglo@glowacki.dyndns.org) Received: from glowacki.dyndns.org (localhost [127.0.0.1]) by glowacki.dyndns.org (8.12.11/8.12.11) with ESMTP id i3SK2nwj094562 for ; Wed, 28 Apr 2004 15:02:49 -0500 (CDT) (envelope-from dglo@glowacki.dyndns.org) Received: (from dglo@localhost) by glowacki.dyndns.org (8.12.11/8.12.11/Submit) id i3SK2nCE094561; Wed, 28 Apr 2004 15:02:49 -0500 (CDT) (envelope-from dglo) Message-Id: <200404282002.i3SK2nCE094561@glowacki.dyndns.org> Date: Wed, 28 Apr 2004 15:02:49 -0500 (CDT) From: Dave Glowacki To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: java/66061: Maintainer update for java/jakarta-regexp X-BeenThere: freebsd-java@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Dave Glowacki List-Id: Porting Java to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Apr 2004 20:10:18 -0000 >Number: 66061 >Category: java >Synopsis: Maintainer update for java/jakarta-regexp >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-java >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Apr 28 13:10:12 PDT 2004 >Closed-Date: >Last-Modified: >Originator: Dave Glowacki >Release: FreeBSD 4.9-STABLE i386 >Organization: >Environment: System: FreeBSD glowacki.dyndns.org 4.9-STABLE FreeBSD 4.9-STABLE #16: Mon Mar 22 12:45:10 CST 2004 dglo@glowacki.dyndns.org:/usr/obj/usr/src/sys/EUSEBIUS i386 >Description: Fix things to work with the latest version of bsd.java.mk, and finish converting to a dynamically generated plist. >How-To-Repeat: >Fix: Remove jakarta-regexp/pkg-plist diff -ru jakarta-regexp.old/Makefile jakarta-regexp/Makefile --- jakarta-regexp.old/Makefile Sat Jan 24 12:39:00 2004 +++ jakarta-regexp/Makefile Wed Apr 28 14:39:07 2004 @@ -6,6 +6,7 @@ PORTNAME= jakarta-regexp PORTVERSION= 1.3 +PORTREVISION= 1 CATEGORIES= java MASTER_SITES= http://www.apache.org/dist/jakarta/regexp/binaries/ \ http://ftp.epix.net/apache/jakarta/regexp/binaries/ @@ -16,41 +17,39 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/ant:${PORTSDIR}/devel/apache-ant USE_JAVA= 1.2+ -NEED_JAVAC= YES PLIST= ${WRKDIR}/PLIST JAVALIBNAME= ${PORTNAME}-${PORTVERSION} -APIDOCSDIR= ${DOCSDIR}/${JAVALIBNAME} -pre-install: - @${RM} -f ${PLIST} - @${TOUCH} ${PLIST} +.if !defined(NOPORTDOCS) +PORTDOCS= * +.endif do-build: @if [ ! -f ${WRKSRC}/lib ]; then ${MKDIR} ${WRKSRC}/lib; fi @cd ${WRKSRC} && \ ${SETENV} JAVA_HOME=${JAVA_HOME} ant -Djakarta-site2.dir=${WRKSRC} test package +pre-install: + @${RM} -f ${PLIST} + @${TOUCH} ${PLIST} + @${ECHO} ${JAVAJARDIR}/${PORTNAME}.jar | \ + ${SED} "s,${PREFIX}/*,," >> ${PLIST} + @${ECHO} "@unexec ${RMDIR} ${JAVAJARDIR} 2>/dev/null || true" | \ + ${SED} "s,${PREFIX}/*,," >> ${PLIST} + do-install: do-install-jar do-install-apidocs 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} do-install-apidocs: .if !defined(NOPORTDOCS) - @${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} + @${MKDIR} ${DOCSDIR} + @${CP} -r ${WRKSRC}/docs/api/* ${DOCSDIR} + @${CHOWN} -h -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} .endif .include >Release-Note: >Audit-Trail: >Unformatted: