Date: Thu, 17 Jan 2008 20:48:21 GMT From: Felippe de Meirelles Motta <lippemail@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/119761: [UPDATE] ftp/wput Message-ID: <200801172048.m0HKmLPD027865@www.freebsd.org> Resent-Message-ID: <200801172050.m0HKo2t7060515@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 119761
>Category: ports
>Synopsis: [UPDATE] ftp/wput
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Jan 17 20:50:02 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Felippe de Meirelles Motta
>Release: FreeBSD 7.0-PRERELEASE amd64
>Organization:
>Environment:
System: FreeBSD 7.0-PRERELEASE #0: Thu Jan 10 01:55:37 BRST 2008
lippe@shire.freebsd.org:/usr/obj/usr/src/sys/GENERIC
>Description:
- Updated to 0.6.1;
- Updated MASTER_SITES;
- Gnutls is now an dependecy;
- Install and respect PORTDOCS and EXAMPLES;
- Now use pkg-plist;
- Rebuild the patch to Makefile.in.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/ftp/wput/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- Makefile 12 Apr 2005 03:25:29 -0000 1.13
+++ Makefile 17 Jan 2008 19:14:50 -0000
@@ -6,35 +6,52 @@
#
PORTNAME= wput
-PORTVERSION= 0.5
+PORTVERSION= 0.6.1
CATEGORIES= ftp
-MASTER_SITES= http://itooktheredpill.dyndns.org/wput/ \
- ${MASTER_SITE_GENTOO}
-MASTER_SITE_SUBDIR=distfiles
+MASTER_SITES= SF
EXTRACT_SUFX= .tgz
MAINTAINER= chip-set@mail.ru
COMMENT= Uploads files or directories to a ftpserver with support of resuming
-PORTDOCS= TODO ChangeLog
+LIB_DEPENDS= gnutls.13:${PORTSDIR}/security/gnutls
+
+PORTDOCS= ABOUT-NLS COPYING ChangeLog INSTALL TODO
+EXAMPLES= USAGE.examples USAGE.resumehandling USAGE.urlhandling \
+ passwordfile wputrc
USE_GETOPT_LONG= yes
-WRKSRC= ${WRKDIR}/${PORTNAME}
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= LIBS="${LDFLAGS}"
-PLIST_FILES= bin/wput
+OPTIONS= TLS "Enable TLS support" on \
+ MEM_DEBUG "Enable memory debugging" off \
+ DEBUG "Enable debug support" on
+
MANCOMPRESSED= yes
MAN1= wput.1
+.include <bsd.port.pre.mk>
+
+.if defined(WITHOUT_TLS)
+CONFIGURE_ARGS+= --without-ssl
+.endif
+.if defined(WITH_MEM_DEBUG)
+CONFIGURE_ARGS+= --enable-memdbg
+.endif
+.if defined(WITHOUT_DEBUG)
+CONFIGURE_ARGS+= --disable-g-switch
+.endif
+
post-install:
+ @${INSTALL_PROGRAM} ${WRKSRC}/wput ${PREFIX}/bin
+ @${INSTALL_MAN} ${WRKSRC}/doc/wput.1 ${PREFIX}/man/man1
.if !defined(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}
-.for f in ${PORTDOCS}
- @${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.endfor
+ @${MKDIR} ${DOCSDIR} ${EXAMPLESDIR}
+ ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
+ ${INSTALL_DATA} ${EXAMPLES:S,^,${WRKSRC}/doc,} ${EXAMPLESDIR}
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/ftp/wput/distinfo,v
retrieving revision 1.8
diff -u -r1.8 distinfo
--- distinfo 22 Jan 2006 09:48:59 -0000 1.8
+++ distinfo 17 Jan 2008 19:14:50 -0000
@@ -1,3 +1,3 @@
-MD5 (wput-0.5.tgz) = 441b2e07219f78167b29a7ac33488fff
-SHA256 (wput-0.5.tgz) = 5b3312ea5dbf702c0e94b7a7b51cddd0ad05f40c20fdd0e6e1ee4c8ecd870483
-SIZE (wput-0.5.tgz) = 121543
+MD5 (wput-0.6.1.tgz) = 92b41efed4db8eb4f3443c23bf7ceecf
+SHA256 (wput-0.6.1.tgz) = 67125acab1d520e5d2a0429cd9cf7fc379987f30d5bbed0b0e97b92b554fcc13
+SIZE (wput-0.6.1.tgz) = 312342
Index: pkg-descr
===================================================================
RCS file: /home/ncvs/ports/ftp/wput/pkg-descr,v
retrieving revision 1.1
diff -u -r1.1 pkg-descr
--- pkg-descr 8 Dec 2003 10:13:10 -0000 1.1
+++ pkg-descr 17 Jan 2008 19:14:50 -0000
@@ -2,4 +2,4 @@
exactly the opposite: it uploads files or recursivly whole directories to
a ftp-server and supports resuming.
-WWW: http://itooktheredpill.dyndns.org/wput/
+WWW: http://wput.sourceforge.net/
Index: pkg-plist
===================================================================
RCS file: pkg-plist
diff -N pkg-plist
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg-plist 17 Jan 2008 19:14:50 -0000
@@ -0,0 +1,13 @@
+bin/wput
+%%PORTDOCS%%%%DOCSDIR%%/ABOUT-NLS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%EXAMPLESDIR%%/USAGE.examples
+%%PORTDOCS%%%%EXAMPLESDIR%%/USAGE.resumehandling
+%%PORTDOCS%%%%EXAMPLESDIR%%/USAGE.urlhandling
+%%PORTDOCS%%%%EXAMPLESDIR%%/passwordfile
+%%PORTDOCS%%%%EXAMPLESDIR%%/wputrc
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
Index: files/patch-Makefile.in
===================================================================
RCS file: files/patch-Makefile.in
diff -N files/patch-Makefile.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-Makefile.in 17 Jan 2008 19:14:50 -0000
@@ -0,0 +1,11 @@
+--- Makefile.in.old 2008-01-17 16:56:47.000000000 -0200
++++ Makefile.in 2008-01-17 16:57:04.000000000 -0200
+@@ -15,8 +15,6 @@
+
+ install: all
+ cd po && $(MAKE) $(MAKEDEFS) $@
+- install -m0755 wput $(bindir)
+- install -m0644 doc/wput.1.gz $(mandir)
+ @echo "----------------"
+ @echo "Wput installed. See 'wput -h' or 'man wput' for usage information."
+ @echo "Further documentation is located in the doc/USAGE.* files."
Index: files/patch-src::Makefile.in
===================================================================
RCS file: files/patch-src::Makefile.in
diff -N files/patch-src::Makefile.in
--- files/patch-src::Makefile.in 8 Jul 2004 08:02:10 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
---- src/Makefile.in.orig Sat Apr 17 02:35:38 2004
-+++ src/Makefile.in Mon Jul 5 18:11:30 2004
-@@ -4,8 +4,8 @@
- prefix=@prefix@
- bindir=@bindir@
- CC=@CC@
--CFLAGS= @CFLAGS@
--LIBS=@LIBS@
-+CFLAGS= @CFLAGS@ @CPPFLAGS@
-+LIBS=@LIBS@ ${LDFLAGS}
- EXE=../wput
- GETOPT=@GETOPT@
- MEMDBG=@MEMDBG@
-@@ -22,7 +22,7 @@
- ftp-ls.o: ftp.h
-
- wput: $(OBJ)
-- $(CC) -o $(EXE) $(OBJ) $(LIBS)
-+ $(CC) -o $(EXE) $(OBJ) $(LIBS) $(LDFLAGS)
- clean:
- rm -f *.o *~ *.bak ../wput getopt/*.o
- win-clean: clean
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200801172048.m0HKmLPD027865>