From f8994d9a0b78d135ad889f2ab2cb08681bbc5ae6 Mon Sep 17 00:00:00 2001 From: Maxim Sobolev Date: Wed, 9 Jan 2002 23:12:57 +0000 Subject: Rework optional dependency mechanism, so it's always produces -gnome version of package on the bento. --- x11-wm/sawfish/Makefile | 10 ++++++---- x11-wm/sawfish2/Makefile | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) (limited to 'x11-wm') diff --git a/x11-wm/sawfish/Makefile b/x11-wm/sawfish/Makefile index b8d81c277e25..2f2fdbf72a45 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 -.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 b8d81c277e25..2f2fdbf72a45 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 -.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: -- cgit v1.2.3