svn commit: r398778 - head/devel/gconf2

[Dmitry Marakasov]

Author: amdmi3
Date: Wed Oct  7 18:04:11 2015
New Revision: 398778
URL: https://svnweb.freebsd.org/changeset/ports/398778

Log:
  - Optionize DOCS
  - Switch to options helpers
  
  Approved by:	kwm

Modified:
  head/devel/gconf2/Makefile
  head/devel/gconf2/pkg-plist

Modified: head/devel/gconf2/Makefile
==============================================================================
--- head/devel/gconf2/Makefile	Wed Oct  7 18:04:03 2015	(r398777)
+++ head/devel/gconf2/Makefile	Wed Oct  7 18:04:11 2015	(r398778)
@@ -35,18 +35,13 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
-OPTIONS_DEFINE=	LDAP
+DOCSDIR=	${PREFIX}/share/doc/gconf
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	LDAP DOCS
+OPTIONS_SUB=	yes
 
-.if ${PORT_OPTIONS:MLDAP}
-USE_OPENLDAP=	yes
-CONFIGURE_ARGS+=--with-openldap
-PLIST_SUB+=	LDAP=""
-.else
-CONFIGURE_ARGS+=--without-openldap
-PLIST_SUB+=	LDAP="@comment "
-.endif
+LDAP_USE=		OPENLDAP=yes
+LDAP_CONFIGURE_WITH=	openldap
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/gconf/gconf.xml.system

Modified: head/devel/gconf2/pkg-plist
==============================================================================
--- head/devel/gconf2/pkg-plist	Wed Oct  7 18:04:03 2015	(r398777)
+++ head/devel/gconf2/pkg-plist	Wed Oct  7 18:04:11 2015	(r398778)
@@ -38,27 +38,27 @@ man/man1/gsettings-schema-convert.1.gz
 share/aclocal/gconf-2.m4
 share/dbus-1/system-services/org.gnome.GConf.Defaults.service
 share/dbus-1/services/org.gnome.GConf.service
-share/doc/gconf/ch01.html
-share/doc/gconf/gconf-gconf-backend.html
-share/doc/gconf/gconf-gconf-changeset.html
-share/doc/gconf/gconf-gconf-client.html
-share/doc/gconf/gconf-gconf-engine.html
-share/doc/gconf/gconf-gconf-error.html
-share/doc/gconf/gconf-gconf-internals.html
-share/doc/gconf/gconf-gconf-listeners.html
-share/doc/gconf/gconf-gconf-locale.html
-share/doc/gconf/gconf-gconf-schema.html
-share/doc/gconf/gconf-gconf-sources.html
-share/doc/gconf/gconf-gconf-value.html
-share/doc/gconf/gconf-gconf.html
-share/doc/gconf/gconf.devhelp2
-share/doc/gconf/home.png
-share/doc/gconf/index.html
-share/doc/gconf/index.sgml
-share/doc/gconf/left.png
-share/doc/gconf/right.png
-share/doc/gconf/style.css
-share/doc/gconf/up.png
+%%PORTDOCS%%%%DOCSDIR%%/ch01.html
+%%PORTDOCS%%%%DOCSDIR%%/gconf-gconf-backend.html
+%%PORTDOCS%%%%DOCSDIR%%/gconf-gconf-changeset.html
+%%PORTDOCS%%%%DOCSDIR%%/gconf-gconf-client.html
+%%PORTDOCS%%%%DOCSDIR%%/gconf-gconf-engine.html
+%%PORTDOCS%%%%DOCSDIR%%/gconf-gconf-error.html
+%%PORTDOCS%%%%DOCSDIR%%/gconf-gconf-internals.html
+%%PORTDOCS%%%%DOCSDIR%%/gconf-gconf-listeners.html
+%%PORTDOCS%%%%DOCSDIR%%/gconf-gconf-locale.html
+%%PORTDOCS%%%%DOCSDIR%%/gconf-gconf-schema.html
+%%PORTDOCS%%%%DOCSDIR%%/gconf-gconf-sources.html
+%%PORTDOCS%%%%DOCSDIR%%/gconf-gconf-value.html
+%%PORTDOCS%%%%DOCSDIR%%/gconf-gconf.html
+%%PORTDOCS%%%%DOCSDIR%%/gconf.devhelp2
+%%PORTDOCS%%%%DOCSDIR%%/home.png
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/index.sgml
+%%PORTDOCS%%%%DOCSDIR%%/left.png
+%%PORTDOCS%%%%DOCSDIR%%/right.png
+%%PORTDOCS%%%%DOCSDIR%%/style.css
+%%PORTDOCS%%%%DOCSDIR%%/up.png
 share/gir-1.0/GConf-2.0.gir
 share/locale/am/LC_MESSAGES/GConf2.mo
 share/locale/ar/LC_MESSAGES/GConf2.mo