cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Fix libintl detection

Browse Source 
- Don't use included libintl headers
- Bump PKGNAME
This commit is contained in:
alek 2005-02-21 20:49:25 +00:00
parent 7851691fe1
commit 412b4bf28a
5 changed files with 70 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devel/id-utils/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.28 2004/11/23 11:22:02 espie Exp $
# $OpenBSD: Makefile,v 1.29 2005/02/21 20:49:25 alek Exp $
COMMENT= "gid/lid tools for looking up variables in code"
DISTNAME= id-utils-3.2d
PKGNAME= ${DISTNAME}p0
CATEGORIES= devel
# License: GPL
@ -20,6 +21,8 @@ MODULES= devel/gettext
# don't compile emacs mode files now, install what's needed
# and run it at pkg_add time
CONFIGURE_ARGS=--without-emacs
CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/lib/id-utils

30
devel/id-utils/patches/patch-configure Normal file
View File

@ -0,0 +1,30 @@
$OpenBSD: patch-configure,v 1.1 2005/02/21 20:49:26 alek Exp $
--- configure.orig Mon Feb 21 21:29:38 2005
+++ configure Mon Feb 21 21:30:02 2005
@@ -3545,7 +3545,7 @@ if eval "test \"\${ac_cv_lib_$ac_lib_var
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lintl $LIBS"
+LIBS="-lintl -liconv $LIBS"
cat > conftest.$ac_ext <<EOF
#line 3551 "configure"
#include "confdefs.h"
@@ -3585,7 +3585,7 @@ if eval "test \"\${ac_cv_lib_$ac_lib_var
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lintl $LIBS"
+LIBS="-lintl -liconv $LIBS"
cat > conftest.$ac_ext <<EOF
#line 3591 "configure"
#include "confdefs.h"
@@ -3628,7 +3628,7 @@ fi
if test "$gt_cv_func_gettext_libintl" = yes; then
- LIBS="$LIBS -lintl"
+ LIBS="$LIBS -lintl -liconv"
fi
fi

12
devel/id-utils/patches/patch-lib_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-lib_Makefile_in,v 1.1 2005/02/21 20:49:26 alek Exp $
--- lib/Makefile.in.orig Mon Feb 21 21:38:37 2005
+++ lib/Makefile.in Mon Feb 21 21:38:41 2005
@@ -105,7 +105,7 @@ libsys_a_SOURCES = xgetcwd.c xmalloc.c g
noinst_HEADERS = ansidecl.h error.h fnmatch.h getopt.h obstack.h pathmax.h regex.h xalloca.h xdirent.h xfnmatch.h xmalloc.h xobstack.h xstddef.h xstdlib.h xstring.h xsysstat.h xunistd.h
-INCLUDES = -I. -I$(srcdir) -I../intl -I$(top_srcdir)/intl -I.. -I$(top_srcdir)
+INCLUDES = -I. -I$(srcdir) -I.. -I$(top_srcdir)
DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
libsys_a_LIBADD = @LIBOBJS@ @ALLOCA@

12
devel/id-utils/patches/patch-libidu_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-libidu_Makefile_in,v 1.1 2005/02/21 20:49:26 alek Exp $
--- libidu/Makefile.in.orig Mon Feb 21 21:38:56 2005
+++ libidu/Makefile.in Mon Feb 21 21:39:04 2005
@@ -106,7 +106,7 @@ EXTRA_DIST = $(idu_DATA)
noinst_HEADERS = dynvec.h hash.h idfile.h scanners.h tokflags.h xnls.h
-INCLUDES = -I. -I$(srcdir) -I../lib -I$(top_srcdir)/lib -I../intl -I$(top_srcdir)/intl -I.. -I$(top_srcdir)
+INCLUDES = -I. -I$(srcdir) -I../lib -I$(top_srcdir)/lib -I.. -I$(top_srcdir)
DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

12
devel/id-utils/patches/patch-src_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_Makefile_in,v 1.1 2005/02/21 20:49:26 alek Exp $
--- src/Makefile.in.orig Mon Feb 21 21:38:11 2005
+++ src/Makefile.in Mon Feb 21 21:38:20 2005
@@ -102,7 +102,7 @@ EXTRA_DIST = ansi2knr.1 ansi2knr.c $(bin
localedir = $(datadir)/locale
-INCLUDES = -I. -I$(srcdir) -I../libidu -I$(top_srcdir)/libidu -I../lib -I$(top_srcdir)/lib -I../intl -I$(top_srcdir)/intl -I.. -I$(top_srcdir)
+INCLUDES = -I. -I$(srcdir) -I../libidu -I$(top_srcdir)/libidu -I../lib -I$(top_srcdir)/lib -I.. -I$(top_srcdir)
DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
LDADD = @INTLLIBS@ ../libidu/libidu.a ../lib/libsys.a