svn commit: r354123 - in head/www/havp: . files

[Renato Botelho]

Author: garga
Date: Thu May 15 13:19:06 2014
New Revision: 354123
URL: http://svnweb.freebsd.org/changeset/ports/354123
QAT: https://qat.redports.org/buildarchive/r354123/

Log:
  . Support stage
  . Use new LIB_DEPENDS syntax
  
  Approved by:	portmgr (blanket)

Modified:
  head/www/havp/Makefile
  head/www/havp/files/patch-havp_Makefile.in
  head/www/havp/pkg-plist

Modified: head/www/havp/Makefile
==============================================================================
--- head/www/havp/Makefile	Thu May 15 13:18:16 2014	(r354122)
+++ head/www/havp/Makefile	Thu May 15 13:19:06 2014	(r354123)
@@ -3,7 +3,7 @@
 
 PORTNAME=	havp
 PORTVERSION=	0.91
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://www.server-side.de/download/ \
 		http://bio3k.softboard.ru/uploads/arch/ \
@@ -12,7 +12,7 @@ MASTER_SITES=	http://www.server-side.de/
 MAINTAINER=	ayu at commun.jp
 COMMENT=	HTTP Antivirus Proxy
 
-LIB_DEPENDS=	clamav.7:${PORTSDIR}/security/clamav
+LIB_DEPENDS=	libclamav.so:${PORTSDIR}/security/clamav
 
 USES=		gmake perl5
 GNU_CONFIGURE=	yes
@@ -34,7 +34,6 @@ SSL_DESC=	SSL proxying (not scanned, onl
 CLAMAV_DESC=	libclamav support
 TROPHIE_DESC=	Trend Micro (Trophie) support
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSSL}
@@ -55,16 +54,11 @@ CONFIGURE_ARGS+=	--enable-trophie
 CONFIGURE_ARGS+=	--disable-trophie
 .endif
 
-pre-install:
-	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
 post-install:
-	@[ -f ${PREFIX}/etc/havp/havp.config ] || \
-		${CP} ${PREFIX}/etc/havp/havp.config.default ${PREFIX}/etc/havp/havp.config
-	@${MKDIR} ${EXAMPLESDIR}
-	@${CP} ${WRKSRC}/etc/havp/blacklist ${EXAMPLESDIR}/blacklist.sample
-	@${CP} -R ${WRKSRC}/etc/havp/templates ${EXAMPLESDIR}
-	@${CP} ${WRKSRC}/etc/havp/whitelist ${EXAMPLESDIR}/whitelist.sample
-	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	@${CP} ${WRKSRC}/etc/havp/blacklist ${STAGEDIR}${EXAMPLESDIR}/blacklist.sample
+	@${CP} -R ${WRKSRC}/etc/havp/templates ${STAGEDIR}${EXAMPLESDIR}
+	@${CP} ${WRKSRC}/etc/havp/whitelist ${STAGEDIR}${EXAMPLESDIR}/whitelist.sample
+	@${MKDIR} ${STAGEDIR}${LOG_DIR} ${STAGEDIR}${TMP_DIR} ${STAGEDIR}${RUN_DIR}
 
 .include <bsd.port.mk>

Modified: head/www/havp/files/patch-havp_Makefile.in
==============================================================================
--- head/www/havp/files/patch-havp_Makefile.in	Thu May 15 13:18:16 2014	(r354122)
+++ head/www/havp/files/patch-havp_Makefile.in	Thu May 15 13:19:06 2014	(r354123)
@@ -1,13 +1,15 @@
 --- havp/Makefile.in.orig	2007-09-11 15:42:44.000000000 -0300
-+++ havp/Makefile.in	2008-02-18 08:38:17.000000000 -0300
-@@ -26,30 +26,7 @@
++++ havp/Makefile.in	2014-05-14 16:38:18.000000000 -0300
+@@ -25,31 +25,8 @@
+ 
  install: all
  	$(INSTALL) -d $(DESTDIR)$(sbindir)
- 	$(INSTALL) -m 755 havp $(DESTDIR)$(sbindir)/havp
+-	$(INSTALL) -m 755 havp $(DESTDIR)$(sbindir)/havp
 -	$(INSTALL) -d -m 755 $(DESTDIR)$(localstatedir)/log/havp
 -	$(INSTALL) -d -m 755 $(DESTDIR)$(localstatedir)/tmp/havp
 -	$(INSTALL) -d -m 755 $(DESTDIR)$(localstatedir)/run/havp
 -	$(INSTALL) -d $(DESTDIR)/etc/init.d
++	$(BSD_INSTALL_PROGRAM) -m 755 havp $(DESTDIR)$(sbindir)/havp
  	$(INSTALL) -m 644 ../etc/havp/havp.config $(DESTDIR)$(sysconfdir)/havp/havp.config.default
 -	@if [ ! -f $(DESTDIR)$(sysconfdir)/havp/havp.config ]; then \
 -		echo "$(INSTALL) -m 644 ../etc/havp/havp.config $(DESTDIR)$(sysconfdir)/havp/havp.config"; \

Modified: head/www/havp/pkg-plist
==============================================================================
--- head/www/havp/pkg-plist	Thu May 15 13:18:16 2014	(r354122)
+++ head/www/havp/pkg-plist	Thu May 15 13:19:06 2014	(r354123)
@@ -120,6 +120,13 @@ etc/havp/havp.config.default
 @dirrm %%EXAMPLESDIR%%/templates
 %%EXAMPLESDIR%%/whitelist.sample
 @dirrm %%EXAMPLESDIR%%
+ at cwd /
+ at mode 755
+ at owner havp
+ at group havp
 @dirrmtry %%LOG_DIR%%
 @dirrmtry %%TMP_DIR%%
 @dirrmtry %%RUN_DIR%%
+ at owner
+ at group
+ at mode