4 files changed, 56 insertions, 55 deletions

diff --git a/www/ffproxy/Makefile b/www/ffproxy/Makefile
index 4341354bc315..6888b12c9dbe 100644
--- a/www/ffproxy/Makefile
+++ b/www/ffproxy/Makefile
@@ -6,48 +6,24 @@
 #
 
 PORTNAME=	ffproxy
-PORTVERSION=	1.5.1
+PORTVERSION=	1.6
 CATEGORIES=	www
 MASTER_SITES=	http://faith.eu.org/${PORTNAME}/
 
 MAINTAINER=	krion@FreeBSD.org
 COMMENT=	Filtering HTTP proxy server
 
-USE_REINPLACE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib"
 
 MAN5=	${PORTNAME}.conf.5
 MAN7=	${PORTNAME}.quick.7
 MAN8=	${PORTNAME}.8
 
-post-patch:
-	${REINPLACE_CMD} -e \
-		's|/etc|${PREFIX}/etc|g ; \
-		s|/usr/local|${PREFIX}|g ; \
-		s|^CFLAGS =|CFLAGS +=|g ; \
-		s|/var/ffproxy|${DOCSDIR}|g' \
-			${WRKSRC}/Makefile
-	${REINPLACE_CMD} -e \
-		's|/etc|${PREFIX}/etc|g' \
-			${WRKSRC}/${PORTNAME}.8 \
-			${WRKSRC}/${PORTNAME}.conf.5
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 \
-		${PREFIX}/man/man8
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.conf.5 \
-		${PREFIX}/man/man5
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.quick.7 \
-		${PREFIX}/man/man7
-	${INSTALL_DATA} ${WRKSRC}/sample.config \
-		${PREFIX}/etc/ffproxy.conf.sample
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${MKDIR} ${DOCSDIR}/db
-	${MKDIR} ${DOCSDIR}/html
-	${INSTALL_DATA} ${WRKSRC}/html/* ${DOCSDIR}/html
-	${INSTALL_DATA} ${WRKSRC}/db/* ${DOCSDIR}/db
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-.endif
+post-install:
+	@[ -f ${PREFIX}/etc/ffproxy.conf ] || \
+	${CP} ${PREFIX}/etc/ffproxy.conf.sample ${PREFIX}/etc/ffproxy.conf
 
 .include <bsd.port.mk>
diff --git a/www/ffproxy/distinfo b/www/ffproxy/distinfo
index c90df1a3ce75..3590e5c64ee6 100644
--- a/www/ffproxy/distinfo
+++ b/www/ffproxy/distinfo
@@ -1,2 +1,2 @@
-MD5 (ffproxy-1.5.1.tar.gz) = 6a663ed4f67b0bfee8a124fca76cdee6
-SIZE (ffproxy-1.5.1.tar.gz) = 35696
+MD5 (ffproxy-1.6.tar.gz) = 5711082dba1e87a3673a8f0429eb0741
+SIZE (ffproxy-1.6.tar.gz) = 77535
diff --git a/www/ffproxy/files/patch-Makefile.in b/www/ffproxy/files/patch-Makefile.in
new file mode 100644
index 000000000000..0d092032bd18
--- /dev/null
+++ b/www/ffproxy/files/patch-Makefile.in
@@ -0,0 +1,23 @@
+
+$FreeBSD$
+
+--- Makefile.in.orig
++++ Makefile.in
+@@ -48,7 +48,7 @@
+ conf:
+ 	sed -e 's|_BASE_|$(pkgdatadir)|g' sample.config.s \
+ 		> sample.config || cp sample.config.s sample.config
+-	cp sample.config ffproxy.conf
++	cp sample.config ffproxy.conf.sample
+ 
+ installdirs: mkinstalldirs
+ 	$(SHELL) $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) \
+@@ -73,7 +73,7 @@
+ 	$(INSTALL_DATA) ffproxy.8 $(DESTDIR)$(mandir)/man8
+ 
+ install_config: conf
+-	$(INSTALL_DATA) ffproxy.conf $(DESTDIR)$(sysconfdir)
++	$(INSTALL_DATA) ffproxy.conf.sample $(DESTDIR)$(sysconfdir)
+ 
+ install_sample: conf
+ 	$(INSTALL_DATA) sample.config $(DESTDIR)$(pkgdatadir)
diff --git a/www/ffproxy/pkg-plist b/www/ffproxy/pkg-plist
index 22f22bcf1d0a..29363caf9c0d 100644
--- a/www/ffproxy/pkg-plist
+++ b/www/ffproxy/pkg-plist
@@ -1,23 +1,25 @@
 bin/ffproxy
+@unexec if cmp -s %D/etc/ffproxy.conf.sample %D/etc/ffproxy.conf; then rm -f %D/etc/ffproxy.conf; fi
 etc/ffproxy.conf.sample
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/db/access.dyndns
-%%PORTDOCS%%%%DOCSDIR%%/db/access.host
-%%PORTDOCS%%%%DOCSDIR%%/db/access.ip
-%%PORTDOCS%%%%DOCSDIR%%/db/filter.header.add
-%%PORTDOCS%%%%DOCSDIR%%/db/filter.header.drop
-%%PORTDOCS%%%%DOCSDIR%%/db/filter.header.entry
-%%PORTDOCS%%%%DOCSDIR%%/db/filter.header.match
-%%PORTDOCS%%%%DOCSDIR%%/db/filter.host.match
-%%PORTDOCS%%%%DOCSDIR%%/db/filter.rheader.drop
-%%PORTDOCS%%%%DOCSDIR%%/db/filter.rheader.entry
-%%PORTDOCS%%%%DOCSDIR%%/db/filter.rheader.match
-%%PORTDOCS%%%%DOCSDIR%%/db/filter.url.match
-%%PORTDOCS%%%%DOCSDIR%%/html/connect
-%%PORTDOCS%%%%DOCSDIR%%/html/filtered
-%%PORTDOCS%%%%DOCSDIR%%/html/invalid
-%%PORTDOCS%%%%DOCSDIR%%/html/post
-%%PORTDOCS%%%%DOCSDIR%%/html/resolve
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/db
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@exec [ -f %B/ffproxy.conf ] || cp %B/%f %B/ffproxy.conf
+%%DATADIR%%/db/access.dyndns
+%%DATADIR%%/db/access.host
+%%DATADIR%%/db/access.ip
+%%DATADIR%%/db/filter.header.add
+%%DATADIR%%/db/filter.header.drop
+%%DATADIR%%/db/filter.header.entry
+%%DATADIR%%/db/filter.header.match
+%%DATADIR%%/db/filter.host.match
+%%DATADIR%%/db/filter.rheader.drop
+%%DATADIR%%/db/filter.rheader.entry
+%%DATADIR%%/db/filter.rheader.match
+%%DATADIR%%/db/filter.url.match
+%%DATADIR%%/html/connect
+%%DATADIR%%/html/filtered
+%%DATADIR%%/html/invalid
+%%DATADIR%%/html/post
+%%DATADIR%%/html/resolve
+%%DATADIR%%/sample.config
+@dirrm %%DATADIR%%/html
+@dirrm %%DATADIR%%/db
+@dirrm %%DATADIR%%