5 files changed, 51 insertions, 62 deletions

diff --git a/net-p2p/gtk-gnutella/Makefile b/net-p2p/gtk-gnutella/Makefile
index 1190fac2eb25..8419b08f88bd 100644
--- a/net-p2p/gtk-gnutella/Makefile
+++ b/net-p2p/gtk-gnutella/Makefile
@@ -24,9 +24,6 @@
 #
 # WITH_DBUS: Enable D-Bus IPC support. No further information available.
 #
-# WITH_SQLITE: Enable to support storage of run-time information to a SQLite
-#       database file. Should ideally save some memory.
-#
 # WITH_DEBUG: Compile with debugging symbols. Useful if you intend to make
 #	a bug report.
 #
@@ -36,8 +33,7 @@
 #
 
 PORTNAME=	gtk-gnutella
-PORTVERSION=	0.98.4
-PORTREVISION=	1
+PORTVERSION=	1.0.1
 CATEGORIES=	net-p2p ipv6
 MASTER_SITES=	SF
 
@@ -46,29 +42,32 @@ COMMENT=	GTK based Gnutella client
 
 LICENSE=	GPLv2 # (or later)
 
-OPTIONS_DEFINE=	GUI TLS NLS IPV6 DBUS SQLITE DEBUG PORTABILITY
+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
 
-NO_STAGE=	yes
 USE_BZIP2=	yes
+USES=		iconv perl5 pkgconfig
 USE_GNOME=	glib20 libxml2
-USES=		bison perl5 pkgconfig
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	Configure
-CONFIGURE_ARGS=	-O -Dyacc='bison -y' -Dprefix=${PREFIX} \
-		-Dprivlib=${DATADIR} -Dsysman=${MANPREFIX}/man/man1 \
-		-Dlocale=${PREFIX}/share/locale -Dcc='${CC}' \
-		-Dccflags='${CFLAGS} -I${LOCALBASE}/include' \
-		-Doptimize='undef'
+CONFIGURE_ARGS=	-O -Dyacc='byacc' \
+		-Dprefix=${STAGEDIR}${PREFIX} \
+		-Dprivlib=${STAGEDIR}${DATADIR} \
+		-Dmansrc=${STAGEDIR}${MANPREFIX}/man/man1 \
+		-Dlocale=${PREFIX}/share/locale \
+		-Dcc='${CC}' -Doptimize='${CFLAGS}' \
+		-Dccflags='${CPPFLAGS}' -Dldflags='${LDFLAGS}'
 INSTALL_TARGET=	install install.man
 MAKE_JOBS_UNSAFE=	yes
 
-PLIST_SUB=	ARCH="${ARCH}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
-MAN1=		gtk-gnutella.1
+PLIST_SUB=	ARCH="${ARCH}"
 
 .include <bsd.port.options.mk>
 
@@ -77,51 +76,57 @@ CONFIGURE_ARGS+=	-ders
 .endif
 
 .if ${PORT_OPTIONS:MDEBUG}
-CONFIGURE_ARGS+=	-D optimize=-g  -D official=false
-.else
-CONFIGURE_ARGS+=	-D official=true
+CONFIGURE_ARGS+=	-Ud_official
 .endif
 
 .if ${PORT_OPTIONS:MGUI}
 USE_GNOME+=		gtk20
-CONFIGURE_ARGS+=	-D gtkversion=2
+INSTALLS_ICONS=	yes
 .else
-CONFIGURE_ARGS+=	-D d_headless
+CONFIGURE_ARGS+=	-Dd_headless
 .endif
 
 .if ${PORT_OPTIONS:MPORTABILITY}
-CONFIGURE_ARGS+=	-D d_portable
+CONFIGURE_ARGS+=	-Dd_portable
 .endif
 
 .if ${PORT_OPTIONS:MTLS}
-LIB_DEPENDS+=		gnutls:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=		libgnutls.so:${PORTSDIR}/security/gnutls
 .else
-CONFIGURE_ARGS+=	-U d_gnutls
+CONFIGURE_ARGS+=	-Ud_gnutls
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
 USES+=		gettext
-CONFIGURE_ARGS+=	-D d_nls
-PLIST_SUB+=		NLS=""
 .else
-CONFIGURE_ARGS+=	-U d_nls
-PLIST_SUB+=		NLS="@comment "
+CONFIGURE_ARGS+=	-Ud_nls
 .endif
 
 .if empty(PORT_OPTIONS:MIPV6)
-CONFIGURE_ARGS+=	-D ipv6=false
+CONFIGURE_ARGS+=	-Ud_ipv6
 .endif
 
 .if ${PORT_OPTIONS:MDBUS}
-LIB_DEPENDS+=		dbus:${PORTSDIR}/devel/dbus
+LIB_DEPENDS+=		libdbus.so:${PORTSDIR}/devel/dbus
 .else
-CONFIGURE_ARGS+=	-U d_dbus
+CONFIGURE_ARGS+=	-Ud_dbus
 .endif
 
-.if ${PORT_OPTIONS:MSQLITE}
-USE_SQLITE=		yes
-.else
-CONFIGURE_ARGS+=	-U d_sqlite
+post-patch:
+	@${FIND} ${WRKSRC} -name "Makefile.SH" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|@exit 0|@echo done|'
+
+post-install:
+.if ${PORT_OPTIONS:MGUI}
+.for i in 16 32 128 256 512
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps
+	(cd ${WRKSRC}/extra_files && ${INSTALL_DATA} gtk-gnutella.${i}.png \
+		${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps/gtk-gnutella.png)
+.endfor
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
+	(cd ${WRKSRC}/extra_files && ${INSTALL_DATA} gtk-gnutella.svg \
+		${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/gtk-gnutella.svg)
 .endif
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/gtk-gnutella
 
 .include <bsd.port.mk>
diff --git a/net-p2p/gtk-gnutella/distinfo b/net-p2p/gtk-gnutella/distinfo
index f67d64d5ea46..fc899efe5111 100644
--- a/net-p2p/gtk-gnutella/distinfo
+++ b/net-p2p/gtk-gnutella/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gtk-gnutella-0.98.4.tar.bz2) = c4cac5707ece44a92e4b0387e309ca334be348a81e44c2db7f4c9946a8a58fb5
-SIZE (gtk-gnutella-0.98.4.tar.bz2) = 19078172
+SHA256 (gtk-gnutella-1.0.1.tar.bz2) = 0f54871782afac7f55f214597bf7162926081f12b3488b13187562dcc5fc0f04
+SIZE (gtk-gnutella-1.0.1.tar.bz2) = 19010641
diff --git a/net-p2p/gtk-gnutella/files/patch-Configure b/net-p2p/gtk-gnutella/files/patch-Configure
deleted file mode 100644
index 902efd07d18b..000000000000
--- a/net-p2p/gtk-gnutella/files/patch-Configure
+++ /dev/null
@@ -1,14 +0,0 @@
---- Configure	Thu Oct 18 17:02:36 2007
-+++ Configure	Thu Oct 18 17:03:04 2007
-@@ -8678,11 +8678,6 @@
- 	$aptget 'ADVICE: Run "apt-get install zlib1g-dev".' >&4
- fi
- 
--if [ "$iconv" != yes ]; then
--	bailout=yes
--	echo 'ERROR: Cannot find iconv(). Library or header files might be missing.' >&4
--fi
--
- if [ "$frontend" != none ]; then
- case "$d_gtk" in
- "$undef")
diff --git a/net-p2p/gtk-gnutella/files/patch-src__common.h b/net-p2p/gtk-gnutella/files/patch-src__common.h
deleted file mode 100644
index 6d5fd540f0d2..000000000000
--- a/net-p2p/gtk-gnutella/files/patch-src__common.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/common.h.orig	2012-11-12 01:29:34.000000000 +0900
-+++ src/common.h	2012-12-05 16:43:09.000000000 +0900
-@@ -756,7 +756,7 @@
-  * warnings on a wrong __asm__ statement with glib 1.2.  This version
-  * should be as efficient as the one defined by glib.
-  */
--#if HAS_GCC(4, 0)
-+#if HAS_GCC(4, 0) && !defined(__FreeBSD__)
- #define GUINT32_SWAP(x_) \
- 	(IS_CONSTANT(x_) ? GUINT32_SWAP_CONSTANT(x_) : __builtin_bswap32(x_))
- #else
diff --git a/net-p2p/gtk-gnutella/pkg-plist b/net-p2p/gtk-gnutella/pkg-plist
index 9c95834c1b4b..a799a723a672 100644
--- a/net-p2p/gtk-gnutella/pkg-plist
+++ b/net-p2p/gtk-gnutella/pkg-plist
@@ -1,4 +1,5 @@
 bin/gtk-gnutella
+man/man1/gtk-gnutella.1.gz
 share/applications/gtk-gnutella.desktop
 %%DATADIR%%/%%ARCH%%-freebsd/gtk-gnutella.nm
 %%DATADIR%%/bogons.txt
@@ -30,7 +31,7 @@ share/applications/gtk-gnutella.desktop
 %%DATADIR%%/pixmaps/firewall_udp_punchable.xpm
 %%DATADIR%%/pixmaps/freeze.xpm
 %%DATADIR%%/pixmaps/icon.16x16.xpm
-%%DATADIR%%/pixmaps/icon.32x32.xpm
+%%DATADIR%%/pixmaps/icon.48x48.xpm
 %%DATADIR%%/pixmaps/icon.xpm
 %%DATADIR%%/pixmaps/leaf.xpm
 %%DATADIR%%/pixmaps/legacy.xpm
@@ -63,6 +64,12 @@ share/applications/gtk-gnutella.desktop
 %%DATADIR%%/spam.txt
 %%DATADIR%%/spam_sha1.txt
 %%DATADIR%%/tr/FAQ
+%%GUI%%share/icons/hicolor/128x128/apps/gtk-gnutella.png
+%%GUI%%share/icons/hicolor/16x16/apps/gtk-gnutella.png
+%%GUI%%share/icons/hicolor/256x256/apps/gtk-gnutella.png
+%%GUI%%share/icons/hicolor/32x32/apps/gtk-gnutella.png
+%%GUI%%share/icons/hicolor/512x512/apps/gtk-gnutella.png
+%%GUI%%share/icons/hicolor/scalable/apps/gtk-gnutella.svg
 %%NLS%%share/locale/de/LC_MESSAGES/gtk-gnutella.mo
 %%NLS%%share/locale/el/LC_MESSAGES/gtk-gnutella.mo
 %%NLS%%share/locale/es/LC_MESSAGES/gtk-gnutella.mo
@@ -77,6 +84,8 @@ share/applications/gtk-gnutella.desktop
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/gtk-gnutella.mo
 share/pixmaps/gtk-gnutella.png
 share/pixmaps/gtk-gnutella.svg
+%%GUI%%@dirrmtry share/icons/hicolor/512x512/apps
+%%GUI%%@dirrmtry share/icons/hicolor/512x512
 @dirrm %%DATADIR%%/tr
 @dirrm %%DATADIR%%/pixmaps
 @dirrm %%DATADIR%%/ja