Date: Fri, 7 Sep 2001 04:30:01 -0700 (PDT) From: Maxim Sobolev <sobomax@FreeBSD.org> To: freebsd-ports@FreeBSD.org Subject: Re: ports/30367: Updated port: java/linux-jdk13 (1.3.1_01) Message-ID: <200109071130.f87BU1o32490@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/30367; it has been noted by GNATS. From: Maxim Sobolev <sobomax@FreeBSD.org> To: Cyrille Lefevre <clefevre@citeweb.net> Cc: FreeBSD-gnats-submit@FreeBSD.org, kevlo@FreeBSD.org Subject: Re: ports/30367: Updated port: java/linux-jdk13 (1.3.1_01) Date: Fri, 07 Sep 2001 14:24:14 +0300 This is a multi-part message in MIME format. --------------D5AECF2E14AFA780F9057EA6 Content-Type: text/plain; charset=koi8-r Content-Transfer-Encoding: 7bit Cyrille Lefevre wrote: > System: FreeBSD gits 4.4-RC FreeBSD 4.4-RC #29: Sat Aug 25 14:49:20 CEST 2001 root@gits:/disk2/4.x-stable/src/sys/compile/CUSTOM i386 > > >Description: > Sun's JDK has been bumped to 1.3.1_01. > > Makefile > JDK_VERSION bumped to 1.3.1_01. > IGNORE message enhanced. > target actions made quiet. > > distinfo > updated. > > pkg-plist > LICENSE.fr deleted. > > files/patch-aa > files/patch-ab > deleted. There are two problems with this update: 1. It changes name of the installation directory, which is not good because it necessitates update of several other ports that depend on linux-jdk13. Also it breaks currently existing rules for naming of jdk installation directory (i.e. foo-jdkX.Y.Z). 2. It make package version number incompatible with FreeBSD naming conventions. Specifically, `_' at the end of version number is reserved for FreeBSD specific revisions, not vendor ones. Therefore the name should be 1.3.1.01 instead. See attached patches that fix those two problems. -Maxim --------------D5AECF2E14AFA780F9057EA6 Content-Type: text/plain; charset=koi8-r; name="linux-jdk13.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="linux-jdk13.diff" ? 30367 ? pr-patch Index: Makefile =================================================================== RCS file: /home/ncvs/ports/java/linux-jdk13/Makefile,v retrieving revision 1.9 diff -d -u -r1.9 Makefile --- Makefile 2001/08/29 15:40:55 1.9 +++ Makefile 2001/09/07 08:01:12 @@ -6,11 +6,11 @@ # PORTNAME= jdk -PORTVERSION= ${JDK_VERSION} +PORTVERSION= ${JDK_VERSION}.${JDK_REVISION} CATEGORIES= java devel MASTER_SITES= # PKGNAMEPREFIX= linux- -DISTNAME= j2sdk-${JDK_VERSION:S/./_/g}-linux-${ARCH} +DISTNAME= j2sdk-${JDK_VERSION:S/./_/g}_${JDK_REVISION}-linux-${ARCH} EXTRACT_SUFX= .bin MAINTAINER= kevlo@FreeBSD.org @@ -29,12 +29,13 @@ EXTRACT_BEFORE_ARGS= # empty EXTRACT_AFTER_ARGS= # empty -WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION} +WRKSRC= ${WRKDIR}/${PORTNAME}${JDK_VERSION}_${JDK_REVISION} PLIST_SUB+= T=${TARGET_DIR:S/^${PREFIX}\///} NO_BUILD= yes USE_LINUX= yes JDK_VERSION= 1.3.1 +JDK_REVISION= 01 ONLY_FOR_ARCHS= i386 TARGET_DIR?= ${PREFIX}/${PKGBASE}${PORTVERSION} DOWNLOAD_URL?= http://java.sun.com/j2se/1.3/download-linux.html @@ -42,18 +43,21 @@ .include <bsd.port.pre.mk> .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE=You must manually fetch the Java 2 Development Kit ${JDK_VERSION} for Linux archive (${DISTNAME}${EXTRACT_SUFX}) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again +IGNORE= You must manually fetch the Java 2 Development Kit ${JDK_VERSION} \ + for Linux archive (${DISTNAME}${EXTRACT_SUFX}) from ${DOWNLOAD_URL}, \ + choose the "GUNZIP Tar shell script one" and place it in ${DISTDIR} \ + and then run make again .endif post-fetch: @${CHMOD} +x ${DISTDIR}/${DISTFILES} post-patch: - find ${WRKSRC} -name '*.orig' -print | xargs ${RM} -f + @find ${WRKSRC} -name '*.orig' -print | xargs ${RM} -f do-install: - ${MKDIR} ${PREFIX}/${PKGNAMEPREFIX}jdk${JDK_VERSION} - ${TAR} -C ${WRKSRC} -cf- . | ${TAR} -C ${PREFIX}/${PKGNAMEPREFIX}jdk${JDK_VERSION} -xpf- - ${LOCALBASE}/bin/registervm "${PREFIX}/linux-jdk${JDK_VERSION}/bin/java # Linux-JDK${JDK_VERSION}" + @${MKDIR} ${PREFIX}/${PKGNAMEPREFIX}jdk${JDK_VERSION} + @${TAR} -C ${WRKSRC} -cf- . | ${TAR} -C ${PREFIX}/${PKGNAMEPREFIX}jdk${JDK_VERSION} -xpf- + @${LOCALBASE}/bin/registervm "${PREFIX}/linux-jdk${JDK_VERSION}/bin/java # Linux-JDK${JDK_VERSION}" .include <bsd.port.post.mk> Index: distinfo =================================================================== RCS file: /home/ncvs/ports/java/linux-jdk13/distinfo,v retrieving revision 1.5 diff -d -u -r1.5 distinfo --- distinfo 2001/06/01 15:28:28 1.5 +++ distinfo 2001/09/07 08:01:12 @@ -1 +1 @@ -MD5 (j2sdk-1_3_1-linux-i386.bin) = c76ea483213796e2a12109dff6b73e3a +MD5 (j2sdk-1_3_1_01-linux-i386.bin) = b6fd1d4a267045841239b9c3ca4a7dbf Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/java/linux-jdk13/pkg-plist,v retrieving revision 1.8 diff -d -u -r1.8 pkg-plist --- pkg-plist 2001/06/26 02:21:22 1.8 +++ pkg-plist 2001/09/07 08:01:12 @@ -126,7 +126,6 @@ %%T%%/jre/CHANGES %%T%%/jre/COPYRIGHT %%T%%/jre/LICENSE -%%T%%/jre/LICENSE.fr %%T%%/jre/Welcome.html %%T%%/jre/README %%T%%/jre/plugin/i386/ns600/libjavaplugin_oji.so @@ -761,7 +760,6 @@ %%T%%/COPYRIGHT %%T%%/README.html %%T%%/LICENSE -%%T%%/LICENSE.fr %%T%%/README %%T%%/man/man1/appletviewer.1 %%T%%/man/man1/extcheck.1 --------------D5AECF2E14AFA780F9057EA6-- 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?200109071130.f87BU1o32490>