View | Details | Raw Unified | Return to bug 174202 | Differences between
and this patch

Collapse All | Expand All

(-)net-p2p/gtk-gnutella/Makefile (-57 / +30 lines)
Lines 9-21 Link Here
9
#	FreeBSD guidelines, this mode is useful if you have problems with the
9
#	FreeBSD guidelines, this mode is useful if you have problems with the
10
#	default Configure.
10
#	default Configure.
11
#
11
#
12
# WITH_X11: Disable this to build a headless version of Gtk-Gnutella. The
12
# WITH_GUI: Disable this to build a headless version of Gtk-Gnutella.
13
#       resulting executable won't use or depend on any Gtk version and
13
#       Therefore, monitoring of operations for Gtk-Gnutella will have to be
14
#       Gtk-Gnutella can only be controlled through the remote shell.
14
#       done without relying on any GUI, and the configuration is done via
15
#       Use with caution!
15
#       files only.
16
#
17
# WITH_GTK2: Enable to configure and build with GTK 2, disable to configure and
18
#       build with GTK 1.2. Will be ignored if WITH_X11 is disabled!
19
#
16
#
20
# WITH_TLS: Enable support for scrambling GNet connections. Currently supported
17
# WITH_TLS: Enable support for scrambling GNet connections. Currently supported
21
#       only by Gtk-Gnutella.
18
#       only by Gtk-Gnutella.
Lines 39-72 Link Here
39
#
36
#
40
37
41
PORTNAME=	gtk-gnutella
38
PORTNAME=	gtk-gnutella
42
PORTVERSION=	0.96.9
39
PORTVERSION=	0.98.4
43
PORTREVISION=	2
44
CATEGORIES=	net-p2p ipv6
40
CATEGORIES=	net-p2p ipv6
45
MASTER_SITES=	SF
41
MASTER_SITES=	SF
46
42
47
MAINTAINER=	ports@FreeBSD.org
43
MAINTAINER=	ports@FreeBSD.org
48
COMMENT=	GTK based Gnutella client
44
COMMENT=	GTK based Gnutella client
49
45
50
USE_PERL5=	yes
46
LICENSE=	GPLv2 # (or later)
47
48
OPTIONS_DEFINE=	GUI TLS NLS IPV6 DBUS SQLITE DEBUG PORTABILITY
49
OPTIONS_DEFAULT=GUI TLS
50
PORTABILITY_DESC=	Use the PATH variable at run-time
51
52
ONLY_FOR_ARCHS=	i386 amd64
53
51
USE_BZIP2=	yes
54
USE_BZIP2=	yes
55
USE_GNOME=	glib20 libxml2
56
USE_PERL5=	yes
52
USE_BISON=	build
57
USE_BISON=	build
53
MAKE_JOBS_UNSAFE=	yes
54
USE_GNOME=	libxml2 glib20
55
INSTALL_TARGET=	install install.man
56
HAS_CONFIGURE=	yes
58
HAS_CONFIGURE=	yes
57
CONFIGURE_SCRIPT=	Configure
59
CONFIGURE_SCRIPT=	Configure
58
CONFIGURE_ARGS=	-O -Dyacc='bison -y' -Dprefix=${PREFIX} \
60
CONFIGURE_ARGS=	-O -Dyacc='bison -y' -Dprefix=${PREFIX} \
59
		-Dprivlib=${PREFIX}/share/gtk-gnutella \
61
		-Dprivlib=${DATADIR} -Dsysman=${MANPREFIX}/man/man1 \
60
		-Dsysman=${PREFIX}/man/man1 -Dlocale=${PREFIX}/share/locale \
62
		-Dlocale=${PREFIX}/share/locale -Dcc='${CC}' \
61
		-Dcc='${CC}' -Dccflags='${CFLAGS} -I${LOCALBASE}/include' \
63
		-Dccflags='${CFLAGS} -I${LOCALBASE}/include' \
62
		-Doptimize='undef'
64
		-Doptimize='undef'
63
ONLY_FOR_ARCHS=	i386 amd64
65
INSTALL_TARGET=	install install.man
66
MAKE_JOBS_UNSAFE=	yes
64
67
65
MAN1=		gtk-gnutella.1
68
PLIST_SUB=	ARCH="${ARCH}"
66
69
67
OPTIONS_DEFINE=	X11 GTK2 GNUTLS NLS IPV6 DBUS SQLITE DEBUG PORTABILITY
70
MAN1=		gtk-gnutella.1
68
OPTIONS_DEFAULT=	X11 GTK2 GNUTLS
69
PORTABILITY_DESC=	Use the PATH variable at run-time
70
71
71
.include <bsd.port.options.mk>
72
.include <bsd.port.options.mk>
72
73
Lines 80-94 Link Here
80
CONFIGURE_ARGS+=	-D official=true
81
CONFIGURE_ARGS+=	-D official=true
81
.endif
82
.endif
82
83
83
.if ${PORT_OPTIONS:MX11}
84
.if ${PORT_OPTIONS:MGUI}
84
USE_XORG=		x11
85
.if ${PORT_OPTIONS:MGTK2}
86
CONFIGURE_ARGS+=	-D gtkversion=2
87
USE_GNOME+=		gtk20
85
USE_GNOME+=		gtk20
88
.else
86
CONFIGURE_ARGS+=	-D gtkversion=2
89
CONFIGURE_ARGS+=	-D gtkversion=1
90
USE_GNOME+=		gtk12
91
.endif
92
.else
87
.else
93
CONFIGURE_ARGS+=	-D d_headless
88
CONFIGURE_ARGS+=	-D d_headless
94
.endif
89
.endif
Lines 97-135 Link Here
97
CONFIGURE_ARGS+=	-D d_portable
92
CONFIGURE_ARGS+=	-D d_portable
98
.endif
93
.endif
99
94
100
.if ${PORT_OPTIONS:MGNUTLS}
95
.if ${PORT_OPTIONS:MTLS}
101
LIB_DEPENDS+=		gnutls:${PORTSDIR}/security/gnutls
96
LIB_DEPENDS+=		gnutls:${PORTSDIR}/security/gnutls
102
.else
97
.else
103
CONFIGURE_ARGS+=	-U d_gnutls
98
CONFIGURE_ARGS+=	-U d_gnutls
104
.endif
99
.endif
105
100
106
.if ${PORT_OPTIONS:MNLS}
101
.if ${PORT_OPTIONS:MNLS}
107
CONFIGURE_ARGS+=	-D d_nls
108
USE_GETTEXT=		yes
102
USE_GETTEXT=		yes
109
PLIST_FILES=		share/locale/de/LC_MESSAGES/gtk-gnutella.mo \
103
CONFIGURE_ARGS+=	-D d_nls
110
			share/locale/el/LC_MESSAGES/gtk-gnutella.mo \
104
PLIST_SUB+=		NLS=""
111
			share/locale/es/LC_MESSAGES/gtk-gnutella.mo \
112
			share/locale/fr/LC_MESSAGES/gtk-gnutella.mo \
113
			share/locale/hu/LC_MESSAGES/gtk-gnutella.mo \
114
			share/locale/it/LC_MESSAGES/gtk-gnutella.mo \
115
			share/locale/ja/LC_MESSAGES/gtk-gnutella.mo \
116
			share/locale/nb/LC_MESSAGES/gtk-gnutella.mo \
117
			share/locale/nl/LC_MESSAGES/gtk-gnutella.mo \
118
			share/locale/tr/LC_MESSAGES/gtk-gnutella.mo \
119
			share/locale/uk/LC_MESSAGES/gtk-gnutella.mo \
120
			share/locale/zh_CN/LC_MESSAGES/gtk-gnutella.mo
121
.else
105
.else
122
CONFIGURE_ARGS+=	-U d_nls
106
CONFIGURE_ARGS+=	-U d_nls
107
PLIST_SUB+=		NLS="@comment "
123
.endif
108
.endif
124
109
125
.if ${PORT_OPTIONS:MIPB6}
110
.if empty(PORT_OPTIONS:MIPV6)
126
CONFIGURE_ARGS+=	-D ipv6=false
111
CONFIGURE_ARGS+=	-D ipv6=false
127
.endif
112
.endif
128
113
129
.if ${PORT_OPTIONS:MDBUS}
114
.if ${PORT_OPTIONS:MDBUS}
130
LIB_DEPENDS+=		dbus:${PORTSDIR}/devel/dbus
115
LIB_DEPENDS+=		dbus:${PORTSDIR}/devel/dbus
131
.else
116
.else
132
CONFIGURE_ARGS+=	-D dbus=false
117
CONFIGURE_ARGS+=	-U d_dbus
133
.endif
118
.endif
134
119
135
.if ${PORT_OPTIONS:MSQLITE}
120
.if ${PORT_OPTIONS:MSQLITE}
Lines 138-153 Link Here
138
CONFIGURE_ARGS+=	-U d_sqlite
123
CONFIGURE_ARGS+=	-U d_sqlite
139
.endif
124
.endif
140
125
141
.if ${ARCH} == i386
142
PLIST_SUB+=	I386=""
143
.else
144
PLIST_SUB+=	I386="@comment "
145
.endif
146
147
.if ${ARCH} == amd64
148
PLIST_SUB+=	AMD64=""
149
.else
150
PLIST_SUB+=	AMD64="@comment "
151
.endif
152
153
.include <bsd.port.mk>
126
.include <bsd.port.mk>
(-)net-p2p/gtk-gnutella/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (gtk-gnutella-0.96.9.tar.bz2) = b2f5a5eaa28fb02920d55f6942ad4583402e0cb02e88344a045cf25b62c99c9f
1
SHA256 (gtk-gnutella-0.98.4.tar.bz2) = c4cac5707ece44a92e4b0387e309ca334be348a81e44c2db7f4c9946a8a58fb5
2
SIZE (gtk-gnutella-0.96.9.tar.bz2) = 16669486
2
SIZE (gtk-gnutella-0.98.4.tar.bz2) = 19078172
(-)net-p2p/gtk-gnutella/files/patch-src__common.h (+11 lines)
Line 0 Link Here
1
--- src/common.h.orig	2012-11-12 01:29:34.000000000 +0900
2
+++ src/common.h	2012-12-05 16:43:09.000000000 +0900
3
@@ -756,7 +756,7 @@
4
  * warnings on a wrong __asm__ statement with glib 1.2.  This version
5
  * should be as efficient as the one defined by glib.
6
  */
7
-#if HAS_GCC(4, 0)
8
+#if HAS_GCC(4, 0) && !defined(__FreeBSD__)
9
 #define GUINT32_SWAP(x_) \
10
 	(IS_CONSTANT(x_) ? GUINT32_SWAP_CONSTANT(x_) : __builtin_bswap32(x_))
11
 #else
(-)net-p2p/gtk-gnutella/pkg-plist (-13 / +29 lines)
Lines 1-17 Link Here
1
bin/gtk-gnutella
1
bin/gtk-gnutella
2
share/applications/gtk-gnutella.desktop
2
share/applications/gtk-gnutella.desktop
3
%%DATADIR%%/%%ARCH%%-freebsd/gtk-gnutella.nm
3
%%DATADIR%%/bogons.txt
4
%%DATADIR%%/bogons.txt
5
%%DATADIR%%/el/FAQ
6
%%DATADIR%%/en/FAQ
4
%%DATADIR%%/favicon.png
7
%%DATADIR%%/favicon.png
8
%%DATADIR%%/fr/FAQ
5
%%DATADIR%%/geo-ip.txt
9
%%DATADIR%%/geo-ip.txt
10
%%DATADIR%%/geo-ipv6.txt
6
%%DATADIR%%/hostiles.txt
11
%%DATADIR%%/hostiles.txt
7
%%DATADIR%%/robots.txt
8
%%DATADIR%%/spam.txt
9
%%DATADIR%%/spam_sha1.txt
10
%%DATADIR%%/en/FAQ
11
%%DATADIR%%/el/FAQ
12
%%DATADIR%%/ja/FAQ
12
%%DATADIR%%/ja/FAQ
13
%%I386%%%%DATADIR%%/i386-freebsd/gtk-gnutella.nm
14
%%AMD64%%%%DATADIR%%/amd64-freebsd/gtk-gnutella.nm
15
%%DATADIR%%/pixmaps/arrow_down.xpm
13
%%DATADIR%%/pixmaps/arrow_down.xpm
16
%%DATADIR%%/pixmaps/arrow_up.xpm
14
%%DATADIR%%/pixmaps/arrow_up.xpm
17
%%DATADIR%%/pixmaps/booklib.xpm
15
%%DATADIR%%/pixmaps/booklib.xpm
Lines 39-47 Link Here
39
%%DATADIR%%/pixmaps/magnet.16x16.png
37
%%DATADIR%%/pixmaps/magnet.16x16.png
40
%%DATADIR%%/pixmaps/magnet.32x32.png
38
%%DATADIR%%/pixmaps/magnet.32x32.png
41
%%DATADIR%%/pixmaps/magnet.64x64.png
39
%%DATADIR%%/pixmaps/magnet.64x64.png
40
%%DATADIR%%/pixmaps/natpmp.xpm
42
%%DATADIR%%/pixmaps/no_firewall.xpm
41
%%DATADIR%%/pixmaps/no_firewall.xpm
43
%%DATADIR%%/pixmaps/offline.xpm
42
%%DATADIR%%/pixmaps/offline.xpm
44
%%DATADIR%%/pixmaps/online.xpm
43
%%DATADIR%%/pixmaps/online.xpm
44
%%DATADIR%%/pixmaps/pause.xpm
45
%%DATADIR%%/pixmaps/save.xpm
45
%%DATADIR%%/pixmaps/save.xpm
46
%%DATADIR%%/pixmaps/smallserver.xpm
46
%%DATADIR%%/pixmaps/smallserver.xpm
47
%%DATADIR%%/pixmaps/star-black.xpm
47
%%DATADIR%%/pixmaps/star-black.xpm
Lines 59-72 Link Here
59
%%DATADIR%%/pixmaps/upnp-unusable.xpm
59
%%DATADIR%%/pixmaps/upnp-unusable.xpm
60
%%DATADIR%%/pixmaps/upnp.xpm
60
%%DATADIR%%/pixmaps/upnp.xpm
61
%%DATADIR%%/pixmaps/warning.xpm
61
%%DATADIR%%/pixmaps/warning.xpm
62
%%DATADIR%%/robots.txt
63
%%DATADIR%%/spam.txt
64
%%DATADIR%%/spam_sha1.txt
65
%%DATADIR%%/tr/FAQ
66
%%NLS%%share/locale/de/LC_MESSAGES/gtk-gnutella.mo
67
%%NLS%%share/locale/el/LC_MESSAGES/gtk-gnutella.mo
68
%%NLS%%share/locale/es/LC_MESSAGES/gtk-gnutella.mo
69
%%NLS%%share/locale/fr/LC_MESSAGES/gtk-gnutella.mo
70
%%NLS%%share/locale/hu/LC_MESSAGES/gtk-gnutella.mo
71
%%NLS%%share/locale/it/LC_MESSAGES/gtk-gnutella.mo
72
%%NLS%%share/locale/ja/LC_MESSAGES/gtk-gnutella.mo
73
%%NLS%%share/locale/nb/LC_MESSAGES/gtk-gnutella.mo
74
%%NLS%%share/locale/nl/LC_MESSAGES/gtk-gnutella.mo
75
%%NLS%%share/locale/tr/LC_MESSAGES/gtk-gnutella.mo
76
%%NLS%%share/locale/uk/LC_MESSAGES/gtk-gnutella.mo
77
%%NLS%%share/locale/zh_CN/LC_MESSAGES/gtk-gnutella.mo
62
share/pixmaps/gtk-gnutella.png
78
share/pixmaps/gtk-gnutella.png
63
share/pixmaps/gtk-gnutella.svg
79
share/pixmaps/gtk-gnutella.svg
64
@dirrmtry bin
80
@dirrm %%DATADIR%%/tr
65
@dirrmtry share/applications
66
%%I386%%@dirrm %%DATADIR%%/i386-freebsd
67
%%AMD64%%@dirrm %%DATADIR%%/amd64-freebsd
68
@dirrm %%DATADIR%%/pixmaps
81
@dirrm %%DATADIR%%/pixmaps
69
@dirrm %%DATADIR%%/el
70
@dirrm %%DATADIR%%/en
71
@dirrm %%DATADIR%%/ja
82
@dirrm %%DATADIR%%/ja
83
@dirrm %%DATADIR%%/fr
84
@dirrm %%DATADIR%%/en
85
@dirrm %%DATADIR%%/el
86
@dirrm %%DATADIR%%/%%ARCH%%-freebsd
72
@dirrm %%DATADIR%%
87
@dirrm %%DATADIR%%
88
@dirrmtry share/applications

Return to bug 174202