diff options
Diffstat (limited to 'converters')
| -rw-r--r-- | converters/libiconv/Makefile | 4 | ||||
| -rw-r--r-- | converters/libiconv/PLIST | 2 | ||||
| -rw-r--r-- | converters/libiconv/buildlink.mk | 2 | ||||
| -rw-r--r-- | converters/libiconv/buildlink2.mk | 45 | ||||
| -rw-r--r-- | converters/libiconv/distinfo | 3 | ||||
| -rw-r--r-- | converters/libiconv/patches/patch-ab | 2 | ||||
| -rw-r--r-- | converters/libiconv/patches/patch-ad | 13 |
7 files changed, 65 insertions, 6 deletions
diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile index 00fc91226b5..14de8804d60 100644 --- a/converters/libiconv/Makefile +++ b/converters/libiconv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2002/08/20 11:52:10 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2002/08/25 18:38:18 jlam Exp $ # DISTNAME= libiconv-1.8 @@ -9,7 +9,7 @@ MAINTAINER= rh@netbsd.org HOMEPAGE= http://www.gnu.org/software/libiconv/ COMMENT= character set conversion library -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES GNU_CONFIGURE= YES USE_GMAKE= YES USE_LIBTOOL= YES diff --git a/converters/libiconv/PLIST b/converters/libiconv/PLIST index 3b490d1a5ad..b8696161ae0 100644 --- a/converters/libiconv/PLIST +++ b/converters/libiconv/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/08/20 11:52:11 wiz Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/08/25 18:38:18 jlam Exp $ bin/iconv include/iconv.h include/libcharset.h diff --git a/converters/libiconv/buildlink.mk b/converters/libiconv/buildlink.mk index 2d2c1fc0201..65ad089b980 100644 --- a/converters/libiconv/buildlink.mk +++ b/converters/libiconv/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.12 2002/08/07 06:10:33 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.13 2002/08/25 18:38:18 jlam Exp $ # # This Makefile fragment is included by packages that use libiconv. # diff --git a/converters/libiconv/buildlink2.mk b/converters/libiconv/buildlink2.mk new file mode 100644 index 00000000000..5cf0950a77f --- /dev/null +++ b/converters/libiconv/buildlink2.mk @@ -0,0 +1,45 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:18 jlam Exp $ + +.if !defined(ICONV_BUILDLINK2_MK) +ICONV_BUILDLINK2_MK= # defined + +.include "../../mk/bsd.prefs.mk" + +BUILDLINK_DEPENDS.iconv?= libiconv>=1.7nb2 +BUILDLINK_PKGSRCDIR.iconv?= ../../converters/libiconv + +.if defined(USE_GNU_ICONV) +_NEED_ICONV= YES +.else +. if exists(/usr/include/iconv.h) +_NEED_ICONV= NO +. else +_NEED_ICONV= YES +. endif +_INCOMPAT_ICONV?= # should be set from defs.${OPSYS}.mk +INCOMPAT_ICONV?= # empty +. for _pattern_ in ${_INCOMPAT_ICONV} ${INCOMPAT_ICONV} +. if !empty(MACHINE_PLATFORM:M${_pattern_}) +_NEED_ICONV= YES +. endif +. endfor +.endif + +.if ${_NEED_ICONV} == "YES" +BUILDLINK_PACKAGES+= iconv +EVAL_PREFIX+= BUILDLINK_PREFIX.iconv=libiconv +BUILDLINK_PREFIX.iconv_DEFAULT= ${LOCALBASE} +.else +BUILDLINK_PREFIX.iconv= /usr +.endif + +BUILDLINK_FILES.iconv= include/iconv.h +BUILDLINK_FILES.iconv+= include/libcharset.h +BUILDLINK_FILES.iconv+= lib/libcharset.* +BUILDLINK_FILES.iconv+= lib/libiconv.* + +BUILDLINK_TARGETS+= iconv-buildlink + +iconv-buildlink: _BUILDLINK_USE + +.endif # ICONV_BUILDLINK2_MK diff --git a/converters/libiconv/distinfo b/converters/libiconv/distinfo index de08a8a8c8b..18801d54b7d 100644 --- a/converters/libiconv/distinfo +++ b/converters/libiconv/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.7 2002/08/20 11:52:11 wiz Exp $ +$NetBSD: distinfo,v 1.8 2002/08/25 18:38:19 jlam Exp $ SHA1 (libiconv-1.8.tar.gz) = 8894488118c31d3d1f1c6d2f81f61d7e052e9799 Size (libiconv-1.8.tar.gz) = 3514117 bytes SHA1 (patch-ab) = a206c213e41555e37a8cac9a93f17dd0664295e7 SHA1 (patch-ac) = 6896d58b242f4c08887061ddf3217bd9b291c895 +SHA1 (patch-ad) = 384cafd6f4c11443d0a539409121543b9201efdd diff --git a/converters/libiconv/patches/patch-ab b/converters/libiconv/patches/patch-ab index 30843ebefc1..deabcf16482 100644 --- a/converters/libiconv/patches/patch-ab +++ b/converters/libiconv/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.3 2002/08/20 11:52:14 wiz Exp $ +$NetBSD: patch-ab,v 1.4 2002/08/25 18:38:19 jlam Exp $ --- Makefile.in.orig Tue Aug 20 13:38:33 2002 +++ Makefile.in diff --git a/converters/libiconv/patches/patch-ad b/converters/libiconv/patches/patch-ad new file mode 100644 index 00000000000..86619fd539d --- /dev/null +++ b/converters/libiconv/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.2 2002/08/25 18:38:19 jlam Exp $ + +--- src/Makefile.in.orig Thu Aug 22 15:14:31 2002 ++++ src/Makefile.in Thu Aug 22 15:20:07 2002 +@@ -78,7 +78,7 @@ + if [ ! -d $(DESTDIR)$(bindir) ] ; then mkdir $(DESTDIR)$(bindir) ; fi + case "@host_os@" in \ + hpux*) $(CC) $(LDFLAGS) iconv.@OBJEXT@ -L$(libdir) -liconv @LIBINTL@ -o iconv;; \ +- *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) iconv.@OBJEXT@ $(libdir)/libiconv.la @LTLIBINTL@ -o iconv;; \ ++ *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) iconv.@OBJEXT@ ../lib/libiconv.la @LTLIBINTL@ -o iconv;; \ + esac + $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv $(DESTDIR)$(bindir)/iconv + |