diff options
| author | edwin <edwin@FreeBSD.org> | 2004-05-22 10:14:02 +0800 |
|---|---|---|
| committer | edwin <edwin@FreeBSD.org> | 2004-05-22 10:14:02 +0800 |
| commit | 4cf5a993fdc2f8827aca8f30a5d09e6a15c93d8b (patch) | |
| tree | 9c3aa2476ac0b7f7f074864df0d561021e8f75e9 /net/freenet6 | |
| parent | 81e44bd48bba815baa3a533b513074cf8fbb2c73 (diff) | |
| download | freebsd-ports-gnome-4cf5a993fdc2f8827aca8f30a5d09e6a15c93d8b.tar.gz freebsd-ports-gnome-4cf5a993fdc2f8827aca8f30a5d09e6a15c93d8b.tar.zst freebsd-ports-gnome-4cf5a993fdc2f8827aca8f30a5d09e6a15c93d8b.zip | |
From submitter:
I've noticed that on some 'unsymmetric' locales/charsets, the
lower/uppercase conversion in the tspc-scripts fails on FreeBSD
5.x (caused by tr being changed to behave posixly correct). The
fix is easy, see attached patch.
Submitted by: Michael Nottebrock <michaelnottebrock@gmx.net>
Diffstat (limited to 'net/freenet6')
| -rw-r--r-- | net/freenet6/Makefile | 7 | ||||
| -rw-r--r-- | net/freenet6/files/patch-template-freebsd4.sh | 13 | ||||
| -rw-r--r-- | net/freenet6/files/patch-template-freebsd44.sh | 13 |
3 files changed, 26 insertions, 7 deletions
diff --git a/net/freenet6/Makefile b/net/freenet6/Makefile index d8ff6a71e60d..c8cf4a93f885 100644 --- a/net/freenet6/Makefile +++ b/net/freenet6/Makefile @@ -7,6 +7,7 @@ PORTNAME= freenet6 PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= net ipv6 MASTER_SITES= # fetch manually DISTNAME= ${PORTNAME}-client-${PORTVERSION} @@ -24,7 +25,7 @@ USE_REINPLACE= yes MAN8= tspc.8 MAN5= tspc.conf.5 -PKGMESSAGE= ${WRKSRC}/pkg-message +PKGMESSAGE= ${WRKDIR}/pkg-message .include <bsd.port.pre.mk> @@ -69,8 +70,8 @@ post-patch: @${CP} ${FILESDIR}/freenet6.sh.in ${WRKSRC}/freenet6.sh @${REINPLACE_CMD} -e "s|@@PREFIX@@|${PREFIX}|g" ${WRKSRC}/freenet6.sh - @${CP} ${FILESDIR}/pkg-message.in ${WRKSRC}/pkg-message - @${REINPLACE_CMD} -e "s|@@PREFIX@@|${PREFIX}|g" ${WRKSRC}/pkg-message + @${CP} ${FILESDIR}/pkg-message.in ${WRKDIR}/pkg-message + @${REINPLACE_CMD} -e "s|@@PREFIX@@|${PREFIX}|g" ${WRKDIR}/pkg-message @${REINPLACE_CMD} -e "s|@@PREFIX@@|${PREFIX}|g" \ ${WRKSRC}/man/man8/tspc.8 diff --git a/net/freenet6/files/patch-template-freebsd4.sh b/net/freenet6/files/patch-template-freebsd4.sh index daf81264e817..d2c5d2696062 100644 --- a/net/freenet6/files/patch-template-freebsd4.sh +++ b/net/freenet6/files/patch-template-freebsd4.sh @@ -1,8 +1,17 @@ --- template/freebsd4.sh.orig Thu Oct 11 16:40:29 2001 +++ template/freebsd4.sh Thu Oct 11 16:40:48 2001 -@@ -110,6 +110,9 @@ +@@ -92,7 +92,7 @@ + fi + + #change to upper case +-TSP_HOST_TYPE=`echo $TSP_HOST_TYPE | tr a-z A-Z` ++TSP_HOST_TYPE=`echo $TSP_HOST_TYPE | tr [:lower:] [:upper:]` + + if [ X"${TSP_HOST_TYPE}" = X"HOST" ] || [ X"${TSP_HOST_TYPE}" = X"ROUTER" ]; then + # +@@ -122,6 +122,9 @@ # Delete any default IPv6 route first - Exec $route delete -inet6 default + ExecNoCheck $route delete -inet6 default Exec $route add -inet6 default -interface $TSP_TUNNEL_INTERFACE + + # Save interface for later diff --git a/net/freenet6/files/patch-template-freebsd44.sh b/net/freenet6/files/patch-template-freebsd44.sh index 10f07f462f55..290c6647693e 100644 --- a/net/freenet6/files/patch-template-freebsd44.sh +++ b/net/freenet6/files/patch-template-freebsd44.sh @@ -8,7 +8,16 @@ ifconfig=/sbin/ifconfig route=/sbin/route rtadvd=/usr/sbin/rtadvd -@@ -104,7 +103,7 @@ +@@ -89,7 +88,7 @@ + fi + + #change to upper case +-TSP_HOST_TYPE=`echo $TSP_HOST_TYPE | tr a-z A-Z` ++TSP_HOST_TYPE=`echo $TSP_HOST_TYPE | tr [:lower:] [:upper:]` + + if [ X"${TSP_HOST_TYPE}" = X"HOST" ] || [ X"${TSP_HOST_TYPE}" = X"ROUTER" ]; then + # +@@ -103,7 +102,7 @@ Exec $ifconfig $TSP_TUNNEL_INTERFACE destroy fi Exec $ifconfig $TSP_TUNNEL_INTERFACE create @@ -17,7 +26,7 @@ # # Configured tunnel config (IPv6) -@@ -118,6 +117,9 @@ +@@ -117,6 +116,9 @@ # Delete any default IPv6 route first ExecNoCheck $route delete -inet6 default Exec $route add -inet6 default $TSP_SERVER_ADDRESS_IPV6 |