Date: Wed, 13 Mar 2002 20:45:41 +0900 (KST) From: Hye-Shik Chang <perky@fallin.lv> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/35849: Update port: java/linux-ibm-jdk13 Message-ID: <200203131145.g2DBjf833732@kornet.hanirc.org>
next in thread | raw e-mail | index | archive | help
>Number: 35849
>Category: ports
>Synopsis: Update port: java/linux-ibm-jdk13
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed Mar 13 03:50:02 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: Hye-Shik Chang
>Release: FreeBSD 4.5-STABLE i386
>Organization:
Yonsei University
>Environment:
System: FreeBSD kornet.hanirc.org 4.5-STABLE FreeBSD 4.5-STABLE #0: Wed Jan 30 00:21:52 KST 2002 root@kornet.hanirc.org:/home/obj/home/src/sys/HANIRC i386
>Description:
- Update to Service Release 13a : cx130-20020124
- Make Japanese fonts dependency optional.
>How-To-Repeat:
>Fix:
diff -ruN linux-ibm-jdk13.orig/Makefile linux-ibm-jdk13/Makefile
--- linux-ibm-jdk13.orig/Makefile Tue Jan 29 17:16:54 2002
+++ linux-ibm-jdk13/Makefile Wed Mar 13 20:21:50 2002
@@ -7,7 +7,7 @@
PORTNAME= jdk
PORTVERSION= ${JDK_VERSION}
-PORTREVISION= 2 # Service Release 10 : cx130-20010925
+PORTREVISION= 3 # Service Release 13a : cx130-20020124
CATEGORIES= java
MASTER_SITES= #
PKGNAMEPREFIX= linux-ibm-
@@ -16,10 +16,8 @@
MAINTAINER= perky@fallin.lv
-BUILD_DEPENDS= ${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper \
- ${X11BASE}/lib/X11/fonts/TrueType/wadalab-gothic.ttf:${PORTSDIR}/japanese/truetypefonts
-RUN_DEPENDS= ${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper \
- ${X11BASE}/lib/X11/fonts/TrueType/wadalab-gothic.ttf:${PORTSDIR}/japanese/truetypefonts
+BUILD_DEPENDS= ${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper
+RUN_DEPENDS= ${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper
WRKSRC= ${WRKDIR}/${DISTNAME:S/-SDK//}
PLIST_SUB+= TARGET_PREFIX=${TARGET_PREFIX:S/^${PREFIX}\///}
@@ -37,6 +35,14 @@
XARGS= xargs
FIND= find
+.if defined(WITH_JAPANESE_FONTS)
+PLIST_SUB+= JAPANESE=""
+BUILD_DEPENDS+= ${X11BASE}/lib/X11/fonts/TrueType/wadalab-gothic.ttf:${PORTSDIR}/japanese/truetypefonts
+RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/TrueType/wadalab-gothic.ttf:${PORTSDIR}/japanese/truetypefonts
+.else
+PLIST_SUB+= JAPANESE="@comment "
+.endif
+
.if defined(BATCH) || defined(PACKAGE_BUILDING)
IGNORE= "You can not legally distribute binaries"
.endif
@@ -62,7 +68,9 @@
${LOCALBASE}/bin/registervm "${TARGET_PREFIX}/bin/java # IBM-JDK${PORTVERSION}_${PORTREVISION}"
post-install:
+.if defined(WITH_JAPANESE_FONTS)
${LN} -sf ${X11BASE}/lib/X11/fonts/TrueType/wa*ttf ${TARGET_PREFIX}/jre/lib/fonts/
+.endif
@${CAT} ${PKGMESSAGE}
.include <bsd.port.post.mk>
diff -ruN linux-ibm-jdk13.orig/distinfo linux-ibm-jdk13/distinfo
--- linux-ibm-jdk13.orig/distinfo Mon Nov 26 00:17:43 2001
+++ linux-ibm-jdk13/distinfo Wed Mar 13 19:58:35 2002
@@ -1 +1 @@
-MD5 (IBMJava2-SDK-13.tgz) = ba713d6222053efeab545ff030162462
+MD5 (IBMJava2-SDK-13.tgz) = 19fd46052ff99a324cf7e96c03242eb9
diff -ruN linux-ibm-jdk13.orig/pkg-plist linux-ibm-jdk13/pkg-plist
--- linux-ibm-jdk13.orig/pkg-plist Fri Dec 28 00:17:25 2001
+++ linux-ibm-jdk13/pkg-plist Wed Mar 13 20:19:15 2002
@@ -120,6 +120,8 @@
%%TARGET_PREFIX%%/jre/lib/fonts/fonts.scale
%%TARGET_PREFIX%%/jre/lib/fonts/fonts.dir
@unexec rm %B/*.orig
+%%JAPANESE%%@unexec rm %%TARGET_PREFIX%%/jre/lib/fonts/wa*ttf
+%%JAPANESE%%@exec ln -sf %%X11BASE%%/lib/X11/fonts/TrueType/wa*ttf %%TARGET_PREFIX%%/jre/lib/fonts/
%%TARGET_PREFIX%%/jre/lib/fonts/Thoni___.ttf
%%TARGET_PREFIX%%/jre/lib/fonts/Thonburi.ttf
%%TARGET_PREFIX%%/jre/lib/fonts/Thonbi__.ttf
@@ -140,8 +142,6 @@
%%TARGET_PREFIX%%/jre/lib/fonts/Courtbi_.ttf
%%TARGET_PREFIX%%/jre/lib/fonts/Courtb__.ttf
%%TARGET_PREFIX%%/jre/lib/fonts/Court___.ttf
-@unexec rm %B/wa*ttf
-@exec ln -sf %%X11BASE%%/lib/X11/fonts/TrueType/wa*ttf %B/
%%TARGET_PREFIX%%/jre/lib/font.properties.zh_TW.2.2.18-2
%%TARGET_PREFIX%%/jre/lib/font.properties.zh_TW
%%TARGET_PREFIX%%/jre/lib/font.properties.zh.2.2.18-2
>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?200203131145.g2DBjf833732>