[PATCH] devel/libgsf: Make gconf2 dependency OPTIONal

[Alexander Botero-Lowry]

>Submitter-Id:	current-users
>Originator:	Alexander Botero-Lowry
>Organization:	
>Confidential:	no 
>Synopsis:	[PATCH] devel/libgsf: Make gconf2 dependency OPTIONal
>Severity:	non-critical
>Priority:	low
>Category:	ports 
>Class:		change-request
>Release:	FreeBSD 6.1-STABLE i386
>Environment:
System: FreeBSD Laptop.mine.box 6.1-STABLE FreeBSD 6.1-STABLE #0: Mon Jun 26 23:51:33 CDT 2006
>Description:
- Make gconf2 dependency an OPTION (default so as not to break POLA)
- Make use of new USE_LDCONFIG macro
- Use DOCSDIR macro

Port maintainer (gnome at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- libgsf-1.14.1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/libgsf/Makefile,v
retrieving revision 1.31
diff -u -r1.31 Makefile
--- Makefile	13 May 2006 07:37:04 -0000	1.31
+++ Makefile	30 Jun 2006 09:40:44 -0000
@@ -25,19 +25,30 @@
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
-INSTALLS_SHLIB=	yes
-USE_GNOME?=	gnomehack glib20 libxml2 gconf2 ltverhack intlhack
+USE_LDCONFIG=	yes
+USE_GNOME?=	gnomehack glib20 libxml2 ltverhack intlhack
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \
 		--disable-gtk-doc --without-gnome --with-bz2 \
-		--mandir=${PREFIX}/man \
-		--with-gconf-source=${GCONF_CONFIG_SOURCE}
+		--mandir=${PREFIX}/man
 CONFIGURE_ENV?=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
+DOCSDIR=	share/doc/gsf
 
-.if !defined(GSF_SLAVE)
-GCONF_SCHEMAS=	gsf-office-thumbnailer.schemas
 MAN1=		gsf-office-thumbnailer.1
+
+OPTIONS=	GCONF "Enable Thumbnailing support (uses gconf2)" on
+
+.if !defined(GSF_SLAVE) && !defined(WITHOUT_GCONF)
+GCONF_SCHEMAS=	gsf-office-thumbnailer.schemas
+.endif
+
+.if !defined(WITHOUT_GCONF)
+USE_GNOME+=	gconf2
+CONFIGURE_ARGS+=	--with-gconf-source=${GCONF_CONFIG_SOURCE}
+PLIST_SUB+=	GNOME=""
+.else
+PLIST_SUB+=	GNOME="@comment "
 .endif
 
 .include <bsd.port.mk>
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/devel/libgsf/pkg-plist,v
retrieving revision 1.18
diff -u -r1.18 pkg-plist
--- pkg-plist	13 May 2006 07:37:04 -0000	1.18
+++ pkg-plist	30 Jun 2006 09:40:44 -0000
@@ -1,4 +1,4 @@
-bin/gsf-office-thumbnailer
+%%GNOME%%bin/gsf-office-thumbnailer
 include/libgsf-1/gsf-win32/gsf-input-win32.h
 include/libgsf-1/gsf-win32/gsf-output-win32.h
 include/libgsf-1/gsf/gsf-blob.h
@@ -48,47 +48,47 @@
 lib/libgsf-1.so
 lib/libgsf-1.so.114
 libdata/pkgconfig/libgsf-1.pc
-share/doc/gsf/GsfClipData.html
-share/doc/gsf/api.html
-share/doc/gsf/dependencies.html
-share/doc/gsf/gsf-Bononbo.html
-share/doc/gsf/gsf-Compression.html
-share/doc/gsf/gsf-GIOChannel.html
-share/doc/gsf/gsf-GnomeVFS.html
-share/doc/gsf/gsf-Infile-reading-structed-files.html
-share/doc/gsf/gsf-Input-from-unstructured-files.html
-share/doc/gsf/gsf-MS-OLE2.html
-share/doc/gsf/gsf-OASIS-Open-Document.html
-share/doc/gsf/gsf-Outfile-writing-structed-files.html
-share/doc/gsf/gsf-Output-to-unstructured-files.html
-share/doc/gsf/gsf-Reading-and-Writing-from-local-files-and-directories.html
-share/doc/gsf/gsf-Text.html
-share/doc/gsf/gsf-XML-and-libxml.html
-share/doc/gsf/gsf-Zip.html
-share/doc/gsf/gsf-blobs.html
-share/doc/gsf/gsf-memory.html
-share/doc/gsf/gsf-metadata.html
-share/doc/gsf/gsf-users.html
-share/doc/gsf/gsf-utils.html
-share/doc/gsf/gsf.devhelp
-share/doc/gsf/gsf.devhelp2
-share/doc/gsf/history.html
-share/doc/gsf/home.png
-share/doc/gsf/index.html
-share/doc/gsf/index.sgml
-share/doc/gsf/intro.html
-share/doc/gsf/io.html
-share/doc/gsf/ix01.html
-share/doc/gsf/left.png
-share/doc/gsf/misc.html
-share/doc/gsf/parsers.html
-share/doc/gsf/right.png
-share/doc/gsf/sources.html
-share/doc/gsf/style.css
-share/doc/gsf/up.png
+%%DOCSDIR%%/GsfClipData.html
+%%DOCSDIR%%/api.html
+%%DOCSDIR%%/dependencies.html
+%%DOCSDIR%%/gsf-Bononbo.html
+%%DOCSDIR%%/gsf-Compression.html
+%%DOCSDIR%%/gsf-GIOChannel.html
+%%DOCSDIR%%/gsf-GnomeVFS.html
+%%DOCSDIR%%/gsf-Infile-reading-structed-files.html
+%%DOCSDIR%%/gsf-Input-from-unstructured-files.html
+%%DOCSDIR%%/gsf-MS-OLE2.html
+%%DOCSDIR%%/gsf-OASIS-Open-Document.html
+%%DOCSDIR%%/gsf-Outfile-writing-structed-files.html
+%%DOCSDIR%%/gsf-Output-to-unstructured-files.html
+%%DOCSDIR%%/gsf-Reading-and-Writing-from-local-files-and-directories.html
+%%DOCSDIR%%/gsf-Text.html
+%%DOCSDIR%%/gsf-XML-and-libxml.html
+%%DOCSDIR%%/gsf-Zip.html
+%%DOCSDIR%%/gsf-blobs.html
+%%DOCSDIR%%/gsf-memory.html
+%%DOCSDIR%%/gsf-metadata.html
+%%DOCSDIR%%/gsf-users.html
+%%DOCSDIR%%/gsf-utils.html
+%%DOCSDIR%%/gsf.devhelp
+%%DOCSDIR%%/gsf.devhelp2
+%%DOCSDIR%%/history.html
+%%DOCSDIR%%/home.png
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/intro.html
+%%DOCSDIR%%/io.html
+%%DOCSDIR%%/ix01.html
+%%DOCSDIR%%/left.png
+%%DOCSDIR%%/misc.html
+%%DOCSDIR%%/parsers.html
+%%DOCSDIR%%/right.png
+%%DOCSDIR%%/sources.html
+%%DOCSDIR%%/style.css
+%%DOCSDIR%%/up.png
 share/locale/es/LC_MESSAGES/libgsf.mo
 share/locale/sv/LC_MESSAGES/libgsf.mo
- at dirrm share/doc/gsf
+ at dirrm %%DOCSDIR%%
 @dirrm include/libgsf-1/gsf-win32
 @dirrm include/libgsf-1/gsf
 @dirrm include/libgsf-1
--- libgsf-1.14.1.patch ends here ---