diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2006-10-14 08:54:54 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2006-10-14 08:54:54 +0000 |
| commit | 29747f458a1eb2ce23b4594b09d0256dd62760b8 (patch) | |
| tree | 1b71ba5d9ffdd308b6c18130f7c116f5bab5dc12 /x11-toolkits/swt31/Makefile | |
| parent | 7aad84f808b93baa6a7077ce0b47573b9c4c79a0 (diff) | |
| download | ports-29747f458a1eb2ce23b4594b09d0256dd62760b8.tar.gz ports-29747f458a1eb2ce23b4594b09d0256dd62760b8.zip | |
Chase the GNOME X11BASE to LOCALBASE move, and fix the build with the
new freetype2 where needed.
Submitted by: mezz, ahze, pav, and many others
Approved by: portmgr (implicit, kris)
Notes
Notes:
svn path=/head/; revision=175261
Diffstat (limited to 'x11-toolkits/swt31/Makefile')
| -rw-r--r-- | x11-toolkits/swt31/Makefile | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/x11-toolkits/swt31/Makefile b/x11-toolkits/swt31/Makefile index ec635fe73947..cd97ff2f906b 100644 --- a/x11-toolkits/swt31/Makefile +++ b/x11-toolkits/swt31/Makefile @@ -7,6 +7,7 @@ PORTNAME= swt PORTVERSION= 3.1.1 +PORTREVISION= 1 CATEGORIES= x11-toolkits devel java MASTER_SITES= ${MASTER_SITE_ECLIPSE} MASTER_SITE_SUBDIR= R-${PORTVERSION}-200509290840 @@ -51,15 +52,12 @@ DISTNAME= swt-${PORTVERSION}-gtk-linux-x86 .endif .if !defined(WITHOUT_MOZILLA) +USE_GECKO= firefox mozilla seamonkey xulrunner +.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk" PLIST_FILES+= lib/libswt-mozilla-gtk-%%BUILD%%.so MAKE_MOZILLA= make_mozilla -.if defined(WITH_MOZILLA) && ${WITH_MOZILLA} != "mozilla" -BROWSER= ${WITH_MOZILLA} -BUILD_DEPENDS+= ${BROWSER}:${PORTSDIR}/www/${BROWSER} -.else -BUILD_DEPENDS+= mozilla:${PORTSDIR}/www/mozilla -BROWSER= mozilla -.endif +BROWSER= ${GECKO} +MAKE_ENV+= GECKO_CONFIG="${GECKO_CONFIG}" .else BROWSER= MAKE_MOZILLA= @@ -78,7 +76,8 @@ MAKE_ENV+= BROWSER="${BROWSER}" \ MAKE_GNOME=${MAKE_GNOME} \ MAKE_MOZILLA=${MAKE_MOZILLA} \ MAKE_CAIRO=${MAKE_CAIRO} \ - MACHINE_ARCH=${MACHINE_ARCH} + MACHINE_ARCH=${MACHINE_ARCH} \ + CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" post-extract: @(cd ${WRKSRC} && ${UNZIP_CMD} -qo "*.zip") |