5 files changed, 65 insertions, 40 deletions

diff --git a/ftp/wput/Makefile b/ftp/wput/Makefile
index 85382b770ca5..571067fd7041 100644
--- a/ftp/wput/Makefile
+++ b/ftp/wput/Makefile
@@ -6,35 +6,58 @@
 #
 
 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
 
-USE_GETOPT_LONG=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}
+PORTDOCS=	ABOUT-NLS COPYING ChangeLog INSTALL TODO
+PORTEXAMPLES=	USAGE.examples USAGE.resumehandling USAGE.urlhandling \
+		passwordfile wputrc
 
+USE_AUTOTOOLS=    autoconf:261
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	LIBS="${LDFLAGS}"
-
 PLIST_FILES=	bin/wput
-MANCOMPRESSED=	yes
+
+OPTIONS=	TLS "Enable TLS support" on \
+		MEM_DEBUG "Enable memory debugging" off \
+		DEBUG "Enable debug support" on
+
 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
+
+pre-configure:
+	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' ${WRKSRC}/src/socketlib.c
+
 post-install:
+	@${INSTALL_MAN}	${WRKSRC}/doc/${MAN1} ${MANPREFIX}/man/man1/
+
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for f in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.endfor
+	@${INSTALL} -d ${DOCSDIR}
+	@${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}	
+.endif
+
+.if !defined(NOPORTEXAMPLES)
+	@${INSTALL} -d ${EXAMPLESDIR}
+	@${INSTALL_DATA} ${PORTEXAMPLES:S,^,${WRKSRC}/doc/,} ${EXAMPLESDIR}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/ftp/wput/distinfo b/ftp/wput/distinfo
index 93bbbce8d94d..1b00b528392e 100644
--- a/ftp/wput/distinfo
+++ b/ftp/wput/distinfo
@@ -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
diff --git a/ftp/wput/files/patch-Makefile.in b/ftp/wput/files/patch-Makefile.in
new file mode 100644
index 000000000000..6489968ca29e
--- /dev/null
+++ b/ftp/wput/files/patch-Makefile.in
@@ -0,0 +1,24 @@
+--- Makefile.in.orig	2007-12-12 08:30:04.000000000 -0900
++++ Makefile.in	2008-01-17 14:17:36.000000000 -0900
+@@ -9,7 +9,6 @@
+ all clean:
+ 	cd po && $(MAKE) $(MAKEDEFS) $@
+ 	cd src && $(MAKE) $(MAKEDEFS) $@
+-	cd doc && $(MAKE) $(MAKEDEFS) $@
+ 
+ win-clean:
+ 	cd src && $(MAKE) $(MAKEDEFS) $@
+@@ -17,7 +16,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."
+@@ -27,5 +25,4 @@
+ 	@echo "----------------"
+ uninstall:
+ 	rm -f $(bindir)/wput
+-	rm -f $(mandir)/wput.1.gz
+ 	
diff --git a/ftp/wput/files/patch-src::Makefile.in b/ftp/wput/files/patch-src::Makefile.in
deleted file mode 100644
index b361d6722415..000000000000
--- a/ftp/wput/files/patch-src::Makefile.in
+++ /dev/null
@@ -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
diff --git a/ftp/wput/pkg-descr b/ftp/wput/pkg-descr
index a688eb78775e..965d9e459ca5 100644
--- a/ftp/wput/pkg-descr
+++ b/ftp/wput/pkg-descr
@@ -2,4 +2,4 @@ wput is a tiny program that looks like wget and does as the name suggests
 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/