pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/graphics/gimp1-base Convert to options framework.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/dcb974a5c1e8
branches:  trunk
changeset: 494951:dcb974a5c1e8
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Tue May 31 22:26:10 2005 +0000

description:
Convert to options framework.

diffstat:

 graphics/gimp1-base/Makefile   |  18 ++----------------
 graphics/gimp1-base/options.mk |  19 +++++++++++++++++++
 2 files changed, 21 insertions(+), 16 deletions(-)

diffs (67 lines):

diff -r c61e986c3174 -r dcb974a5c1e8 graphics/gimp1-base/Makefile
--- a/graphics/gimp1-base/Makefile      Tue May 31 22:25:20 2005 +0000
+++ b/graphics/gimp1-base/Makefile      Tue May 31 22:26:10 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:05 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/31 22:26:10 wiz Exp $
 #
 
 DISTNAME=              gimp-1.2.5
@@ -24,8 +24,6 @@
 USE_TOOLS+=            gmake
 USE_LIBTOOL=           YES
 
-.include "../../mk/bsd.prefs.mk"
-
 GNU_CONFIGURE=         YES
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=       --disable-perl
@@ -47,7 +45,7 @@
 MAKE_ENV+=             X11BASE=${X11BASE}
 PLIST_SUBST+=          LOCALBASE=${LOCALBASE}
 
-BUILD_DEFS+=           GIMP_WITH_HELPBROWSER
+.include "options.mk"
 
 # Configuration files
 PKG_SYSCONFSUBDIR=     gimp/1.2
@@ -71,16 +69,4 @@
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../multimedia/mpeg-lib/buildlink3.mk"
-.if defined(GIMP_WITH_HELPBROWSER) && ${GIMP_WITH_HELPBROWSER} != "no"
-PLIST_SUBST+=  HELPBROWSER=""
-.include "../../x11/gnome-libs/buildlink3.mk"
-.else
-PLIST_SUBST+=  HELPBROWSER="@comment "
-.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/tiff/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
-.endif
-
 .include "../../mk/bsd.pkg.mk"
diff -r c61e986c3174 -r dcb974a5c1e8 graphics/gimp1-base/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/gimp1-base/options.mk    Tue May 31 22:26:10 2005 +0000
@@ -0,0 +1,19 @@
+# $NetBSD: options.mk,v 1.1 2005/05/31 22:26:10 wiz Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.gimp-base
+PKG_SUPPORTED_OPTIONS= gimp1-helpbrowser
+PKG_OPTIONS_LEGACY_VARS+=      GIMP_WITH_HELPBROWSER:gimp1-helpbrowser
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mgimp1-helpbrowser)
+PLIST_SUBST+=  HELPBROWSER=""
+.include "../../x11/gnome-libs/buildlink3.mk"
+.else
+PLIST_SUBST+=  HELPBROWSER="@comment "
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
+.endif



Home | Main Index | Thread Index | Old Index