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

- Fix libintl detection

Browse Source 
- Don't include bundled libintl headers
- Bump PKGNAME
This commit is contained in:
alek 2005-02-20 01:51:43 +00:00
parent d40553cbda
commit cb1b0e21fc
4 changed files with 54 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
misc/fileutils/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.18 2004/12/22 11:48:33 alek Exp $
# $OpenBSD: Makefile,v 1.19 2005/02/20 01:51:43 alek Exp $
COMMENT= "GNU versions of common file management utilities"
COMMENT-ls= "colorized GNU 'ls'"
@ -7,8 +7,8 @@ V= 4.1
DISTNAME= fileutils-$V
CATEGORIES= misc
PKGNAME= ${DISTNAME}p1
PKGNAME-ls= gnuls-$V
PKGNAME= ${DISTNAME}p2
PKGNAME-ls= gnuls-$Vp0
# GPL
PERMIT_PACKAGE_CDROM= Yes

30
misc/fileutils/patches/patch-configure Normal file
View File

@ -0,0 +1,30 @@
$OpenBSD: patch-configure,v 1.1 2005/02/20 01:51:43 alek Exp $
--- configure.orig Sat Feb 19 22:38:14 2005
+++ configure Sat Feb 19 22:38:43 2005
@@ -22370,7 +22370,7 @@ if test "${ac_cv_lib_intl_bindtextdomain
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lintl $LIBS"
+LIBS="-lintl -liconv $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line 22375 "configure"
#include "confdefs.h"
@@ -22421,7 +22421,7 @@ if test "${ac_cv_lib_intl_gettext+set}"
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lintl $LIBS"
+LIBS="-lintl -liconv $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line 22426 "configure"
#include "confdefs.h"
@@ -22469,7 +22469,7 @@ if test $ac_cv_lib_intl_gettext = yes; t
#define HAVE_LIBINTL 1
EOF
- LIBS="-lintl $LIBS"
+ LIBS="-lintl -liconv $LIBS"
fi

12
misc/fileutils/patches/patch-lib_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-lib_Makefile_in,v 1.1 2005/02/20 01:51:43 alek Exp $
--- lib/Makefile.in.orig Sat Feb 19 22:58:54 2005
+++ lib/Makefile.in Sat Feb 19 22:58:59 2005
@@ -123,7 +123,7 @@ AUTOMAKE_OPTIONS = ../src/ansi2knr
noinst_LIBRARIES = libfetish.a
-INCLUDES = -I.. -I$(srcdir) -I../intl
+INCLUDES = -I.. -I$(srcdir)
DEFS = -DLIBDIR=\"$(libdir)\" @DEFS@
libfetish_a_SOURCES = \

9
misc/fileutils/patches/patch-src_Makefile_in
View File

@ -1,5 +1,14 @@
--- src/Makefile.in.orig Sun Apr 29 07:40:37 2001
+++ src/Makefile.in Mon Feb 24 23:18:38 2003
@@ -135,7 +135,7 @@ noinst_HEADERS = \
EXTRA_DIST = dcgen dircolors.hin
-INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/lib -I../intl
+INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/lib
DEFS = -DLOCALEDIR=\"$(localedir)\" -DSHAREDIR=\"$(datadir)\" @DEFS@
LDADD = @INTLLIBS@ ../lib/libfetish.a
@@ -338,7 +338,7 @@ install-binPROGRAMS: $(bin_PROGRAMS)
$(mkinstalldirs) $(DESTDIR)$(bindir)
@list='$(bin_PROGRAMS)'; for p in $$list; do \