Date: Thu, 21 May 2009 06:30:38 +0200 (CEST) From: dirk.meyer@dinoex.sub.org To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/134772: [patch] net/miredo fix build for option WITHOUT_NLS Message-ID: <200905210430.n4L4UcQ0045226@home3.dinoex.sub.de> Resent-Message-ID: <200905210440.n4L4e1CL064777@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 134772
>Category: ports
>Synopsis: [patch] net/miredo fix build for option WITHOUT_NLS
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Thu May 21 04:40:00 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Dirk Meyer
>Release: FreeBSD 7.2-STABLE
>Organization:
privat
>Environment:
in etc/make.conf:
WITHOUT_NLS=yes
>Description:
a)
Build fails:
[...]
===> Patching for miredo-1.1.6
===> miredo-1.1.6 depends on shared library: Judy.1 - found
===> Configuring for miredo-1.1.6
[...]
checking Judy.h usability... no
checking Judy.h presence... no
checking for Judy.h... no
configure: WARNING: If you don't care about scalability, re-run configure with '--without-Judy'.
configure: error: Required Judy dynamic arrays library missing.
===> Script "configure" failed unexpectedly.
[...]
b)
The remove of sample configuration file does not work.
1.) %%TARGETDIR%% is not defined, replaced with "%D".
2.) The path to the file in PORTDOCS has no prefix "%D".
3.) The argument to rm has wrong path.
"miredo/etc" must be "etc/miredo"
c)
Remove extra directories created by make install
>How-To-Repeat:
$ make clean all WITHOUT_NLS=yes
>Fix:
apply this patch
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/net/miredo/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile 14 May 2009 09:45:52 -0000 1.9
+++ Makefile 21 May 2009 04:21:25 -0000
@@ -24,16 +24,16 @@
MAN8= miredo-server.8 miredo.8 miredo-checkconf.8
USE_RC_SUBR= miredo_server miredo
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
-USE_ICONV= yes
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
CFLAGS="${PTHREAD_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT= yes
+USE_ICONV= yes
CONFIGURE_ARGS+= --enable-nls
PLIST_SUB= NLS=""
.else
-CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS}"
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB= NLS="@comment "
.endif
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/net/miredo/pkg-plist,v
retrieving revision 1.3
diff -u -r1.3 pkg-plist
--- pkg-plist 14 May 2009 09:45:52 -0000 1.3
+++ pkg-plist 21 May 2009 04:21:25 -0000
@@ -14,7 +14,7 @@
include/libteredo/teredo-udp.h
include/libteredo/tunnel.h
include/libtun6/tun6.h
-@unexec [ -f %%TARGETDIR%%/etc/miredo/miredo.conf ] && cmp -s %%TARGETDIR%%/etc/miredo/miredo.conf %%DOCSDIR%%/examples/miredo.conf && rm %%TARGETDIR%%/miredo/etc/miredo.conf || exit 0
+@unexec [ -f %D/etc/miredo/miredo.conf ] && cmp -s %D/etc/miredo/miredo.conf %D/%%DOCSDIR%%/examples/miredo.conf && rm %D/etc/miredo/miredo.conf || true
etc/miredo/client-hook
@exec [ -f %B/miredo/miredo.conf ] || cp %F %B/miredo/miredo.conf
%%DOCSDIR%%/examples/miredo-server.conf
@@ -27,3 +27,5 @@
@dirrmtry etc/miredo
@dirrm include/libtun6
@dirrm include/libteredo
+@dirrmtry var/run
+@dirrmtry var
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200905210430.n4L4UcQ0045226>