3 files changed, 31 insertions, 49 deletions

diff --git a/net-p2p/gtk-gnutella/Makefile b/net-p2p/gtk-gnutella/Makefile
index 8fd190c43c75..0f28b7c2a4eb 100644
--- a/net-p2p/gtk-gnutella/Makefile
+++ b/net-p2p/gtk-gnutella/Makefile
@@ -33,8 +33,7 @@
 #
 
 PORTNAME=	gtk-gnutella
-PORTVERSION=	1.0.1
-PORTREVISION=	2
+PORTVERSION=	1.1.0
 CATEGORIES=	net-p2p ipv6
 MASTER_SITES=	SF
 
@@ -43,24 +42,18 @@ COMMENT=	GTK based Gnutella client
 
 LICENSE=	GPLv2 # (or later)
 
-OPTIONS_DEFINE=	GUI TLS NLS IPV6 DBUS DEBUG PORTABILITY
-OPTIONS_DEFAULT=GUI TLS
-OPTIONS_SUB=	yes
-PORTABILITY_DESC=	Use the PATH variable at run-time
-
-ONLY_FOR_ARCHS=	i386 amd64
-
 USES=		iconv perl5 pkgconfig tar:bzip2
 USE_GNOME=	glib20 libxml2
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	Configure
 CONFIGURE_ARGS=	-O -Dyacc='byacc' \
-		-Dprefix=${STAGEDIR}${PREFIX} \
-		-Dprivlib=${STAGEDIR}${DATADIR} \
-		-Dmansrc=${STAGEDIR}${MANPREFIX}/man/man1 \
-		-Dlocale=${PREFIX}/share/locale \
+		-Dprefix='${PREFIX}' \
+		-Dprivlib='${DATADIR}' \
+		-Dmansrc='${MANPREFIX}/man/man1' \
+		-Dlocale='${PREFIX}/share/locale' \
 		-Dcc='${CC}' -Doptimize='${CFLAGS}' \
 		-Dccflags='${CPPFLAGS}' -Dldflags='${LDFLAGS}'
+MAKE_ARGS=	INSTALL_PREFIX="${STAGEDIR}"
 INSTALL_TARGET=	install install.man
 MAKE_JOBS_UNSAFE=	yes
 
@@ -69,47 +62,33 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_SUB=	ARCH="${ARCH}" OPSYS="${OPSYS:tl}"
 
+ONLY_FOR_ARCHS=	i386 amd64
+
+OPTIONS_DEFINE=		DBUS DEBUG GUI IPV6 NLS PORTABILITY TLS
+OPTIONS_DEFAULT=	GUI TLS
+OPTIONS_SUB=		yes
+
+DBUS_LIB_DEPENDS=	libdbus.so:${PORTSDIR}/devel/dbus
+DBUS_CONFIGURE_OFF=	-Ud_dbus
+DEBUG_CONFIGURE_ON=	-Ud_official
+GUI_USE=		gnome=gtk20
+GUI_CONFIGURE_OFF=	-Dd_headless
+IPV6_CONFIGURE_OFF=	-Ud_ipv6
+NLS_USES=		gettext
+NLS_CONFIGURE_OFF=	-Ud_nls
+PORTABILITY_DESC=	Use the PATH variable at run-time
+PORTABILITY_CONFIGURE_ON=	-Dd_portable
+TLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+TLS_CONFIGURE_OFF=	-Ud_gnutls
+
 .include <bsd.port.options.mk>
 
 .if !defined(INTERACTIVE_CONFIGURE)
 CONFIGURE_ARGS+=	-ders
 .endif
 
-.if ${PORT_OPTIONS:MDEBUG}
-CONFIGURE_ARGS+=	-Ud_official
-.endif
-
 .if ${PORT_OPTIONS:MGUI}
-USE_GNOME+=		gtk20
 INSTALLS_ICONS=	yes
-.else
-CONFIGURE_ARGS+=	-Dd_headless
-.endif
-
-.if ${PORT_OPTIONS:MPORTABILITY}
-CONFIGURE_ARGS+=	-Dd_portable
-.endif
-
-.if ${PORT_OPTIONS:MTLS}
-LIB_DEPENDS+=		libgnutls.so:${PORTSDIR}/security/gnutls
-.else
-CONFIGURE_ARGS+=	-Ud_gnutls
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-.else
-CONFIGURE_ARGS+=	-Ud_nls
-.endif
-
-.if empty(PORT_OPTIONS:MIPV6)
-CONFIGURE_ARGS+=	-Ud_ipv6
-.endif
-
-.if ${PORT_OPTIONS:MDBUS}
-LIB_DEPENDS+=		libdbus.so:${PORTSDIR}/devel/dbus
-.else
-CONFIGURE_ARGS+=	-Ud_dbus
 .endif
 
 post-patch:
diff --git a/net-p2p/gtk-gnutella/distinfo b/net-p2p/gtk-gnutella/distinfo
index fc899efe5111..9ccd0e08ff61 100644
--- a/net-p2p/gtk-gnutella/distinfo
+++ b/net-p2p/gtk-gnutella/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gtk-gnutella-1.0.1.tar.bz2) = 0f54871782afac7f55f214597bf7162926081f12b3488b13187562dcc5fc0f04
-SIZE (gtk-gnutella-1.0.1.tar.bz2) = 19010641
+SHA256 (gtk-gnutella-1.1.0.tar.bz2) = cb033d14b647c3a45c6731b94aaa8ed32729ff6aa31f82e372397cd75869f9e9
+SIZE (gtk-gnutella-1.1.0.tar.bz2) = 19399321
diff --git a/net-p2p/gtk-gnutella/pkg-plist b/net-p2p/gtk-gnutella/pkg-plist
index 6914db2f1a9c..d238da8f399a 100644
--- a/net-p2p/gtk-gnutella/pkg-plist
+++ b/net-p2p/gtk-gnutella/pkg-plist
@@ -1,5 +1,6 @@
 bin/gtk-gnutella
 man/man1/gtk-gnutella.1.gz
+share/appdata/gtk-gnutella.appdata.xml
 share/applications/gtk-gnutella.desktop
 %%DATADIR%%/%%ARCH%%-%%OPSYS%%/gtk-gnutella.nm
 %%DATADIR%%/bogons.txt
@@ -9,6 +10,7 @@ share/applications/gtk-gnutella.desktop
 %%DATADIR%%/fr/FAQ
 %%DATADIR%%/geo-ip.txt
 %%DATADIR%%/geo-ipv6.txt
+%%DATADIR%%/gwcache.boot
 %%DATADIR%%/hostiles.txt
 %%DATADIR%%/ja/FAQ
 %%DATADIR%%/pixmaps/arrow_down.xpm
@@ -92,5 +94,6 @@ share/pixmaps/gtk-gnutella.svg
 @dirrm %%DATADIR%%/fr
 @dirrm %%DATADIR%%/en
 @dirrm %%DATADIR%%/el
-@dirrm %%DATADIR%%/%%ARCH%%-%%OPSYS%%
+@dirrm %%DATADIR%%/%%ARCH%%-freebsd
 @dirrm %%DATADIR%%
+@dirrmtry share/appdata