ports/101880: [PATCH] www/www6to4: update to 1.6, respect DESTDIR, DOCSDIR
chinsan
chinsan.tw at gmail.com
Sat Aug 12 07:50:13 UTC 2006
>Number: 101880
>Category: ports
>Synopsis: [PATCH] www/www6to4: update to 1.6, respect DESTDIR, DOCSDIR
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat Aug 12 07:50:12 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: chinsan
>Release: FreeBSD 6.1-STABLE i386
>Organization:
Taiwan
>Environment:
System: FreeBSD BSD6.giga.hgc.com.tw 6.1-STABLE FreeBSD 6.1-STABLE #5: Mon Jul 17 09:30:36 CST 2006
>Description:
- Update to 1.6
- Respect DESTDIR, DOCSDIR
Removed file(s):
- files/patch-www6to4.c
Port maintainer (janos.mohacsi at bsd.hu) is cc'd.
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- www6to4-1.6.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/www/www6to4/Makefile /usr/home/chinsan/project/www6to4/Makefile
--- /usr/ports/www/www6to4/Makefile Mon Nov 3 18:05:55 2003
+++ /usr/home/chinsan/project/www6to4/Makefile Sat Aug 12 15:11:06 2006
@@ -5,30 +5,35 @@
# $FreeBSD: ports/www/www6to4/Makefile,v 1.4 2003/11/03 10:05:55 linimon Exp $
PORTNAME= www6to4
-PORTVERSION= 1.5
+PORTVERSION= 1.6
CATEGORIES= www ipv6
MASTER_SITES= ftp://ftp.pasta.cs.uit.no/pub/Vermicelli/
MAINTAINER= janos.mohacsi at bsd.hu
COMMENT= Lightweight http proxy to help IPv4 only browsers
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/./-/}
+
+post-patch:
+ @${REINPLACE_CMD} -e 's,/etc,${TARGETDIR}/etc,' \
+ ${WRKSRC}/www6to4.c
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/www6to4 ${PREFIX}/sbin
- @if [ ! -d ${PREFIX}/etc/www6to4 ]; then \
- ${MKDIR} ${PREFIX}/etc/www6to4; fi
+ ${INSTALL_PROGRAM} ${WRKSRC}/www6to4 ${TARGETDIR}/sbin
+ @if [ ! -d ${TARGETDIR}/etc/www6to4 ]; then \
+ ${MKDIR} ${TARGETDIR}/etc/www6to4; fi
${INSTALL_DATA} ${WRKSRC}/www6to4.conf \
- ${PREFIX}/etc/www6to4/www6to4.conf.sample
+ ${TARGETDIR}/etc/www6to4/www6to4.conf.sample
${INSTALL_DATA} ${WRKSRC}/www6to4_forward.conf \
- ${PREFIX}/etc/www6to4/www6to4_forward.conf.sample
+ ${TARGETDIR}/etc/www6to4/www6to4_forward.conf.sample
.if !defined(NOPORTDOCS)
if [ ! -d ${DOCSDIR} ]; then \
${MKDIR} ${DOCSDIR}; fi
${INSTALL_DATA} ${WRKSRC}/README \
${DOCSDIR}
.endif
- @if [ ! -f ${PREFIX}/etc/rc.d/www6to4.sh ]; then \
- ${ECHO} "Installing ${PREFIX}/etc/rc.d/www6to4.sh startup file."; \
- ${INSTALL_SCRIPT} -m 751 ${FILESDIR}/www6to4.sh ${PREFIX}/etc/rc.d/www6to4.sh; \
+ @if [ ! -f ${TARGETDIR}/etc/rc.d/www6to4.sh ]; then \
+ ${ECHO} "Installing ${TARGETDIR}/etc/rc.d/www6to4.sh startup file."; \
+ ${INSTALL_SCRIPT} -m 751 ${FILESDIR}/www6to4.sh ${TARGETDIR}/etc/rc.d/www6to4.sh; \
fi
.include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/www/www6to4/distinfo /usr/home/chinsan/project/www6to4/distinfo
--- /usr/ports/www/www6to4/distinfo Tue Jan 24 11:14:17 2006
+++ /usr/home/chinsan/project/www6to4/distinfo Sat Aug 12 14:55:18 2006
@@ -1,3 +1,3 @@
-MD5 (www6to4-1.5.tar.gz) = 6f1e4940c0f82196d8ebbe52761e2478
-SHA256 (www6to4-1.5.tar.gz) = f1fcabdf9bd972e6898e4a51c3d80d1c08b390315753f0ab08b468615e782549
-SIZE (www6to4-1.5.tar.gz) = 25691
+MD5 (www6to4-1.6.tar.gz) = 12df3193e798f5c18667a805aaa6d6ec
+SHA256 (www6to4-1.6.tar.gz) = 75c8a27b018cdda95d2a77e06bcc1c1c4a94ff6c0e9c459b9092d9c417619efa
+SIZE (www6to4-1.6.tar.gz) = 25798
diff -ruN --exclude=CVS /usr/ports/www/www6to4/files/patch-www6to4.c /usr/home/chinsan/project/www6to4/files/patch-www6to4.c
--- /usr/ports/www/www6to4/files/patch-www6to4.c Wed Sep 11 05:36:05 2002
+++ /usr/home/chinsan/project/www6to4/files/patch-www6to4.c Thu Jan 1 08:00:00 1970
@@ -1,19 +0,0 @@
-*** www6to4.c.orig Fri Mar 22 00:25:51 2002
---- www6to4.c Fri Mar 22 00:26:48 2002
-***************
-*** 59,65 ****
- char *patterns[MAXPATTERNS];
- int lastpattern = -1;
-
-! char *default_configfile = "/etc/www6to4.conf";
- char *configfile = NULL;
- char *forwardfile = NULL;
- int debug = 0;
---- 59,65 ----
- char *patterns[MAXPATTERNS];
- int lastpattern = -1;
-
-! char *default_configfile = "/usr/local/etc/www6to4/www6to4.conf";
- char *configfile = NULL;
- char *forwardfile = NULL;
- int debug = 0;
diff -ruN --exclude=CVS /usr/ports/www/www6to4/files/www6to4.sh /usr/home/chinsan/project/www6to4/files/www6to4.sh
--- /usr/ports/www/www6to4/files/www6to4.sh Wed Sep 11 05:36:05 2002
+++ /usr/home/chinsan/project/www6to4/files/www6to4.sh Sat Aug 12 15:05:31 2006
@@ -1,18 +1,18 @@
#!/bin/sh
# $FreeBSD: ports/www/www6to4/files/www6to4.sh,v 1.1 2002/09/10 21:36:05 obraun Exp $
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
- echo "$0: Cannot determine the PREFIX" >&2
+if ! TARGETDIR=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
+ echo "$0: Cannot determine the TARGETDIR" >&2
exit 1
fi
-WWW6TO4DIR=${PREFIX}/etc/www6to4
+WWW6TO4DIR=${TARGETDIR}/etc/www6to4
case $1 in
start)
if [ -d ${WWW6TO4DIR} \
- -a -x ${PREFIX}/sbin/www6to4 \
+ -a -x ${TARGETDIR}/sbin/www6to4 \
-a -f ${WWW6TO4DIR}/www6to4.conf ]; then
: seems OK
else
@@ -20,7 +20,7 @@
exit 1
fi
cd ${WWW6TO4DIR}
- su -m nobody -c "${PREFIX}/sbin/www6to4 &" \
+ su -m nobody -c "${TARGETDIR}/sbin/www6to4 &" \
>/dev/null \
&& echo -n " www6to4" \
|| echo " www6to4 FAILED TO START"
diff -ruN --exclude=CVS /usr/ports/www/www6to4/pkg-plist /usr/home/chinsan/project/www6to4/pkg-plist
--- /usr/ports/www/www6to4/pkg-plist Wed Sep 11 05:36:05 2002
+++ /usr/home/chinsan/project/www6to4/pkg-plist Sat Aug 12 15:02:04 2006
@@ -2,6 +2,6 @@
etc/www6to4/www6to4.conf.sample
etc/www6to4/www6to4_forward.conf.sample
etc/rc.d/www6to4.sh
-%%PORTDOCS%%share/doc/www6to4/README
+%%PORTDOCS%%%%DOCSDIR%%/README
@dirrm etc/www6to4
-%%PORTDOCS%%@dirrm share/doc/www6to4
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- www6to4-1.6.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list