- Update to 0.9.9

9 files changed, 26 insertions, 68 deletions

diff --git a/security/authforce/Makefile b/security/authforce/Makefile
index 746df6167af2..04fb3057f307 100644
--- a/security/authforce/Makefile
+++ b/security/authforce/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	authforce
-PORTVERSION=	0.9.6
-PORTREVISION=	9
+PORTVERSION=	0.9.9
 CATEGORIES=	security www
 MASTER_SITES=	http://www.divineinvasion.net/authforce/
 
@@ -16,15 +15,19 @@ COMMENT=	HTTP authentication brute forcer
 
 LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl
 
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" LIBS="-lintl"
+CPPFLAGS+=	-I${LOCALBASE}/include
+GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		LIBS="-lintl"
 
+INFO=		authforce
 MAN1=		authforce.1
 MANCOMPRESSED=	yes
-INFO=		authforce
+
+post-patch:
+	@${REINPLACE_CMD} -e '/#include <malloc.h>/d' ${WRKSRC}/src/methods.c ${WRKSRC}/src/misc.c
+	@${REINPLACE_CMD} -e 's|#include <malloc.h>|#include <stdlib.h>|' ${WRKSRC}/src/extract.c
+	@${REINPLACE_CMD} -e '/^pwlistsdir = / s|/data$$||' ${WRKSRC}/data/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/security/authforce/distinfo b/security/authforce/distinfo
index 61d4605a603d..c8a9aa6c061d 100644
--- a/security/authforce/distinfo
+++ b/security/authforce/distinfo
@@ -1,2 +1,2 @@
-SHA256 (authforce-0.9.6.tar.bz2) = de8e897abaaacd459beb8cf9ea0ed44c1c9e6872dfc2abae8ce938658b05b0d4
-SIZE (authforce-0.9.6.tar.bz2) = 150359
+SHA256 (authforce-0.9.9.tar.bz2) = 8df475c066151fbdfe1f1f41d05a9c717ff5b734ec0bc42e280705988a2b0712
+SIZE (authforce-0.9.9.tar.bz2) = 303077
diff --git a/security/authforce/files/patch-aa b/security/authforce/files/patch-aa
deleted file mode 100644
index bc229b43722a..000000000000
--- a/security/authforce/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/extract.c.bak	Wed Feb 14 01:54:53 2001
-+++ src/extract.c	Wed May  8 12:34:16 2002
-@@ -20,7 +20,7 @@
- #include <config.h>
- #include <stdio.h>
- #include <string.h>
--#include <malloc.h>
-+#include <stdlib.h>
- #ifdef MEMWATCH
- #include "memwatch.h"
- #endif /* MEMWATCH */
diff --git a/security/authforce/files/patch-ab b/security/authforce/files/patch-ab
deleted file mode 100644
index 693aa76d1a45..000000000000
--- a/security/authforce/files/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/methods.c.bak	Mon May  7 01:02:47 2001
-+++ src/methods.c	Wed May  8 12:34:16 2002
-@@ -5,7 +5,6 @@
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
--#include <malloc.h>
- #ifdef MEMWATCH
- #include "memwatch.h"
- #endif /* MEMWATCH */
diff --git a/security/authforce/files/patch-ac b/security/authforce/files/patch-ac
deleted file mode 100644
index 79ed97718441..000000000000
--- a/security/authforce/files/patch-ac
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/misc.c.bak	Wed Feb 14 01:54:53 2001
-+++ src/misc.c	Wed May  8 12:34:16 2002
-@@ -3,7 +3,6 @@
- #include <config.h>
- #include <stdio.h>
- #include <stdlib.h>
--#include <malloc.h>
- #include <string.h>
- #include <ctype.h>
- #ifdef MEMWATCH
diff --git a/security/authforce/files/patch-ad b/security/authforce/files/patch-ad
index 00b13bd45400..bcbbd683ecf6 100644
--- a/security/authforce/files/patch-ad
+++ b/security/authforce/files/patch-ad
@@ -1,11 +1,11 @@
---- doc/Makefile.in.bak	Sat May 12 22:37:55 2001
-+++ doc/Makefile.in	Wed May  8 13:15:17 2002
-@@ -101,7 +101,7 @@
- INFO_DEPS = authforce.info
- DVIS = authforce.dvi
- TEXINFOS = authforce.texi
+--- doc/Makefile.in.orig	2007-05-14 06:54:38.000000000 +0800
++++ doc/Makefile.in	2011-08-30 16:43:21.864890601 +0800
+@@ -68,7 +68,7 @@
+ AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS)
+ DVIPS = dvips
+ am__installdirs = "$(DESTDIR)$(infodir)" "$(DESTDIR)$(mangdir)"
 -mangdir = $(mandir)/mang
 +mangdir = $(mandir)/man1
- MANS = $(man_MANS)
- 
  NROFF = nroff
+ MANS = $(man_MANS)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
diff --git a/security/authforce/files/patch-ae b/security/authforce/files/patch-ae
deleted file mode 100644
index 33a04ebcca41..000000000000
--- a/security/authforce/files/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/http.c.orig	Tue Dec  5 16:06:36 2006
-+++ src/http.c	Tue Dec  5 16:06:24 2006
-@@ -68,7 +68,9 @@
- 		curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1);
- 		curl_easy_setopt(curl, CURLOPT_USERPWD, authstring);
- 		curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
-+#if LIBCURL_VERSION_NUM < 0x071000
- 		curl_easy_setopt(curl, CURLOPT_MUTE, 1);
-+#endif
- 		curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1);
- 		curl_easy_setopt(curl, CURLOPT_USERAGENT, user_agent);
- 		if (strcmp(proxy, "undef"))
diff --git a/security/authforce/pkg-descr b/security/authforce/pkg-descr
index 1304dcc5d8a2..363ffd87bc24 100644
--- a/security/authforce/pkg-descr
+++ b/security/authforce/pkg-descr
@@ -6,4 +6,3 @@ of your site and to prove the insecurity of HTTP authentication based on
 the fact that users just don't pick good passwords.
 
 WWW: http://www.divineinvasion.net/authforce/
-
diff --git a/security/authforce/pkg-plist b/security/authforce/pkg-plist
index 2388a398a09b..995244aa68e5 100644
--- a/security/authforce/pkg-plist
+++ b/security/authforce/pkg-plist
@@ -1,9 +1,8 @@
 bin/authforce
-share/authforce/data/blank.lst
-share/authforce/data/dummy.lst
-share/authforce/data/password.lst
-share/authforce/data/username.lst
-share/authforce/data/userpass.lst
+%%DATADIR%%/blank.lst
+%%DATADIR%%/dummy.lst
+%%DATADIR%%/password.lst
+%%DATADIR%%/username.lst
+%%DATADIR%%/userpass.lst
 share/locale/nl/LC_MESSAGES/authforce.mo
-@dirrm share/authforce/data
-@dirrm share/authforce
+@dirrm %%DATADIR%%