Date: Sat, 11 Feb 2006 19:44:03 +0100 (CET) From: Jonas Sonntag <jonas@schiebtsich.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Jonas Sonntag <jonas@schiebtsich.net> Subject: ports/93196: [MAINTAINER] net-p2p/gtk-gnutella: update to 0.96 Message-ID: <200602111844.k1BIi3FX027960@elaine.jbhosting.de> Resent-Message-ID: <200602111850.k1BIo84P001359@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 93196
>Category: ports
>Synopsis: [MAINTAINER] net-p2p/gtk-gnutella: update to 0.96
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Feb 11 18:50:07 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Jonas Sonntag
>Release: FreeBSD 6.0-RELEASE-p4 i386
>Organization:
>Environment:
System: FreeBSD elaine.jbhosting.de 6.0-RELEASE-p4 FreeBSD 6.0-RELEASE-p4 #0: Thu Feb 9 15:02:18 CET
>Description:
- Update to 0.96
- respect WITHOUT_NLS
- change default setting of TLS and IPv6 knobs to "on"
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
--- gtk-gnutella-0.96.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net-p2p/gtk-gnutella/Makefile,v
retrieving revision 1.32
diff -u -r1.32 Makefile
--- Makefile 30 Jan 2006 21:36:16 -0000 1.32
+++ Makefile 11 Feb 2006 18:41:52 -0000
@@ -24,8 +24,7 @@
#
PORTNAME= gtk-gnutella
-DISTVERSION= 0.96b
-PORTREVISION= 1
+PORTVERSION= 0.96
CATEGORIES= net-p2p
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://gtk-gnutella.sourceforge.net/download/ \
@@ -47,15 +46,15 @@
-Dprivlib=${PREFIX}/share/gtk-gnutella \
-Dsysman=${PREFIX}/man/man1 -Dlocale=${PREFIX}/share/locale \
-Dcc='${CC}' -Dccflags='${CFLAGS} -I${LOCALBASE}/include' \
- -Doptimize='undef' -Dlibpth='/usr/lib ${LOCALBASE}/lib' \
- -Dd_enablenls='define'
+ -Doptimize='undef' -Dlibpth='/usr/lib ${LOCALBASE}/lib'
MAN1= gtk-gnutella.1
-OPTIONS= GTK2 "Build with gtk2 frontend" on \
- TLS "enable GNU TLS encryption support" off \
- IPV6 "enable IPv6 support" off \
- DBUS "enable DBUS support" off \
+OPTIONS= GTK2 "Build with GTK2 frontend" on \
+ TLS "Enable GNU TLS encryption support" on \
+ NLS "Enable native language support" on \
+ IPV6 "Enable IPv6 support" on \
+ DBUS "Enable D-BUS IPC support" off \
DEBUG "Build with debugging symbols" off \
PORTABILITY "Use the PATH variable at run-time" off
@@ -84,7 +83,24 @@
.if defined(WITH_TLS)
LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls
.else
-CONFIGURE_ARGS+= -Dd_gnutls=undef
+CONFIGURE_ARGS+= -U d_gnutls
+.endif
+
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+= -U d_enablenls
+.else
+CONFIGURE_ARGS+= -D d_enablenls
+LIB_DEPENDS+= intl:${PORTSDIR}/devel/gettext
+PLIST_FILES= share/locale/de/LC_MESSAGES/gtk-gnutella.mo \
+ share/locale/el/LC_MESSAGES/gtk-gnutella.mo \
+ share/locale/es/LC_MESSAGES/gtk-gnutella.mo \
+ share/locale/fr/LC_MESSAGES/gtk-gnutella.mo \
+ share/locale/hu/LC_MESSAGES/gtk-gnutella.mo \
+ share/locale/ja/LC_MESSAGES/gtk-gnutella.mo \
+ share/locale/nb/LC_MESSAGES/gtk-gnutella.mo \
+ share/locale/nl/LC_MESSAGES/gtk-gnutella.mo \
+ share/locale/uk/LC_MESSAGES/gtk-gnutella.mo \
+ share/locale/zh_CN/LC_MESSAGES/gtk-gnutella.mo
.endif
.if !defined(WITH_IPV6)
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/net-p2p/gtk-gnutella/distinfo,v
retrieving revision 1.19
diff -u -r1.19 distinfo
--- distinfo 25 Nov 2005 15:27:11 -0000 1.19
+++ distinfo 11 Feb 2006 18:41:52 -0000
@@ -1,3 +1,3 @@
-MD5 (gtk-gnutella-0.96b.tar.bz2) = 5ecd6baa91a19250217fd6911c6a932f
-SHA256 (gtk-gnutella-0.96b.tar.bz2) = 7190cd2098744e99c88c3d423cb1718fb449ebd88dc217c42adbccab13db56b7
-SIZE (gtk-gnutella-0.96b.tar.bz2) = 2570856
+MD5 (gtk-gnutella-0.96.tar.bz2) = 4e1cd518ac2995f29952274e880cd6ec
+SHA256 (gtk-gnutella-0.96.tar.bz2) = 4dea98e5376908b33838055771008bf7d515197601f22e1419d966e9164f5baf
+SIZE (gtk-gnutella-0.96.tar.bz2) = 2668453
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/net-p2p/gtk-gnutella/pkg-plist,v
retrieving revision 1.12
diff -u -r1.12 pkg-plist
--- pkg-plist 22 Jan 2006 02:45:49 -0000 1.12
+++ pkg-plist 11 Feb 2006 18:41:52 -0000
@@ -41,15 +41,6 @@
%%DATADIR%%/pixmaps/warning.xpm
share/pixmaps/gtk-gnutella.png
share/pixmaps/gtk-gnutella.svg
-share/locale/de/LC_MESSAGES/gtk-gnutella.mo
-share/locale/el/LC_MESSAGES/gtk-gnutella.mo
-share/locale/es/LC_MESSAGES/gtk-gnutella.mo
-share/locale/fr/LC_MESSAGES/gtk-gnutella.mo
-share/locale/ja/LC_MESSAGES/gtk-gnutella.mo
-share/locale/nl/LC_MESSAGES/gtk-gnutella.mo
-share/locale/hu/LC_MESSAGES/gtk-gnutella.mo
-share/locale/uk/LC_MESSAGES/gtk-gnutella.mo
-share/locale/zh_CN/LC_MESSAGES/gtk-gnutella.mo
@dirrmtry share/applications
@dirrm %%DATADIR%%/pixmaps
@dirrm %%DATADIR%%/el
Index: files/patch-gcc2.diff
===================================================================
RCS file: /home/ncvs/ports/net-p2p/gtk-gnutella/files/patch-gcc2.diff,v
retrieving revision 1.1
diff -u -r1.1 patch-gcc2.diff
--- files/patch-gcc2.diff 29 Nov 2005 00:31:46 -0000 1.1
+++ files/patch-gcc2.diff 11 Feb 2006 18:41:52 -0000
@@ -1,52 +1,12 @@
---- src/core/rx_inflate.h.orig Tue Nov 22 22:47:05 2005
-+++ src/core/rx_inflate.h Sat Nov 26 18:15:09 2005
-@@ -46,7 +46,7 @@
- struct rx_inflate_cb {
- void (*add_rx_inflated)(gpointer owner, gint amount);
- void (*inflate_error)(gpointer owner,
-- const gchar *reason, ...) G_GNUC_PRINTF(2, 3);
-+ const gchar *reason, ...) PRINTF_FUNC_PTR(2, 3);
- };
+--- src/lib/override.hoverride.h Mon Feb 6 14:44:46 2006
++++ src/lib/override.h Tue Jan 24 22:18:42 2006
+@@ -91,8 +91,8 @@
+ eject_("\nAssertion failure \"" STRINGIFY(x) "\" in " G_STRLOC "\n"); \
+ } G_STMT_END
- /**
---- src/core/rx_chunk.h.orig Tue Nov 22 22:47:05 2005
-+++ src/core/rx_chunk.h Sat Nov 26 18:15:09 2005
-@@ -45,7 +45,7 @@
- */
- struct rx_chunk_cb {
- void (*chunk_error)(gpointer owner,
-- const gchar *reason, ...) G_GNUC_PRINTF(2, 3);
-+ const gchar *reason, ...) PRINTF_FUNC_PTR(2, 3);
- void (*chunk_end)(gpointer owner);
- };
++#define g_assert_not_reached() \
++ eject_("\nCode should not have been reached in " G_STRLOC "\n"); \
+-#define g_assert_not_reached(x) \
+- eject_("\nCode should not be reached in " G_STRLOC "\n"); \
---- src/core/rx_link.h.orig Tue Nov 22 22:47:05 2005
-+++ src/core/rx_link.h Sat Nov 26 18:15:09 2005
-@@ -46,7 +46,7 @@
- struct rx_link_cb {
- void (*add_rx_given)(gpointer owner, gint amount);
- void (*read_error)(gpointer owner,
-- const gchar *reason, ...) G_GNUC_PRINTF(2, 3);
-+ const gchar *reason, ...) PRINTF_FUNC_PTR(2, 3);
- void (*got_eof)(gpointer owner);
- };
-
---- src/common.h.orig Tue Nov 22 22:47:03 2005
-+++ src/common.h Sat Nov 26 18:15:08 2005
-@@ -366,6 +366,16 @@
- #define NON_NULL_PARAM(x) __attribute__((nonnull x))
- #else /* GCC < 3.3 */
- #define NON_NULL_PARAM(x)
-+#endif
-+
-+/**
-+ * This is the same G_GNUC_FORMAT() but for function pointers. Older versions
-+ * of GCC do not allow function attributes for function pointers.
-+ */
-+#if HAVE_GCC(3, 0)
-+#define PRINTF_FUNC_PTR(x, y) __attribute__((format(printf, (x), (y))))
-+#else /* GCC < 3.0 */
-+#define PRINTF_FUNC_PTR(x, y)
- #endif
-
- /* Functions using this attribute cause a warning if the returned
+ #endif /* FAST_ASSERTIONS */
--- gtk-gnutella-0.96.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200602111844.k1BIi3FX027960>