ports/128892: [PATCH] ftp/wput: update to 0.6.2

Sat Nov 15 17:30:04 UTC 2008

>Number:         128892
>Category:       ports
>Synopsis:       [PATCH] ftp/wput: update to 0.6.2
>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:   Sat Nov 15 17:30:03 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Yi-Jheng Lin
>Release:        FreeBSD 7.0-RELEASE-p4 amd64
>Organization:
NCTU CS
>Environment:
System: FreeBSD stucgi 7.0-RELEASE-p4 FreeBSD 7.0-RELEASE-p4 #0: Fri Sep  5 14:56:26 CST
>Description:
- Update to 0.6.2
- Add new knob NLS
- Add Gnutls as a dependency only when option TLS is "On"

Port maintainer (chip-set at mail.ru) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- wput-0.6.2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/ftp/wput/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- Makefile	21 Aug 2008 06:17:02 -0000	1.19
+++ Makefile	15 Nov 2008 17:22:33 -0000
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	wput
-PORTVERSION=	0.6.1
-PORTREVISION=	2
+PORTVERSION=	0.6.2
 CATEGORIES=	ftp
 MASTER_SITES=	SF
 EXTRACT_SUFX=	.tgz
@@ -15,40 +14,63 @@
 MAINTAINER=	chip-set at mail.ru
 COMMENT=	Uploads files or directories to a ftpserver with support of resuming
 
-LIB_DEPENDS=	gnutls.26:${PORTSDIR}/security/gnutls
-
 PORTDOCS=	ABOUT-NLS COPYING ChangeLog INSTALL TODO
 PORTEXAMPLES=	USAGE.examples USAGE.resumehandling USAGE.urlhandling \
 		passwordfile wputrc
 
-USE_GETTEXT=	yes
 USE_AUTOTOOLS=	autoconf:262
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LIBS="${LDFLAGS}"
+CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="${LDFLAGS}" \
+		LIBS="${LDFLAGS}"
+
+OPTIONS=	TLS "Enable TLS support" On \
+		MEM_DEBUG "Enable memory debugging" Off \
+		DEBUG "Enable debug support" On \
+		NLS "Native Language Support with gettext" On
 
-OPTIONS=	TLS "Enable TLS support" on \
-		MEM_DEBUG "Enable memory debugging" off \
-		DEBUG "Enable debug support" on
-
-MAN1=		wput.1
+MAN1=		wdel.1 wput.1
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITHOUT_TLS)
+.if !defined(WITHOUT_TLS)
+LIB_DEPENDS+=	gnutls.26:${PORTSDIR}/security/gnutls
+CONFIGURE_ARGS+=	--with-ssl
+.else
 CONFIGURE_ARGS+=	--without-ssl
 .endif
+
 .if defined(WITH_MEM_DEBUG)
 CONFIGURE_ARGS+=	--enable-memdbg
+.else
+CONFIGURE_ARGS+=	--disable-memdbg
 .endif
-.if defined(WITHOUT_DEBUG)
+
+.if !defined(WITHOUT_DEBUG)
+CONFIGURE_ARGS+=	--enable-g-switch
+.else
 CONFIGURE_ARGS+=	--disable-g-switch
 .endif
 
+.if !defined(WITHOUT_NLS)
+USE_ICONV=	yes
+USE_GETTEXT=	yes
+CONFIGURE_ARGS+=	--enable-nls \
+			--with-libintl-prefix=${LOCALBASE} \
+			--with-libiconv-prefix=${LOCALBASE}
+PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS+=	--disable-nls --without-libiconv-prefix
+PLIST_SUB=	NLS="@comment "
+.endif
+
 pre-configure:
-	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' ${WRKSRC}/src/socketlib.c
+	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' \
+		${WRKSRC}/src/memdbg.c \
+		${WRKSRC}/src/socketlib.c
 
 post-install:
-	@${INSTALL_MAN}	${WRKSRC}/doc/${MAN1} ${MANPREFIX}/man/man1/
+	@${INSTALL_MAN}	${MAN1:S,^,${WRKSRC}/doc/,} ${MANPREFIX}/man/man1/
 
 .if !defined(NOPORTDOCS)
 	@${INSTALL} -d ${DOCSDIR}
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/ftp/wput/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- distinfo	22 Jan 2008 17:29:58 -0000	1.9
+++ distinfo	15 Nov 2008 17:22:33 -0000
@@ -1,3 +1,3 @@
-MD5 (wput-0.6.1.tgz) = 92b41efed4db8eb4f3443c23bf7ceecf
-SHA256 (wput-0.6.1.tgz) = 67125acab1d520e5d2a0429cd9cf7fc379987f30d5bbed0b0e97b92b554fcc13
-SIZE (wput-0.6.1.tgz) = 312342
+MD5 (wput-0.6.2.tgz) = a14c4c13d91d04d6119bdc977e8a8bdf
+SHA256 (wput-0.6.2.tgz) = 229d8bb7d045ca1f54d68de23f1bc8016690dc0027a16586712594fbc7fad8c7
+SIZE (wput-0.6.2.tgz) = 368510
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/ftp/wput/pkg-plist,v
retrieving revision 1.4
diff -u -r1.4 pkg-plist
--- pkg-plist	30 Jan 2008 18:52:13 -0000	1.4
+++ pkg-plist	15 Nov 2008 17:22:33 -0000
@@ -1,7 +1,15 @@
+bin/wdel
 bin/wput
-share/locale/de/LC_MESSAGES/wput.mo
-share/locale/it/LC_MESSAGES/wput.mo
-share/locale/nl/LC_MESSAGES/wput.mo
-share/locale/ru/LC_MESSAGES/wput.mo
-share/locale/tr/LC_MESSAGES/wput.mo
-share/locale/zh/LC_MESSAGES/wput.mo
+%%NLS%%share/locale/da/LC_MESSAGES/wput.mo
+%%NLS%%share/locale/de/LC_MESSAGES/wput.mo
+%%NLS%%share/locale/el/LC_MESSAGES/wput.mo
+%%NLS%%share/locale/es/LC_MESSAGES/wput.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/wput.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/wput.mo
+%%NLS%%share/locale/it/LC_MESSAGES/wput.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/wput.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/wput.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/wput.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/wput.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/wput.mo
+%%NLS%%share/locale/zh/LC_MESSAGES/wput.mo
Index: files/patch-Makefile.in
===================================================================
RCS file: /home/ncvs/ports/ftp/wput/files/patch-Makefile.in,v
retrieving revision 1.1
diff -u -r1.1 patch-Makefile.in
--- files/patch-Makefile.in	22 Jan 2008 17:29:58 -0000	1.1
+++ files/patch-Makefile.in	15 Nov 2008 17:22:33 -0000
@@ -1,5 +1,5 @@
---- Makefile.in.orig	2007-12-12 08:30:04.000000000 -0900
-+++ Makefile.in	2008-01-17 14:17:36.000000000 -0900
+--- Makefile.in.orig	2008-11-15 21:07:49.000000000 +0800
++++ Makefile.in	2008-11-15 21:09:28.000000000 +0800
 @@ -9,7 +9,6 @@
  all clean:
  	cd po && $(MAKE) $(MAKEDEFS) $@
@@ -8,17 +8,20 @@
  
  win-clean:
  	cd src && $(MAKE) $(MAKEDEFS) $@
-@@ -17,7 +16,6 @@
- install: all
- 	cd po && $(MAKE) $(MAKEDEFS) $@
+@@ -19,9 +18,7 @@
+ 	mkdir -p $(bindir) 
+ 	mkdir -p $(mandir) 
  	install -m0755 wput $(bindir)
 -	install -m0644 doc/wput.1.gz $(mandir)
+ 	ln -s $(bindir)/wput $(bindir)/wdel
+-	install -m0644 doc/wdel.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."
-@@ -27,5 +25,4 @@
- 	@echo "----------------"
+ 	@echo "Wput and Wdel installed. See 'wput/wdel -h' or 'man wput/wdel' for"
+ 	@echo "usage information."
+@@ -33,6 +30,4 @@
  uninstall:
  	rm -f $(bindir)/wput
+ 	rm -f $(bindir)/wdel
 -	rm -f $(mandir)/wput.1.gz
+-	rm -f $(mandir)/wdel.1.gz
  	
--- wput-0.6.2.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:

