diff options
| author | pat <pat@FreeBSD.org> | 2002-03-23 16:49:59 +0800 |
|---|---|---|
| committer | pat <pat@FreeBSD.org> | 2002-03-23 16:49:59 +0800 |
| commit | f8370b0b7648aed0d267de6d7bbc0a14631c0fa6 (patch) | |
| tree | 9ddad69d5dbeffa01ffebf8d5a9c8b839ef2d0c3 | |
| parent | e3ecd504adaef9e77bec4dd2c74a2c38a1ffd5fd (diff) | |
| download | freebsd-ports-gnome-f8370b0b7648aed0d267de6d7bbc0a14631c0fa6.tar.gz freebsd-ports-gnome-f8370b0b7648aed0d267de6d7bbc0a14631c0fa6.tar.zst freebsd-ports-gnome-f8370b0b7648aed0d267de6d7bbc0a14631c0fa6.zip | |
- Update to Service Release 13a : cx130-20020124
- Make Japanese fonts dependency optional.
PR: 35849
Submitted by: maintainer
| -rw-r--r-- | java/linux-ibm-jdk13/Makefile | 18 | ||||
| -rw-r--r-- | java/linux-ibm-jdk13/distinfo | 2 | ||||
| -rw-r--r-- | java/linux-ibm-jdk13/pkg-plist | 4 |
3 files changed, 16 insertions, 8 deletions
diff --git a/java/linux-ibm-jdk13/Makefile b/java/linux-ibm-jdk13/Makefile index 833fd42dd458..81b6bcc4a61c 100644 --- a/java/linux-ibm-jdk13/Makefile +++ b/java/linux-ibm-jdk13/Makefile @@ -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 @@ EXTRACT_SUFX= .tgz 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 @@ RESTRICTED= "Redistribution of repackaged binaries not permitted" 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 @@ do-install: ${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 --git a/java/linux-ibm-jdk13/distinfo b/java/linux-ibm-jdk13/distinfo index 9a217ebab677..93333d0f883f 100644 --- a/java/linux-ibm-jdk13/distinfo +++ b/java/linux-ibm-jdk13/distinfo @@ -1 +1 @@ -MD5 (IBMJava2-SDK-13.tgz) = ba713d6222053efeab545ff030162462 +MD5 (IBMJava2-SDK-13.tgz) = 19fd46052ff99a324cf7e96c03242eb9 diff --git a/java/linux-ibm-jdk13/pkg-plist b/java/linux-ibm-jdk13/pkg-plist index c35c9e87644c..30b9d5af5fbb 100644 --- a/java/linux-ibm-jdk13/pkg-plist +++ b/java/linux-ibm-jdk13/pkg-plist @@ -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 |