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

- Don't build included libintl or include its headers

Browse Source 
- Fix libintl/libiconv detection
- Bump PKGNAME
This commit is contained in:
alek 2005-11-19 01:23:42 +00:00
parent 7b168112ce
commit da1a4408c0
6 changed files with 71 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
misc/sh-utils/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.11 2004/12/22 11:50:29 alek Exp $
# $OpenBSD: Makefile,v 1.12 2005/11/19 01:23:42 alek Exp $
COMMENT= "GNU command line utilities"
DISTNAME= sh-utils-2.0
PKGNAME= ${DISTNAME}p0
CATEGORIES= misc
# GPL

12
misc/sh-utils/patches/patch-Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-Makefile_in,v 1.1 2005/11/19 01:23:42 alek Exp $
--- Makefile.in.orig Sat Nov 19 01:11:37 2005
+++ Makefile.in Sat Nov 19 01:11:45 2005
@@ -107,7 +107,7 @@ l = @l@
AUTOMAKE_OPTIONS = gnits 1.2h
-SUBDIRS = lib intl src doc man m4 po tests
+SUBDIRS = lib src doc man m4 po tests
EXTRA_DIST = ChangeLog.0 Makefile.maint
# Remove this file here (it is created via configure), not from within intl.

30
misc/sh-utils/patches/patch-configure Normal file
View File

@ -0,0 +1,30 @@
$OpenBSD: patch-configure,v 1.1 2005/11/19 01:23:42 alek Exp $
--- configure.orig Sat Nov 19 00:29:02 2005
+++ configure Sat Nov 19 00:29:44 2005
@@ -11036,7 +11036,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 11042 "configure"
#include "confdefs.h"
@@ -11071,7 +11071,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 11077 "configure"
#include "confdefs.h"
@@ -11105,7 +11105,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
#define $ac_tr_lib 1
EOF
- LIBS="-lintl $LIBS"
+ LIBS="-lintl -liconv $LIBS"
else
echo "$ac_t""no" 1>&6

12
misc/sh-utils/patches/patch-lib_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-lib_Makefile_in,v 1.1 2005/11/19 01:23:42 alek Exp $
--- lib/Makefile.in.orig Sat Nov 19 01:40:25 2005
+++ lib/Makefile.in Sat Nov 19 01:40:34 2005
@@ -109,7 +109,7 @@ AUTOMAKE_OPTIONS = ../src/ansi2knr
noinst_LIBRARIES = libsu.a
-INCLUDES = -I.. -I$(srcdir) -I../intl
+INCLUDES = -I.. -I$(srcdir)
libsu_a_SOURCES = getdate.y posixtm.c readtokens.c \
argmatch.c basename.c canon-host.c closeout.c full-write.c \

15
misc/sh-utils/patches/patch-src_Makefile_in
View File

@ -1,6 +1,15 @@
$OpenBSD: patch-src_Makefile_in,v 1.2 2001/03/15 17:15:04 brad Exp $
--- src/Makefile.in.orig Sat Aug 14 11:42:37 1999
+++ src/Makefile.in Thu Mar 15 11:24:44 2001
$OpenBSD: patch-src_Makefile_in,v 1.3 2005/11/19 01:23:42 alek Exp $
--- src/Makefile.in.orig Sat Aug 14 17:42:37 1999
+++ src/Makefile.in Sat Nov 19 01:19:38 2005
@@ -126,7 +126,7 @@ EXTRA_DIST = ansi2knr.1 ansi2knr.c \
CLEANFILES = $(SCRIPTS) su
-INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/lib -I../intl
+INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/lib
DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
LDADD = @INTLLIBS@ ../lib/libsu.a
@@ -150,7 +150,7 @@ su_DEPENDENCIES = $(LDADD)
SUFFIXES = .sh

4
misc/sh-utils/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.6 2004/09/15 17:54:17 espie Exp $
@comment $OpenBSD: PLIST,v 1.7 2005/11/19 01:23:42 alek Exp $
bin/gbasename
bin/gchroot
bin/gdate
@ -80,4 +80,6 @@ share/locale/pt_BR/LC_MESSAGES/sh-utils.mo
share/locale/ru/LC_MESSAGES/sh-utils.mo
share/locale/sk/LC_MESSAGES/sh-utils.mo
share/locale/sv/LC_MESSAGES/sh-utils.mo
share/locale/zh/
share/locale/zh/LC_MESSAGES/
share/locale/zh/LC_MESSAGES/sh-utils.mo