svn commit: r353178 - in head/www/www6to4: . files

[Alex Kozlov]

Author: ak
Date: Wed May  7 17:08:56 2014
New Revision: 353178
URL: http://svnweb.freebsd.org/changeset/ports/353178
QAT: https://qat.redports.org/buildarchive/r353178/

Log:
  - Support STAGEDIR [1]
  - Add license [1]
  - Use @sample to handle config files
  
  PR:	ports/188936 (based on) [1]
  Submitted by:	Takefu <takefu at airport.fm> [1]
  Approved by:	Janos Mohacsi <jmohacsi at bsd.hu> (maintainer)

Deleted:
  head/www/www6to4/files/patch-Makefile
Modified:
  head/www/www6to4/Makefile
  head/www/www6to4/pkg-plist

Modified: head/www/www6to4/Makefile
==============================================================================
--- head/www/www6to4/Makefile	Wed May  7 17:02:36 2014	(r353177)
+++ head/www/www6to4/Makefile	Wed May  7 17:08:56 2014	(r353178)
@@ -10,27 +10,28 @@ MASTER_SITES=	ftp://ftp.pasta.cs.uit.no/
 MAINTAINER=	jmohacsi at bsd.hu
 COMMENT=	Lightweight http proxy to help IPv4 only browsers
 
+LICENSE=	GPLv2
+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/./-/}
 
 USE_RC_SUBR=	www6to4
 
-NO_STAGE=	yes
+PORTDOCS=	README
+
+ALL_TARGET=	www6to4
+
 post-patch:
-	@${REINPLACE_CMD} -e 's,/etc,${PREFIX}/etc,' \
-		${WRKSRC}/www6to4.c
+	@${REINPLACE_CMD} -e 's,/etc,${ETCDIR},' \
+		${WRKSRC}/www6to4.c ${WRKSRC}/www6to4.conf
+
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/www6to4 ${PREFIX}/sbin
-	@if [ ! -d ${PREFIX}/etc/www6to4 ]; then \
-		${MKDIR} ${PREFIX}/etc/www6to4; fi
+	${INSTALL_PROGRAM} ${WRKSRC}/www6to4 ${STAGEDIR}${PREFIX}/sbin
+	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/www6to4.conf \
-		${PREFIX}/etc/www6to4/www6to4.conf.sample
+		${STAGEDIR}${ETCDIR}/www6to4.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/www6to4_forward.conf \
-		${PREFIX}/etc/www6to4/www6to4_forward.conf.sample
-.if !defined(NOPORTDOCS)
-	if [ ! -d ${DOCSDIR} ]; then \
-		${MKDIR} ${DOCSDIR}; fi
-	${INSTALL_DATA} ${WRKSRC}/README \
-		${DOCSDIR}
-.endif
+		${STAGEDIR}${ETCDIR}/www6to4_forward.conf.sample
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/www/www6to4/pkg-plist
==============================================================================
--- head/www/www6to4/pkg-plist	Wed May  7 17:02:36 2014	(r353177)
+++ head/www/www6to4/pkg-plist	Wed May  7 17:08:56 2014	(r353178)
@@ -1,6 +1,4 @@
 sbin/www6to4
-etc/www6to4/www6to4.conf.sample
-etc/www6to4/www6to4_forward.conf.sample
-%%PORTDOCS%%%%DOCSDIR%%/README
- at dirrm etc/www6to4
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+ at sample %%ETCDIR%%/www6to4.conf.sample
+ at sample %%ETCDIR%%/www6to4_forward.conf.sample
+ at dirrmtry %%ETCDIR%%