>Number:         36342
>Category:       pkg
>Synopsis:       make gimp respect the aalib and gnome options
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Tue May 15 08:15:00 +0000 2007
>Originator:     Yorick Hardy
>Release:        NetBSD 4.99.16
>Organization:
>Environment:
System: NetBSD yorick 4.99.16 NetBSD 4.99.16 (HPNX6310DRMcurrent) #0: Sun Apr 8 20:20:02 SAST 2007 root@yorick:/var/tmp/build/objcur/sys/arch/i386/compile/HPNX6310DRMcurrent i386
Architecture: i386
Machine: i386
>Description:
gimp does not respect the aalib and gnome options
>How-To-Repeat:
>Fix:
--- graphics/gimp/Makefile.orig	2007-04-27 18:55:30.000000000 +0200
+++ graphics/gimp/Makefile	2007-04-30 14:12:22.000000000 +0200
@@ -55,9 +55,20 @@
 PLIST_SUBST+=		TWAIN="@comment "
 .endif
 
+PKG_OPTIONS_VAR=	PKG_OPTIONS.gimp
+PKG_SUPPORTED_OPTIONS=	aalib gnome
+PKG_SUGGESTED_OPTIONS=	aalib gnome
+
+.include "../../mk/bsd.options.mk"
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../graphics/aalib/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Maalib)
+.  include "../../graphics/aalib/buildlink3.mk"
+   PLIST_SUBST+=	AALIB=
+.else
+   PLIST_SUBST+=	AALIB="@comment "
+.endif
 .include "../../graphics/lcms/buildlink3.mk"
 .include "../../graphics/libart2/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
@@ -67,7 +78,12 @@
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../graphics/libwmf/buildlink3.mk"
 .include "../../print/gimp-print-lib/buildlink3.mk"
-.include "../../www/libgtkhtml/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mgnome)
+.  include "../../www/libgtkhtml/buildlink3.mk"
+   PLIST_SUBST+=	GNOME=
+.else
+   PLIST_SUBST+=	GNOME="@comment "
+.endif
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
--- graphics/gimp/buildlink3.mk.orig	2007-04-27 00:48:04.000000000 +0200
+++ graphics/gimp/buildlink3.mk	2007-04-30 14:12:33.000000000 +0200
@@ -18,9 +18,18 @@
 BUILDLINK_PKGSRCDIR.gimp?=	../../graphics/gimp
 .endif	# GIMP_BUILDLINK3_MK
 
+PKG_OPTIONS_VAR=	PKG_OPTIONS.gimp
+PKG_SUPPORTED_OPTIONS=	aalib gnome
+PKG_SUGGESTED_OPTIONS=	aalib gnome
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../graphics/aalib/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Maalib)
+.  include "../../graphics/aalib/buildlink3.mk"
+   PLIST_SUBST+=	AALIB=
+.else
+   PLIST_SUBST+=	AALIB="@comment "
+.endif
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/lcms/buildlink3.mk"
 .include "../../graphics/libart2/buildlink3.mk"
@@ -31,7 +40,12 @@
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../graphics/libwmf/buildlink3.mk"
 .include "../../print/gimp-print-lib/buildlink3.mk"
-.include "../../www/libgtkhtml/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mgnome)
+.  include "../../www/libgtkhtml/buildlink3.mk"
+   PLIST_SUBST+=	GNOME=
+.else
+   PLIST_SUBST+=	GNOME="@comment "
+.endif
 .include "../../x11/gtk2/buildlink3.mk"
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
--- graphics/gimp/PLIST.orig	2007-04-30 13:35:46.000000000 +0200
+++ graphics/gimp/PLIST	2007-04-30 13:40:59.000000000 +0200
@@ -177,7 +177,7 @@
 lib/gimp/2.0/plug-ins/FractalExplorer
 lib/gimp/2.0/plug-ins/Lighting
 lib/gimp/2.0/plug-ins/MapObject
-lib/gimp/2.0/plug-ins/aa
+${AALIB}lib/gimp/2.0/plug-ins/aa
 lib/gimp/2.0/plug-ins/align_layers
 lib/gimp/2.0/plug-ins/animationplay
 lib/gimp/2.0/plug-ins/animoptimize
@@ -243,7 +243,7 @@
 lib/gimp/2.0/plug-ins/guillotine
 lib/gimp/2.0/plug-ins/header
 lib/gimp/2.0/plug-ins/help
-lib/gimp/2.0/plug-ins/helpbrowser
+${GNOME}lib/gimp/2.0/plug-ins/helpbrowser
 lib/gimp/2.0/plug-ins/hot
 lib/gimp/2.0/plug-ins/ifscompose
 lib/gimp/2.0/plug-ins/illusion