- Don't use included libintl

- Use shared libs, if available
- Bump PKGNAME

ok naddy@
This commit is contained in:
alek 2005-02-09 00:41:19 +00:00
parent b56e58bf7a
commit 944bfdf55e
4 changed files with 46 additions and 5 deletions

View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.5 2004/12/16 00:31:20 alek Exp $
# $OpenBSD: Makefile,v 1.6 2005/02/09 00:41:19 alek Exp $
COMMENT= "wireless access point configuration tools"
DISTNAME= ap-utils-1.3.2
PKGNAME= ${DISTNAME}p0
CATEGORIES= net
EXTRACT_SUFX= .tar.bz2

View File

@ -1,7 +1,14 @@
$OpenBSD: patch-configure,v 1.2 2003/06/02 02:02:36 margarida Exp $
--- configure.orig Wed May 28 03:56:16 2003
+++ configure Thu May 29 08:54:22 2003
@@ -3893,7 +3893,7 @@ else
$OpenBSD: patch-configure,v 1.3 2005/02/09 00:41:20 alek Exp $
--- configure.orig Wed May 28 11:56:16 2003
+++ configure Tue Feb 8 23:08:13 2005
@@ -3887,13 +3887,13 @@ else
gt_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $INCINTL"
gt_save_LIBS="$LIBS"
- LIBS="$LIBS $LIBINTL"
+ LIBS="$LIBS $LIBINTL $LIBICONV"
cat > conftest.$ac_ext <<EOF
#line 3893 "configure"
#include "confdefs.h"
#include <libintl.h>
extern int _nl_msg_cat_cntr;
@ -19,3 +26,12 @@ $OpenBSD: patch-configure,v 1.2 2003/06/02 02:02:36 margarida Exp $
; return 0; }
EOF
if { (eval echo configure:3908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
@@ -4380,7 +4380,7 @@ s%@DATADIRNAME@%$DATADIRNAME%g
s%@INSTOBJEXT@%$INSTOBJEXT%g
s%@GENCAT@%$GENCAT%g
s%@INTL_LIBTOOL_SUFFIX_PREFIX@%$INTL_LIBTOOL_SUFFIX_PREFIX%g
-s%@INTLLIBS@%$INTLLIBS%g
+s%@INTLLIBS@%$LTLIBINTL $LTLIBICONV%g
s%@LIBINTL@%$LIBINTL%g
s%@LTLIBINTL@%$LTLIBINTL%g
s%@POSUB@%$POSUB%g

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-lib_Makefile_in,v 1.3 2005/02/09 00:41:20 alek Exp $
--- lib/Makefile.in.orig Tue Feb 8 23:10:18 2005
+++ lib/Makefile.in Tue Feb 8 23:10:28 2005
@@ -104,7 +104,7 @@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIB
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-INCLUDES = -I../intl
+INCLUDES =
noinst_LIBRARIES = libap.a
libap_a_SOURCES = ap-utils.h reset.c snmp.c
EXTRA_libap_a_SOURCES = ber.c

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_Makefile_in,v 1.3 2005/02/09 00:41:20 alek Exp $
--- src/Makefile.in.orig Tue Feb 8 23:05:44 2005
+++ src/Makefile.in Tue Feb 8 23:06:00 2005
@@ -108,7 +108,7 @@ USE_NLS = @USE_NLS@
VERSION = @VERSION@
DEFS = -DLOCALEDIR=\"$(datadir)/locale\" -DHAVE_CONFIG_H
-INCLUDES = -I../lib -I../intl -I..
+INCLUDES = -I../lib -I..
LIBS = @INTLLIBS@ @LIBS@
bin_PROGRAMS = ap-config ap-mrtg