2 files changed, 39 insertions, 52 deletions

diff --git a/sysutils/garcon/Makefile b/sysutils/garcon/Makefile
index 95cf170ceffd..2ae247246057 100644
--- a/sysutils/garcon/Makefile
+++ b/sysutils/garcon/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	garcon
 PORTVERSION=	0.2.1
+PORTREVISION=	1
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/xfce/${PORTNAME}/${PORTVERSION:R}
@@ -12,30 +13,18 @@ MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	Xfce 4 essential utilities and scripts
 
 GNU_CONFIGURE=	yes
-USE_BZIP2=	yes
+INSTALL_TARGET=	install-strip
+USES=		gmake libtool pathfix pkgconfig tar:bzip2
 USE_GNOME=	glib20 intltool intlhack
 USE_XFCE=	configenv libutil
-USES=		pathfix pkgconfig gmake
 
-OPTIONS_DEFINE=		DOCS NLS
+OPTIONS_DEFINE=	DOCS NLS
+OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
+DOCS_CONFIGURE_ENABLE=	gtk-doc-html
+DOCS_CONFIGURE_ON=	--with-html-dir=${PREFIX}/share/doc
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-CONFIGURE_ARGS+=--enable-nls
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MDOCS}
-CONFIGURE_ARGS+=--with-html-dir=${PREFIX}/share/gtk-doc/html
-PLIST_SUB+=	APIDOCS=""
-.else
-CONFIGURE_ARGS+=--without-html-dir
-PLIST_SUB+=	APIDOCS="@comment "
-.endif
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=		gettext
 
 .include <bsd.port.mk>
diff --git a/sysutils/garcon/pkg-plist b/sysutils/garcon/pkg-plist
index 16f17fede031..065b47d8541c 100644
--- a/sysutils/garcon/pkg-plist
+++ b/sysutils/garcon/pkg-plist
@@ -14,9 +14,9 @@ include/garcon-1/garcon/garcon-menu-separator.h
 include/garcon-1/garcon/garcon-menu-tree-provider.h
 include/garcon-1/garcon/garcon-menu.h
 include/garcon-1/garcon/garcon.h
-lib/libgarcon-1.la
 lib/libgarcon-1.so
 lib/libgarcon-1.so.0
+lib/libgarcon-1.so.0.0.0
 libdata/pkgconfig/garcon-1.pc
 share/desktop-directories/xfce-accessories.directory
 share/desktop-directories/xfce-development.directory
@@ -32,34 +32,34 @@ share/desktop-directories/xfce-personal.directory
 share/desktop-directories/xfce-screensavers.directory
 share/desktop-directories/xfce-settings.directory
 share/desktop-directories/xfce-system.directory
-%%APIDOCS%%share/gtk-doc/html/garcon/garcon-GarconMenu.html
-%%APIDOCS%%share/gtk-doc/html/garcon/garcon-GarconMenuDirectory.html
-%%APIDOCS%%share/gtk-doc/html/garcon/garcon-GarconMenuElement.html
-%%APIDOCS%%share/gtk-doc/html/garcon/garcon-GarconMenuItem.html
-%%APIDOCS%%share/gtk-doc/html/garcon/garcon-GarconMenuItemCache.html
-%%APIDOCS%%share/gtk-doc/html/garcon/garcon-GarconMenuMerger.html
-%%APIDOCS%%share/gtk-doc/html/garcon/garcon-GarconMenuParser.html
-%%APIDOCS%%share/gtk-doc/html/garcon/garcon-GarconMenuSeparator.html
-%%APIDOCS%%share/gtk-doc/html/garcon/garcon-GarconMenuTreeProvider.html
-%%APIDOCS%%share/gtk-doc/html/garcon/api-index-full.html
-%%APIDOCS%%share/gtk-doc/html/garcon/garcon-Desktop-Environment-Configuration.html
-%%APIDOCS%%share/gtk-doc/html/garcon/garcon-Version-Information.html
-%%APIDOCS%%share/gtk-doc/html/garcon/garcon-garcon-menu-item-pool.html
-%%APIDOCS%%share/gtk-doc/html/garcon/garcon-garcon-menu-node.html
-%%APIDOCS%%share/gtk-doc/html/garcon/garcon-garcon.html
-%%APIDOCS%%share/gtk-doc/html/garcon/garcon-menus.html
-%%APIDOCS%%share/gtk-doc/html/garcon/garcon-miscellaneous.html
-%%APIDOCS%%share/gtk-doc/html/garcon/garcon-parsing.html
-%%APIDOCS%%share/gtk-doc/html/garcon/garcon.devhelp2
-%%APIDOCS%%share/gtk-doc/html/garcon/home.png
-%%APIDOCS%%share/gtk-doc/html/garcon/index.html
-%%APIDOCS%%share/gtk-doc/html/garcon/index.sgml
-%%APIDOCS%%share/gtk-doc/html/garcon/left.png
-%%APIDOCS%%share/gtk-doc/html/garcon/object-tree.html
-%%APIDOCS%%share/gtk-doc/html/garcon/pt01.html
-%%APIDOCS%%share/gtk-doc/html/garcon/right.png
-%%APIDOCS%%share/gtk-doc/html/garcon/style.css
-%%APIDOCS%%share/gtk-doc/html/garcon/up.png
+%%PORTDOCS%%%%DOCSDIR%%/garcon-GarconMenu.html
+%%PORTDOCS%%%%DOCSDIR%%/garcon-GarconMenuDirectory.html
+%%PORTDOCS%%%%DOCSDIR%%/garcon-GarconMenuElement.html
+%%PORTDOCS%%%%DOCSDIR%%/garcon-GarconMenuItem.html
+%%PORTDOCS%%%%DOCSDIR%%/garcon-GarconMenuItemCache.html
+%%PORTDOCS%%%%DOCSDIR%%/garcon-GarconMenuMerger.html
+%%PORTDOCS%%%%DOCSDIR%%/garcon-GarconMenuParser.html
+%%PORTDOCS%%%%DOCSDIR%%/garcon-GarconMenuSeparator.html
+%%PORTDOCS%%%%DOCSDIR%%/garcon-GarconMenuTreeProvider.html
+%%PORTDOCS%%%%DOCSDIR%%/api-index-full.html
+%%PORTDOCS%%%%DOCSDIR%%/garcon-Desktop-Environment-Configuration.html
+%%PORTDOCS%%%%DOCSDIR%%/garcon-Version-Information.html
+%%PORTDOCS%%%%DOCSDIR%%/garcon-garcon-menu-item-pool.html
+%%PORTDOCS%%%%DOCSDIR%%/garcon-garcon-menu-node.html
+%%PORTDOCS%%%%DOCSDIR%%/garcon-garcon.html
+%%PORTDOCS%%%%DOCSDIR%%/garcon-menus.html
+%%PORTDOCS%%%%DOCSDIR%%/garcon-miscellaneous.html
+%%PORTDOCS%%%%DOCSDIR%%/garcon-parsing.html
+%%PORTDOCS%%%%DOCSDIR%%/garcon.devhelp2
+%%PORTDOCS%%%%DOCSDIR%%/home.png
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/index.sgml
+%%PORTDOCS%%%%DOCSDIR%%/left.png
+%%PORTDOCS%%%%DOCSDIR%%/object-tree.html
+%%PORTDOCS%%%%DOCSDIR%%/pt01.html
+%%PORTDOCS%%%%DOCSDIR%%/right.png
+%%PORTDOCS%%%%DOCSDIR%%/style.css
+%%PORTDOCS%%%%DOCSDIR%%/up.png
 %%NLS%%share/locale/ar/LC_MESSAGES/garcon.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/garcon.mo
 %%NLS%%share/locale/bn/LC_MESSAGES/garcon.mo
@@ -119,9 +119,7 @@ share/desktop-directories/xfce-system.directory
 %%NLS%%@dirrmtry share/locale/nb_NO
 %%NLS%%@dirrmtry share/locale/kk/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/kk
-%%APIDOCS%%@dirrm share/gtk-doc/html/garcon
-%%APIDOCS%%@dirrmtry share/gtk-doc/html
-%%APIDOCS%%@dirrmtry share/gtk-doc
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm share/desktop-directories
 @dirrm include/garcon-1/garcon
 @dirrm include/garcon-1