Attachment #27065 for bug #46020

View | Details | Raw Unified | Return to bug 46020
Collapse All | Expand All




#

PORTNAME=	gftp
PORTVERSION=	2.0.14
CATEGORIES=	ftp
MASTER_SITES=	http://gftp.seul.org/ \
		ftp://gftp.seul.org/pub/gftp/
DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/}

MAINTAINER=	lehmann@ans-netz.de

USE_X_PREFIX=	yes
USE_GNOMENG=	yes
WANT_GNOME=	yes
USE_GNOME=	gtk12 gnomehack
GNU_CONFIGURE=	yes

CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
		LIBS="-L${LOCALBASE}/lib"

USE_GNOMENG=	yes
USE_GNOME+=	gnomehack

.if defined(WITHOUT_X11)
CONFIGURE_ARGS+=	--disable-gtkport --disable-gtk20
PKGNAMESUFFIX=	-nox11
LIB_DEPENDS+=	glib12.3:${PORTSDIR}/devel/glib12
.else
USE_X_PREFIX=	yes
WANT_GNOME=	yes
.if defined(WITH_GTK2)
RUN_DEPENDS+=	pkg-config:${PORTSDIR}/devel/pkgconfig
LIB_DEPENDS+=	glib-2.0.0:${PORTSDIR}/devel/glib20 \
		gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
CONFIGURE_ENV+=	_GTHREAD_LIBS="-lgthread-2.0"
.else
CONFIGURE_ARGS+=	--disable-gtk20
USE_GNOME+=	gtk12
CONFIGURE_ENV+=	_GTHREAD_LIBS="-lgthread12"
.endif
.endif

.include <bsd.port.pre.mk>

MAN1=		gftp.1

.if defined(WITHOUT_X11)
PLIST_SUB+=	NOX11:="@comment "
.else
PLIST_SUB+=	NOX11:=""
.endif

.if ${HAVE_GNOME:Mgnomelibs}!=""
USE_GNOME+=	gnomeprefix gnomelibs
PKGNAMESUFFIX=	-gnome
PLIST_SUB=	DATADIR="share/gnome"
.else
PLIST_SUB+=	DATADIR="share"
.endif

pre-everything::
	@${ECHO} ""
	@${ECHO} "You may use the following build options:"
	@${ECHO} ""
	@${ECHO} "	WITHOUT_X11=yes		Only build the text frontend."
	@${ECHO} "	WITH_GTK2=yes		Use gtk 2.x instead of 1.x"
	@${ECHO} ""

post-patch:
	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \

Line 1 Link Here

(-)gftp/distinfo (-1 / +1 lines)
1	MD5 (gftp-2.0.13.tar.gz) = 5006d3f984b63fe30865fc03e50a6256	1	MD5 (gftp-2.0.14.tar.gz) = 61e1271af88de20b50a90242a648ab2b

Lines 1-7 Link Here

(-)gftp/files/patch-ab (-3 / +9 lines)
1	--- docs/Makefile.in.orig Fri Dec 21 01:40:24 2001	1	--- docs/Makefile.in.orig Wed Nov 27 19:57:25 2002
2	+++ docs/Makefile.in Wed Jan 2 13:50:13 2002	2	+++ docs/Makefile.in Wed Nov 27 20:01:29 2002
3	@@ -104,11 +104,13 @@	3	@@ -109,15 +109,19 @@
		4	USE_NLS = @USE_NLS@
		5	VERSION = @VERSION@
		6
		7	man_MANS = gftp.1
		8	+.ifndef WITHOUT_X11
4	SUBDIRS = sample.gftp	9	SUBDIRS = sample.gftp
		10	+.endif
5	EXTRA_DIST = USERS-GUIDE gftp.1 gftp.desktop gftp.lsm gftp.png parse-netrc.pl	11	EXTRA_DIST = USERS-GUIDE gftp.1 gftp.desktop gftp.lsm gftp.png parse-netrc.pl
6		12
7	+.ifdef HAVE_GNOME	13	+.ifdef HAVE_GNOME

Lines 1-11 Link Here

(-)gftp/files/patch-ac (-11 lines)
1	--- src/text/Makefile.in.orig Sun May 26 21:27:10 2002
2	+++ src/text/Makefile.in Sun May 26 21:28:58 2002
3	@@ -105,7 +105,7 @@
4	EXTRA_PROGRAMS = gftp-text
5	gftp_text_SOURCES = gftp-text.c
6	INCLUDES = @GLIB_CFLAGS@ -DSHARE_DIR=\"$(datadir)/gftp\" -DLOCALE_DIR=\"$(localedir)\" -I../../intl
7	-LDADD = ../../lib/libgftp.a @INTLLIBS@ @GLIB_LIBS@ @EXTRA_LIBS@ @READLINE_LIBS@
8	+LDADD = -lintl ../../lib/libgftp.a @INTLLIBS@ @GLIB_LIBS@ @EXTRA_LIBS@ @READLINE_LIBS@
9	noinst_HEADERS = gftp-text.h
10	localedir = $(prefix)/share/locale
11	mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs




--- configure.orig	Wed Nov 27 17:25:51 2002
+++ configure	Wed Nov 27 17:30:47 2002
@@ -4725,9 +4725,9 @@
   
   rm -f conf.gtktest
 
-    GTHREAD_LIBS="-lgthread"
+    GTHREAD_LIBS="$_GTHREAD_LIBS"
   else
-    GTHREAD_LIBS="-lgthread-2.0"
+    GTHREAD_LIBS="$_GTHREAD_LIBS"
   fi
 
   if test "x$GFTP_GTK" = xgftp-gtk; then

Line 0 Link Here

(-)gftp/files/patch-lib::gftp.h (+11 lines)
	1	--- lib/gftp.h.orig Wed Nov 27 17:19:22 2002
	2	+++ lib/gftp.h Wed Nov 27 17:19:43 2002
	3	@@ -35,7 +35,7 @@
	4	#endif
	5	#include <sys/wait.h>
	6	#include <sys/utsname.h>
	7	-#include <sys/sysmacros.h>
	8	+/* #include <sys/sysmacros.h> */
	9	#include <netinet/in.h>
	10	#include <arpa/inet.h>
	11	#include <glib.h>

Lines 1-7 Link Here

(-)gftp/pkg-descr (-7 / +3 lines)
1	gFTP is a free multithreaded ftp client for *NIX based machines running	1	gFTP is a free multithreaded ftp client for *NIX based machines.
2	X11R6 or later. It has the following features:	2	It has the following features:
3	Distributed under the terms of the GNU Public License Agreement	3	Distributed under the terms of the GNU Public License Agreement
4	Written in C and uses GTK+ 1.2.x+ for the GUI	4	Written in C and Can use GTK+ 1.2.x+ or GTK 2.x for the GUI (or text mode)
5	Multithreaded to allow for simultaneous downloads	5	Multithreaded to allow for simultaneous downloads
6	File transfer queues to allow for downloading multiple files	6	File transfer queues to allow for downloading multiple files
7	Supports downloading entire directories and subdirectories	7	Supports downloading entire directories and subdirectories
Lines 18-25 Link Here
18	Allows for passive and non-passive file transfers	18	Allows for passive and non-passive file transfers
19	Eliminates buffer overruns from malicious ftp sites	19	Eliminates buffer overruns from malicious ftp sites
20		20
21	gFTP is copyright (c) 1998 by Brian Masney <masneyb@newwave.net>.
22
23	WWW: http://gftp.seul.org/	21	WWW: http://gftp.seul.org/
24
25	- Damjan Marion <dmarion@open.hr>




bin/gftp
%%NOX11:%%bin/gftp-gtk
bin/gftp-text
%%NOX11:%%%%GNOME:%%share/gnome/apps/Internet/gftp.desktop
%%NOX11:%%%%DATADIR%%/gftp/COPYING
%%NOX11:%%%%DATADIR%%/gftp/bookmarks
%%NOX11:%%%%DATADIR%%/gftp/connect.xpm
%%NOX11:%%%%DATADIR%%/gftp/deb.xpm
%%NOX11:%%%%DATADIR%%/gftp/down.xpm
%%NOX11:%%%%DATADIR%%/gftp/diff.xpm
%%NOX11:%%%%DATADIR%%/gftp/dir.xpm
%%NOX11:%%%%DATADIR%%/gftp/doc.xpm
%%NOX11:%%%%DATADIR%%/gftp/dotdot.xpm
%%NOX11:%%%%DATADIR%%/gftp/exe.xpm
%%NOX11:%%%%DATADIR%%/gftp/gftp.xpm
%%NOX11:%%%%DATADIR%%/gftp/gftp-logo.xpm
%%NOX11:%%%%DATADIR%%/gftp/gftp-mini-logo.xpm
%%NOX11:%%%%DATADIR%%/gftp/gftprc
%%NOX11:%%%%DATADIR%%/gftp/img.xpm
%%NOX11:%%%%DATADIR%%/gftp/left.xpm
%%NOX11:%%%%DATADIR%%/gftp/linkdir.xpm
%%NOX11:%%%%DATADIR%%/gftp/linkfile.xpm
%%NOX11:%%%%DATADIR%%/gftp/man.xpm
%%NOX11:%%%%DATADIR%%/gftp/open_dir.xpm
%%NOX11:%%%%DATADIR%%/gftp/right.xpm
%%NOX11:%%%%DATADIR%%/gftp/rpm.xpm
%%NOX11:%%%%DATADIR%%/gftp/sound.xpm
%%NOX11:%%%%DATADIR%%/gftp/stop.xpm
%%NOX11:%%%%DATADIR%%/gftp/tar.xpm
%%NOX11:%%%%DATADIR%%/gftp/txt.xpm
%%NOX11:%%%%DATADIR%%/gftp/up.xpm
%%NOX11:%%%%DATADIR%%/gftp/world.xpm
%%NOX11:%%%%GNOME:%%share/gnome/pixmaps/gftp.png
share/locale/bg/LC_MESSAGES/gftp.mo
share/locale/cs/LC_MESSAGES/gftp.mo
share/locale/da/LC_MESSAGES/gftp.mo

share/locale/es/LC_MESSAGES/gftp.mo
share/locale/fi/LC_MESSAGES/gftp.mo
share/locale/fr/LC_MESSAGES/gftp.mo
share/locale/hu/LC_MESSAGES/gftp.mo
share/locale/it/LC_MESSAGES/gftp.mo
share/locale/ja/LC_MESSAGES/gftp.mo
share/locale/ko/LC_MESSAGES/gftp.mo

share/locale/no/LC_MESSAGES/gftp.mo
share/locale/pl/LC_MESSAGES/gftp.mo
share/locale/pt_BR/LC_MESSAGES/gftp.mo
share/locale/ro/LC_MESSAGES/gftp.mo
share/locale/ru/LC_MESSAGES/gftp.mo
share/locale/sv/LC_MESSAGES/gftp.mo
share/locale/tr/LC_MESSAGES/gftp.mo
share/locale/zh_CN/LC_MESSAGES/gftp.mo
share/locale/zh_TW/LC_MESSAGES/gftp.mo
%%NOX11:%%@dirrm %%DATADIR%%/gftp

Return to bug 46020

Lines 6-37 Link Here

(-)gftp/Makefile (-7 / +41 lines)
6	#	6	#
7		7
8	PORTNAME= gftp	8	PORTNAME= gftp
9	PORTVERSION= 2.0.13	9	PORTVERSION= 2.0.14
10	CATEGORIES= ftp	10	CATEGORIES= ftp
11	MASTER_SITES= http://gftp.seul.org/ \	11	MASTER_SITES= http://gftp.seul.org/ \
12	ftp://gftp.seul.org/pub/gftp/	12	ftp://gftp.seul.org/pub/gftp/
		13	DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/rc/}
13		14
14	MAINTAINER= lehmann@ans-netz.de	15	MAINTAINER= lehmann@ans-netz.de
15		16
16	USE_X_PREFIX= yes
17	USE_GNOMENG= yes
18	WANT_GNOME= yes
19	USE_GNOME= gtk12 gnomehack
20	GNU_CONFIGURE= yes	17	GNU_CONFIGURE= yes
		18
21	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \	19	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
22	LIBS="-L${LOCALBASE}/lib"	20	LIBS="-L${LOCALBASE}/lib"
23		21
24	MAN1= gftp.1	22	USE_GNOMENG= yes
		23	USE_GNOME+= gnomehack
		24
		25	.if defined(WITHOUT_X11)
		26	CONFIGURE_ARGS+= --disable-gtkport --disable-gtk20
		27	PKGNAMESUFFIX= -nox11
		28	LIB_DEPENDS+= glib12.3:${PORTSDIR}/devel/glib12
		29	.else
		30	USE_X_PREFIX= yes
		31	WANT_GNOME= yes
		32	.if defined(WITH_GTK2)
		33	RUN_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkgconfig
		34	LIB_DEPENDS+= glib-2.0.0:${PORTSDIR}/devel/glib20 \
		35	gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
		36	CONFIGURE_ENV+= _GTHREAD_LIBS="-lgthread-2.0"
		37	.else
		38	CONFIGURE_ARGS+= --disable-gtk20
		39	USE_GNOME+= gtk12
		40	CONFIGURE_ENV+= _GTHREAD_LIBS="-lgthread12"
		41	.endif
		42	.endif
25		43
26	.include <bsd.port.pre.mk>	44	.include <bsd.port.pre.mk>
27		45
		46	MAN1= gftp.1
		47
		48	.if defined(WITHOUT_X11)
		49	PLIST_SUB+= NOX11:="@comment "
		50	.else
		51	PLIST_SUB+= NOX11:=""
		52	.endif
		53
28	.if ${HAVE_GNOME:Mgnomelibs}!=""	54	.if ${HAVE_GNOME:Mgnomelibs}!=""
29	USE_GNOME+= gnomeprefix gnomelibs	55	USE_GNOME+= gnomeprefix gnomelibs
30	PKGNAMESUFFIX= -gnome	56	PKGNAMESUFFIX= -gnome
31	PLIST_SUB= DATADIR="share/gnome"	57	PLIST_SUB= DATADIR="share/gnome"
32	.else	58	.else
33	PLIST_SUB= DATADIR="share"	59	PLIST_SUB+= DATADIR="share"
34	.endif	60	.endif
		61
		62	pre-everything::
		63	@${ECHO} ""
		64	@${ECHO} "You may use the following build options:"
		65	@${ECHO} ""
		66	@${ECHO} " WITHOUT_X11=yes Only build the text frontend."
		67	@${ECHO} " WITH_GTK2=yes Use gtk 2.x instead of 1.x"
		68	@${ECHO} ""
35		69
36	post-patch:	70	post-patch:
37	@${PERL} -pi -e 's\|-lpthread\|${PTHREAD_LIBS}\|g ; \	71	@${PERL} -pi -e 's\|-lpthread\|${PTHREAD_LIBS}\|g ; \

Line 0 Link Here

(-)gftp/files/patch-configure (+14 lines)
	1	--- configure.orig Wed Nov 27 17:25:51 2002
	2	+++ configure Wed Nov 27 17:30:47 2002
	3	@@ -4725,9 +4725,9 @@
	4
	5	rm -f conf.gtktest
	6
	7	- GTHREAD_LIBS="-lgthread"
	8	+ GTHREAD_LIBS="$_GTHREAD_LIBS"
	9	else
	10	- GTHREAD_LIBS="-lgthread-2.0"
	11	+ GTHREAD_LIBS="$_GTHREAD_LIBS"
	12	fi
	13
	14	if test "x$GFTP_GTK" = xgftp-gtk; then

Lines 1-35 Link Here

(-)gftp/pkg-plist (-33 / +36 lines)
1	bin/gftp	1	bin/gftp
2	bin/gftp-gtk	2	%%NOX11:%%bin/gftp-gtk
3	bin/gftp-text	3	bin/gftp-text
4	%%GNOME:%%share/gnome/apps/Internet/gftp.desktop	4	%%NOX11:%%%%GNOME:%%share/gnome/apps/Internet/gftp.desktop
5	%%DATADIR%%/gftp/COPYING	5	%%NOX11:%%%%DATADIR%%/gftp/COPYING
6	%%DATADIR%%/gftp/bookmarks	6	%%NOX11:%%%%DATADIR%%/gftp/bookmarks
7	%%DATADIR%%/gftp/connect.xpm	7	%%NOX11:%%%%DATADIR%%/gftp/connect.xpm
8	%%DATADIR%%/gftp/deb.xpm	8	%%NOX11:%%%%DATADIR%%/gftp/deb.xpm
9	%%DATADIR%%/gftp/down.xpm	9	%%NOX11:%%%%DATADIR%%/gftp/down.xpm
10	%%DATADIR%%/gftp/diff.xpm	10	%%NOX11:%%%%DATADIR%%/gftp/diff.xpm
11	%%DATADIR%%/gftp/dir.xpm	11	%%NOX11:%%%%DATADIR%%/gftp/dir.xpm
12	%%DATADIR%%/gftp/doc.xpm	12	%%NOX11:%%%%DATADIR%%/gftp/doc.xpm
13	%%DATADIR%%/gftp/dotdot.xpm	13	%%NOX11:%%%%DATADIR%%/gftp/dotdot.xpm
14	%%DATADIR%%/gftp/exe.xpm	14	%%NOX11:%%%%DATADIR%%/gftp/exe.xpm
15	%%DATADIR%%/gftp/gftp.xpm	15	%%NOX11:%%%%DATADIR%%/gftp/gftp.xpm
16	%%DATADIR%%/gftp/gftp-logo.xpm	16	%%NOX11:%%%%DATADIR%%/gftp/gftp-logo.xpm
17	%%DATADIR%%/gftp/gftprc	17	%%NOX11:%%%%DATADIR%%/gftp/gftp-mini-logo.xpm
18	%%DATADIR%%/gftp/img.xpm	18	%%NOX11:%%%%DATADIR%%/gftp/gftprc
19	%%DATADIR%%/gftp/left.xpm	19	%%NOX11:%%%%DATADIR%%/gftp/img.xpm
20	%%DATADIR%%/gftp/linkdir.xpm	20	%%NOX11:%%%%DATADIR%%/gftp/left.xpm
21	%%DATADIR%%/gftp/linkfile.xpm	21	%%NOX11:%%%%DATADIR%%/gftp/linkdir.xpm
22	%%DATADIR%%/gftp/man.xpm	22	%%NOX11:%%%%DATADIR%%/gftp/linkfile.xpm
23	%%DATADIR%%/gftp/open_dir.xpm	23	%%NOX11:%%%%DATADIR%%/gftp/man.xpm
24	%%DATADIR%%/gftp/right.xpm	24	%%NOX11:%%%%DATADIR%%/gftp/open_dir.xpm
25	%%DATADIR%%/gftp/rpm.xpm	25	%%NOX11:%%%%DATADIR%%/gftp/right.xpm
26	%%DATADIR%%/gftp/sound.xpm	26	%%NOX11:%%%%DATADIR%%/gftp/rpm.xpm
27	%%DATADIR%%/gftp/stop.xpm	27	%%NOX11:%%%%DATADIR%%/gftp/sound.xpm
28	%%DATADIR%%/gftp/tar.xpm	28	%%NOX11:%%%%DATADIR%%/gftp/stop.xpm
29	%%DATADIR%%/gftp/txt.xpm	29	%%NOX11:%%%%DATADIR%%/gftp/tar.xpm
30	%%DATADIR%%/gftp/up.xpm	30	%%NOX11:%%%%DATADIR%%/gftp/txt.xpm
31	%%DATADIR%%/gftp/world.xpm	31	%%NOX11:%%%%DATADIR%%/gftp/up.xpm
32	%%GNOME:%%share/gnome/pixmaps/gftp.png	32	%%NOX11:%%%%DATADIR%%/gftp/world.xpm
		33	%%NOX11:%%%%GNOME:%%share/gnome/pixmaps/gftp.png
33	share/locale/bg/LC_MESSAGES/gftp.mo	34	share/locale/bg/LC_MESSAGES/gftp.mo
34	share/locale/cs/LC_MESSAGES/gftp.mo	35	share/locale/cs/LC_MESSAGES/gftp.mo
35	share/locale/da/LC_MESSAGES/gftp.mo	36	share/locale/da/LC_MESSAGES/gftp.mo
Lines 37-42 Link Here
37	share/locale/es/LC_MESSAGES/gftp.mo	38	share/locale/es/LC_MESSAGES/gftp.mo
38	share/locale/fi/LC_MESSAGES/gftp.mo	39	share/locale/fi/LC_MESSAGES/gftp.mo
39	share/locale/fr/LC_MESSAGES/gftp.mo	40	share/locale/fr/LC_MESSAGES/gftp.mo
		41	share/locale/hu/LC_MESSAGES/gftp.mo
40	share/locale/it/LC_MESSAGES/gftp.mo	42	share/locale/it/LC_MESSAGES/gftp.mo
41	share/locale/ja/LC_MESSAGES/gftp.mo	43	share/locale/ja/LC_MESSAGES/gftp.mo
42	share/locale/ko/LC_MESSAGES/gftp.mo	44	share/locale/ko/LC_MESSAGES/gftp.mo
Lines 44-52 Link Here
44	share/locale/no/LC_MESSAGES/gftp.mo	46	share/locale/no/LC_MESSAGES/gftp.mo
45	share/locale/pl/LC_MESSAGES/gftp.mo	47	share/locale/pl/LC_MESSAGES/gftp.mo
46	share/locale/pt_BR/LC_MESSAGES/gftp.mo	48	share/locale/pt_BR/LC_MESSAGES/gftp.mo
		49	share/locale/ro/LC_MESSAGES/gftp.mo
47	share/locale/ru/LC_MESSAGES/gftp.mo	50	share/locale/ru/LC_MESSAGES/gftp.mo
48	share/locale/sv/LC_MESSAGES/gftp.mo	51	share/locale/sv/LC_MESSAGES/gftp.mo
49	share/locale/tr/LC_MESSAGES/gftp.mo	52	share/locale/tr/LC_MESSAGES/gftp.mo
50	share/locale/zh_CN.GB2312/LC_MESSAGES/gftp.mo	53	share/locale/zh_CN/LC_MESSAGES/gftp.mo
51	share/locale/zh_TW.Big5/LC_MESSAGES/gftp.mo	54	share/locale/zh_TW/LC_MESSAGES/gftp.mo
52	@dirrm %%DATADIR%%/gftp	55	%%NOX11:%%@dirrm %%DATADIR%%/gftp