diff options
| author | glewis <glewis@FreeBSD.org> | 2007-08-23 22:54:54 +0800 |
|---|---|---|
| committer | glewis <glewis@FreeBSD.org> | 2007-08-23 22:54:54 +0800 |
| commit | af4815cae13a163167ebcd3211adbd962b4d1516 (patch) | |
| tree | 065d437d2f3ef3f7f3202e26286e206bba0c2e9b /java | |
| parent | 48b73004088ab33dfb16219ff53fb4ea5523c3dc (diff) | |
| download | freebsd-ports-gnome-af4815cae13a163167ebcd3211adbd962b4d1516.tar.gz freebsd-ports-gnome-af4815cae13a163167ebcd3211adbd962b4d1516.tar.zst freebsd-ports-gnome-af4815cae13a163167ebcd3211adbd962b4d1516.zip | |
. Correctly respect WITHOUT_WEB. This should fix the default amd64 build
on 7.x.
Diffstat (limited to 'java')
| -rw-r--r-- | java/jdk16/Makefile | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/java/jdk16/Makefile b/java/jdk16/Makefile index 978bf48cbad1..d57d08b39d87 100644 --- a/java/jdk16/Makefile +++ b/java/jdk16/Makefile @@ -116,9 +116,7 @@ BOOTSTRAPJDKDIR?= ${LOCALBASE}/diablo-jdk1.5.0 BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:${PORTSDIR}/java/diablo-jdk15 -.if defined(WITHOUT_WEB) -MAKE_ENV+= DONT_BUILD_DEPLOY="YES" -.else +.if !defined(WITHOUT_WEB) USE_GNOME= desktopfileutils .endif @@ -161,11 +159,11 @@ MAKE_ENV+= ALT_PARALLEL_BUILD_JOBS="${PARALLEL_BUILD_JOBS}" ALL_TARGET= all PLIST_FILES= jdk${JDK_VERSION}/jre/.systemPrefs/.system.lock \ - jdk${JDK_VERSION}/jre/.systemPrefs/.systemRootModFile \ - share/applications/sun-java16.desktop \ - share/applications/sun-javaws16.desktop + jdk${JDK_VERSION}/jre/.systemPrefs/.systemRootModFile .if !defined(WITHOUT_WEB) -PLIST_FILES+= share/applications/sun-jcontrol16.desktop +PLIST_FILES+= share/applications/sun-java16.desktop \ + share/applications/sun-javaws16.desktop \ + share/applications/sun-jcontrol16.desktop .endif PLIST_DIRS= jdk${JDK_VERSION}/jre/.systemPrefs @@ -311,6 +309,9 @@ post-patch: -e "s:%%JDK_VERSION%%:${JDK_VERSION}:g" \ ${WRKSRC}/$${file}; \ done +.if defined(WITHOUT_WEB) + @${RM} ${WRKDIR}/deploy/make/Makefile +.endif .if defined(WITH_LINUX_BOOTSTRAP) pre-build: @@ -370,12 +371,12 @@ do-install: ${MKDIR} ${PREFIX}/jdk${JDK_VERSION} cd ${JDKIMAGEDIR} && ${FIND} . \ | ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION} +.if !defined(WITHOUT_WEB) ${MKDIR} ${PREFIX}/share/applications ${INSTALL_DATA} ${JDKIMAGEDIR}/jre/lib/desktop/applications/sun-java.desktop \ ${PREFIX}/share/applications/sun-java16.desktop ${INSTALL_DATA} ${JDKIMAGEDIR}/jre/lib/desktop/applications/sun-javaws.desktop \ ${PREFIX}/share/applications/sun-javaws16.desktop -.if !defined(WITHOUT_WEB) ${INSTALL_DATA} ${JDKIMAGEDIR}/jre/lib/desktop/applications/sun_java.desktop \ ${PREFIX}/share/applications/sun-jcontrol16.desktop .endif |