diff options
| author | sobomax <sobomax@FreeBSD.org> | 2002-01-09 23:12:57 +0000 |
|---|---|---|
| committer | sobomax <sobomax@FreeBSD.org> | 2002-01-09 23:12:57 +0000 |
| commit | ae216246b4301bc07381567b56e05343fb5e7d3a (patch) | |
| tree | 22e70960ef4dc28c8265b4589a9ee42cad4806ce | |
| parent | 54bda53b740ac357917d3508de3e4f2a57cb7d29 (diff) | |
| download | FreeBSD-ports-ae216246b4301bc07381567b56e05343fb5e7d3a.zip FreeBSD-ports-ae216246b4301bc07381567b56e05343fb5e7d3a.tar.gz | |
Rework optional dependency mechanism, so it's always produces -gnome version
of package on the bento.
| -rw-r--r-- | x11-wm/sawfish/Makefile | 10 | ||||
| -rw-r--r-- | x11-wm/sawfish2/Makefile | 10 |
2 files changed, 12 insertions, 8 deletions
diff --git a/x11-wm/sawfish/Makefile b/x11-wm/sawfish/Makefile index b8d81c2..2f2fdbf 100644 --- a/x11-wm/sawfish/Makefile +++ b/x11-wm/sawfish/Makefile @@ -32,18 +32,20 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LIBS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= ${ARCH}-pc-freebsd${OSREL:C/\..*//} +.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) +.undef WITHOUT_GNOME +WITH_GNOME= yes +.endif + .include <bsd.port.pre.mk> -.if defined(HAVE_GNOME) || defined(PACKAGE_BUILDING) -.undef WITHOUT_GNOME +.if defined(HAVE_GNOME) USE_GNOME= yes CONFIGURE_ARGS+=--enable-capplet -PLIST_SUB+= GNOME:="" .else CONFIGURE_ARGS+=--disable-capplet \ --disable-gnome-widgets \ --without-gdk-pixbuf -PLIST_SUB+= GNOME:="@comment " .endif pre-patch: diff --git a/x11-wm/sawfish2/Makefile b/x11-wm/sawfish2/Makefile index b8d81c2..2f2fdbf 100644 --- a/x11-wm/sawfish2/Makefile +++ b/x11-wm/sawfish2/Makefile @@ -32,18 +32,20 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LIBS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= ${ARCH}-pc-freebsd${OSREL:C/\..*//} +.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) +.undef WITHOUT_GNOME +WITH_GNOME= yes +.endif + .include <bsd.port.pre.mk> -.if defined(HAVE_GNOME) || defined(PACKAGE_BUILDING) -.undef WITHOUT_GNOME +.if defined(HAVE_GNOME) USE_GNOME= yes CONFIGURE_ARGS+=--enable-capplet -PLIST_SUB+= GNOME:="" .else CONFIGURE_ARGS+=--disable-capplet \ --disable-gnome-widgets \ --without-gdk-pixbuf -PLIST_SUB+= GNOME:="@comment " .endif pre-patch: |
