diff options
| author | glewis <glewis@FreeBSD.org> | 2011-05-09 08:50:20 +0000 |
|---|---|---|
| committer | glewis <glewis@FreeBSD.org> | 2011-05-09 08:50:20 +0000 |
| commit | f26ea946248feeaf8284a7668531820b3e953c5d (patch) | |
| tree | ce1e3d98d482db84d074aa199b85fc8aed2304f6 | |
| parent | 8be6c21bf703421a351c169ee0c5d4e4486a2239 (diff) | |
| download | FreeBSD-ports-f26ea946248feeaf8284a7668531820b3e953c5d.zip FreeBSD-ports-f26ea946248feeaf8284a7668531820b3e953c5d.tar.gz | |
. Fix the build after the openmotif port upgrade:
. Add xft to USE_XORG [1]
. Teach the appropriate Makefile where to look for the FreeType headers.
. Bumping PORTREVISION for paranoia's sake since I have some concerns about
runtime linkage issues with regards to this. Normally that wouldn't be
necessary but I think we're better being safe here.
Submitted by: Mikhail Tsatsenko <m.tsatsenko@gmail.com> [1]
| -rw-r--r-- | java/jdk15/Makefile | 7 | ||||
| -rw-r--r-- | java/jdk15/files/patch-j2se-motif21-Makefile | 15 |
2 files changed, 19 insertions, 3 deletions
diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile index 2c5b510..6b938a9 100644 --- a/java/jdk15/Makefile +++ b/java/jdk15/Makefile @@ -7,7 +7,7 @@ PORTNAME= jdk PORTVERSION= ${JDK_VERSION}.${JDK_UPDATE_VERSION}p${JDK_PATCHSET_VERSION} -PORTREVISION= 13 +PORTREVISION= 14 PORTEPOCH= 1 CATEGORIES= java devel MASTER_SITES= # http://download.java.net/tiger/ @@ -124,7 +124,7 @@ LIB_DEPENDS= nspr4.1:$(PORTSDIR)/devel/nspr ONLY_FOR_ARCHS= i386 amd64 USE_GMAKE= YES USE_ICONV= YES -USE_XORG+= x11 xext xi xmu xp xt xtst +USE_XORG+= x11 xext xi xmu xp xt xtst xft RESTRICTED= Redistribution of pre-compiled binaries is not permitted NO_CDROM= Redistribution of pre-compiled binaries is not permitted @@ -182,7 +182,8 @@ PTHREAD_FILES= ../../hotspot/build/bsd/makefiles/vm.make \ ../../j2se/make/jpda/transport/socket/Makefile \ ../../j2se/make/sun/cmm/Makefile \ ../../j2se/make/sun/xawt/Makefile -X11_FILES= ../../j2se/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java \ +X11_FILES= ../../j2se/make/sun/motif21/Makefile \ + ../../j2se/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java \ ../../j2se/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java # Check for JDK sources and patch file diff --git a/java/jdk15/files/patch-j2se-motif21-Makefile b/java/jdk15/files/patch-j2se-motif21-Makefile new file mode 100644 index 0000000..bcbe5f6 --- /dev/null +++ b/java/jdk15/files/patch-j2se-motif21-Makefile @@ -0,0 +1,15 @@ +$FreeBSD$ + +--- ../../j2se/make/sun/motif21/Makefile.orig 2008-05-28 00:06:43.000000000 -0700 ++++ ../../j2se/make/sun/motif21/Makefile 2011-05-08 23:39:31.000000000 -0700 +@@ -19,6 +19,10 @@ + + ifdef BUILD_MOTIF21 + include $(BUILDDIR)/sun/awt/mawt.gmk ++ ++ ifeq ($(PLATFORM), bsd) ++ OTHER_INCLUDES += -I%%LOCALBASE%%/include/freetype2 ++ endif + else + all optimized debug clean clobber :: + # do nothing case if older OS and new motif 2.1 not found in the boot dir |
