update to 0.1.7

PR:		ports/156448
Submitted by:	Olivier Duchateau <duchateau.olivier@gmail.com>

3 files changed, 111 insertions, 89 deletions

diff --git a/sysutils/garcon/Makefile b/sysutils/garcon/Makefile
index 95425438f8e3..40608e6e6de9 100644
--- a/sysutils/garcon/Makefile
+++ b/sysutils/garcon/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	garcon
-PORTVERSION=	0.1.5
+PORTVERSION=	0.1.7
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=/src/xfce/${PORTNAME}/${PORTVERSION:R}
@@ -15,12 +15,33 @@ DIST_SUBDIR=	xfce4
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 essential utilities and scripts
 
+USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack gnometarget gtk20 intltool intlhack pkgconfig
+USE_GNOME=	gnomehack glib20 intltool intlhack pkgconfig
 USE_XFCE=	configenv
 
-.include <bsd.port.mk>
+OPTIONS=	NLS	"Enable Native Language Support"	on \
+		APIDOCS	"Install api documentation"		off
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
+PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.endif
+
+.if defined(WITHOUT_APIDOCS)
+CONFIGURE_ARGS+=--without-html-dir
+PLIST_SUB+=	APIDOCS="@comment "
+.else
+CONFIGURE_ARGS+=--with-html-dir=${PREFIX}/share/gtk-doc/html
+PLIST_SUB+=	APIDOCS=""
+.endif
 
+.include <bsd.port.post.mk>
diff --git a/sysutils/garcon/distinfo b/sysutils/garcon/distinfo
index 9177199ed20d..29f68eab8eed 100644
--- a/sysutils/garcon/distinfo
+++ b/sysutils/garcon/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/garcon-0.1.5.tar.bz2) = 7fba95705d25255b7f3993640388562a0bebae0afdd9537f8ce6623a23b340f5
-SIZE (xfce4/garcon-0.1.5.tar.bz2) = 428938
+SHA256 (xfce4/garcon-0.1.7.tar.bz2) = bd4531e7669b253ba430986e858054fde72273e3e280f6259c900510f54901cc
+SIZE (xfce4/garcon-0.1.7.tar.bz2) = 417430
diff --git a/sysutils/garcon/pkg-plist b/sysutils/garcon/pkg-plist
index f2e09c044744..c37344ee9956 100644
--- a/sysutils/garcon/pkg-plist
+++ b/sysutils/garcon/pkg-plist
@@ -32,89 +32,90 @@ share/desktop-directories/xfce-science.directory
 share/desktop-directories/xfce-screensavers.directory
 share/desktop-directories/xfce-settings.directory
 share/desktop-directories/xfce-system.directory
-share/gtk-doc/html/garcon/GarconMenu.html
-share/gtk-doc/html/garcon/GarconMenuDirectory.html
-share/gtk-doc/html/garcon/GarconMenuElement.html
-share/gtk-doc/html/garcon/GarconMenuItem.html
-share/gtk-doc/html/garcon/GarconMenuItemCache.html
-share/gtk-doc/html/garcon/GarconMenuMerger.html
-share/gtk-doc/html/garcon/GarconMenuParser.html
-share/gtk-doc/html/garcon/GarconMenuSeparator.html
-share/gtk-doc/html/garcon/GarconMenuTreeProvider.html
-share/gtk-doc/html/garcon/api-index-full.html
-share/gtk-doc/html/garcon/garcon-Desktop-Environment-Configuration.html
-share/gtk-doc/html/garcon/garcon-Version-Information.html
-share/gtk-doc/html/garcon/garcon-garcon-menu-item-pool.html
-share/gtk-doc/html/garcon/garcon-garcon-menu-node.html
-share/gtk-doc/html/garcon/garcon-garcon.html
-share/gtk-doc/html/garcon/garcon-menus.html
-share/gtk-doc/html/garcon/garcon-miscellaneous.html
-share/gtk-doc/html/garcon/garcon-parsing.html
-share/gtk-doc/html/garcon/garcon.devhelp
-share/gtk-doc/html/garcon/garcon.devhelp2
-share/gtk-doc/html/garcon/home.png
-share/gtk-doc/html/garcon/index.html
-share/gtk-doc/html/garcon/index.sgml
-share/gtk-doc/html/garcon/left.png
-share/gtk-doc/html/garcon/object-tree.html
-share/gtk-doc/html/garcon/pt01.html
-share/gtk-doc/html/garcon/right.png
-share/gtk-doc/html/garcon/style.css
-share/gtk-doc/html/garcon/up.png
-share/locale/ar/LC_MESSAGES/garcon.mo
-share/locale/he/LC_MESSAGES/garcon.mo
-share/locale/nb/LC_MESSAGES/garcon.mo
-share/locale/ro/LC_MESSAGES/garcon.mo
-share/locale/bn/LC_MESSAGES/garcon.mo
-share/locale/ca/LC_MESSAGES/garcon.mo
-share/locale/cs/LC_MESSAGES/garcon.mo
-share/locale/da/LC_MESSAGES/garcon.mo
-share/locale/de/LC_MESSAGES/garcon.mo
-share/locale/el/LC_MESSAGES/garcon.mo
-share/locale/en_GB/LC_MESSAGES/garcon.mo
-share/locale/es/LC_MESSAGES/garcon.mo
-share/locale/eu/LC_MESSAGES/garcon.mo
-share/locale/fi/LC_MESSAGES/garcon.mo
-share/locale/fr/LC_MESSAGES/garcon.mo
-share/locale/gl/LC_MESSAGES/garcon.mo
-share/locale/hr/LC_MESSAGES/garcon.mo
-share/locale/hu/LC_MESSAGES/garcon.mo
-share/locale/id/LC_MESSAGES/garcon.mo
-share/locale/it/LC_MESSAGES/garcon.mo
-share/locale/ja/LC_MESSAGES/garcon.mo
-share/locale/kk/LC_MESSAGES/garcon.mo
-share/locale/ku/LC_MESSAGES/garcon.mo
-share/locale/lt/LC_MESSAGES/garcon.mo
-share/locale/lv/LC_MESSAGES/garcon.mo
-share/locale/nb_NO/LC_MESSAGES/garcon.mo
-share/locale/nl/LC_MESSAGES/garcon.mo
-share/locale/pa/LC_MESSAGES/garcon.mo
-share/locale/pl/LC_MESSAGES/garcon.mo
-share/locale/pt/LC_MESSAGES/garcon.mo
-share/locale/pt_BR/LC_MESSAGES/garcon.mo
-share/locale/pt_PT/LC_MESSAGES/garcon.mo
-share/locale/ru/LC_MESSAGES/garcon.mo
-share/locale/sq/LC_MESSAGES/garcon.mo
-share/locale/sv/LC_MESSAGES/garcon.mo
-share/locale/tr/LC_MESSAGES/garcon.mo
-share/locale/ug/LC_MESSAGES/garcon.mo
-share/locale/uk/LC_MESSAGES/garcon.mo
-share/locale/ur/LC_MESSAGES/garcon.mo
-share/locale/zh_CN/LC_MESSAGES/garcon.mo
-share/locale/zh_TW/LC_MESSAGES/garcon.mo
-@dirrmtry share/locale/ur/LC_MESSAGES
-@dirrmtry share/locale/ur
-@dirrmtry share/locale/ug/LC_MESSAGES
-@dirrmtry share/locale/ug
-@dirrmtry share/locale/nb_NO/LC_MESSAGES
-@dirrmtry share/locale/nb_NO
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/kk/LC_MESSAGES
-@dirrmtry share/locale/kk
-@dirrm share/gtk-doc/html/garcon
-@dirrmtry share/gtk-doc/html
-@dirrmtry share/gtk-doc
+%%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.devhelp
+%%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
+%%NLS%%share/locale/ar/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/he/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/bn/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/da/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/de/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/el/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/es/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/id/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/it/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/ku/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/nb_NO/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/pa/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/pt_PT/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/ur/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/garcon.mo
+%%NLS%%@dirrmtry share/locale/ur/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ur
+%%NLS%%@dirrmtry share/locale/ug/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ug
+%%NLS%%@dirrmtry share/locale/nb_NO/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/nb_NO
+%%NLS%%@dirrmtry share/locale/ku/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ku
+%%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
 @dirrm share/desktop-directories
 @dirrm include/garcon-1/garcon
 @dirrm include/garcon-1