diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2006-12-11 17:10:52 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2006-12-11 17:10:52 +0000 |
| commit | 1bb6af069e9022e2ed0f01e23ed25541d5f47c3a (patch) | |
| tree | 0c0e900d08b155640ddec294ebc33fb7d514ec0a /java/jdk16/Makefile | |
| parent | - Respect X11BASE (diff) | |
. Replace some hardwired /usr/X11R6 instances with X11BASE. [1]
. Replace some hardwired /usr/local instances with LOCALBASE.
. Small Makefile restructure to keep related variables in one place.
. Add ipv6 to CATEGORIES if its enabled. [2]
PR: 106130 [2]
Submitted by: Janos Mohacsi <janos.mohacsi@bsd.hu> [2]
Pointed out by: pointyhat (via kris) [1]
Notes
Notes:
svn path=/head/; revision=179502
Diffstat (limited to 'java/jdk16/Makefile')
| -rw-r--r-- | java/jdk16/Makefile | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/java/jdk16/Makefile b/java/jdk16/Makefile index 680b1f6df1f2..0d57f11c6c56 100644 --- a/java/jdk16/Makefile +++ b/java/jdk16/Makefile @@ -66,6 +66,10 @@ LINUX_BOOTSTRAP_JDKS= ${LOCALBASE}/linux-sun-jdk1.4.2 .include <bsd.port.pre.mk> +.if defined(WITH_IPV6) +CATEGORIES+= ipv6 +.endif + .if defined(WITH_POLICY) DISTFILES+= ${POLICYFILE} EXTRACT_ONLY+= ${POLICYFILE} @@ -147,6 +151,7 @@ HOTSPOTARCH=i586 JDKIMAGEDIR= ${WRKSRC}/../build/bsd-${HOTSPOTARCH}/j2sdk-image JDKIMAGEDIR_G= ${WRKSRC}/../build/bsd-${HOTSPOTARCH}/j2sdk-debug-image +LOCAL_FILES= ../../hotspot/src/os/bsd/vm/os_bsd.cpp PTHREAD_FILES= ../../hotspot/build/bsd/makefiles/vm.make \ ../../j2se/make/com/sun/java/pack/Makefile \ ../../j2se/make/common/Defs.gmk \ @@ -158,8 +163,9 @@ PTHREAD_FILES= ../../hotspot/build/bsd/makefiles/vm.make \ ../../j2se/make/jpda/transport/socket/Makefile \ ../../j2se/make/sun/cmm/Makefile \ ../../j2se/make/sun/xawt/Makefile - -LD_LIBRARY_PATH_FILES= ../../hotspot/src/os/bsd/vm/os_bsd.cpp +X11_FILES= ../../j2se/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java \ + ../../j2se/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java \ + ../../j2se/src/solaris/native/sun/awt/fontpath.c # Check for JDK sources and patch file .if !defined(PACKAGE_BUILDING) && (!exists(${DISTDIR}/${SCSL_SRCFILE}) || !exists(${DISTDIR}/${SCSL_BINFILE}) || (defined(WITH_POLICY) && !exists(${DISTDIR}/${POLICYFILE})) || !exists(${DISTDIR}/${PATCHSETFILE}))#{ @@ -231,7 +237,7 @@ pre-patch: ${PATCH} -p0 < ${WRKDIR}/jdk15.patches post-patch: - @for file in ${LD_LIBRARY_PATH_FILES}; do \ + @for file in ${LOCAL_FILES}; do \ ${REINPLACE_CMD} -e "s:%%LOCALBASE%%:${LOCALBASE}:" \ ${WRKSRC}/$${file}; \ done @@ -239,6 +245,10 @@ post-patch: ${REINPLACE_CMD} -e "s:-pthread:${PTHREAD_LIBS}:g" \ ${WRKSRC}/$${file}; \ done + @for file in ${X11_FILES}; do \ + ${REINPLACE_CMD} -e "s:%%X11BASE%%:${X11BASE}:" \ + ${WRKSRC}/$${file}; \ + done ${REINPLACE_CMD} -e "s:%%PREFIX%%:${PREFIX}:g" \ -e "s:%%JDK_VERSION%%:${JDK_VERSION}:g"\ ${WRKSRC}/../../deploy/src/plugin/solaris/controlpanel/sun_java.desktop |