[Midnightbsd-cvs] mports: converters/libiconv: Update to 1.11, lgpl

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Nov 10 21:41:07 EST 2007


Log Message:
-----------
Update to 1.11, lgpl

Modified Files:
--------------
    mports/converters/libiconv:
        Makefile (r1.2 -> r1.3)
        distinfo (r1.1.1.1 -> r1.2)
        pkg-descr (r1.1.1.1 -> r1.2)
        pkg-plist (r1.1.1.1 -> r1.2)
    mports/converters/libiconv/files:
        patch-lib_Makefile.in (r1.1.1.1 -> r1.2)
        patch-src::Makefile.in (r1.1.1.1 -> r1.2)

Removed Files:
-------------
    mports/converters/libiconv/files:
        patch-configure

-------------- next part --------------
Index: pkg-descr
===================================================================
RCS file: /home/cvs/mports/converters/libiconv/pkg-descr,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L converters/libiconv/pkg-descr -L converters/libiconv/pkg-descr -u -r1.1.1.1 -r1.2
--- converters/libiconv/pkg-descr
+++ converters/libiconv/pkg-descr
@@ -9,6 +9,6 @@
 libiconv is for you if your application needs to support multiple character
 encodings, but that support lacks from your system.
 
-See in either README or website for the list of support encodings.
+See either README or website for the list of supported encodings.
 
 WWW: http://www.gnu.org/software/libiconv/
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/converters/libiconv/pkg-plist,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L converters/libiconv/pkg-plist -L converters/libiconv/pkg-plist -u -r1.1.1.1 -r1.2
--- converters/libiconv/pkg-plist
+++ converters/libiconv/pkg-plist
@@ -15,4 +15,5 @@
 %%DOCSDIR%%/iconv.3.html
 %%DOCSDIR%%/iconv_close.3.html
 %%DOCSDIR%%/iconv_open.3.html
+%%DOCSDIR%%/iconvctl.3.html
 @dirrm %%DOCSDIR%%
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/converters/libiconv/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L converters/libiconv/Makefile -L converters/libiconv/Makefile -u -r1.2 -r1.3
--- converters/libiconv/Makefile
+++ converters/libiconv/Makefile
@@ -3,34 +3,41 @@
 # Whom:					Maxim Sobolev <sobomax at FreeBSD.org>
 #
 # $MidnightBSD$
-# $FreeBSD: ports/converters/libiconv/Makefile,v 1.37 2006/05/03 23:38:40 edwin Exp $
 #
 
 PORTNAME=	libiconv
-PORTVERSION=	1.9.2
-PORTREVISION=	2
+PORTVERSION=	1.11
 CATEGORIES=	converters devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	A character set conversion library
+LICENSE=	lgpl
 
+USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnometarget
 LIBTOOLFILES=	configure libcharset/configure
 CONFIGURE_ARGS=	--enable-static \
-		--without-libintl-prefix
-INSTALLS_SHLIB=	yes
+		--without-libintl-prefix \
+		--docdir=${DOCSDIR}
+USE_LDCONFIG=	yes
+CONFIGURE_ENV=	gl_cv_cc_visibility="no"
 
 MAN1=		iconv.1
-MAN3=		iconv.3 iconv_open.3 iconv_close.3
+MAN3=		iconv.3 iconv_open.3 iconv_close.3 iconvctl.3
+
+OPTIONS=	EXTRA_ENCODINGS	"Include extra character sets" on \
+		EXTRA_PATCHES	"Apply patches to fix CP932 add EUCJP-MS" off
 
 .ifdef USE_ICONV
 .error USE_ICONV is defined as an environment variable, or in the arguments \
 	to "make".  Please unset it and restart the build.
 .endif
 
+.include <bsd.port.pre.mk>
+
 .if !defined(WITHOUT_EXTRA_ENCODINGS)
 CONFIGURE_ARGS+=	--enable-extra-encodings
 .endif
@@ -38,19 +45,12 @@
 .if defined(WITH_EXTRA_PATCHES)
 PATCH_SITES+=	http://www2d.biglobe.ne.jp/~msyk/software/libiconv/
 PATCH_SITES+=	${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR=     nork
+PATCH_SITE_SUBDIR=	nork
 PATCHFILES+=	${DISTNAME}-cp932.patch.gz
 PATCH_DIST_STRIP+=	-p1
 .endif
 
-pre-everything::
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "libiconv has the following tunable option(s):"
-	@${ECHO_MSG} "	WITHOUT_EXTRA_ENCODINGS=yes	Disable extra character sets"
-	@${ECHO_MSG} "	WITH_EXTRA_PATCHES=yes		Apply extra patches (fixes cp932, adds EUCJP-MS)"
-	@${ECHO_MSG} ""
-
 post-patch:
 	@${REINPLACE_CMD} -e 's:ei_ksc5601:ei_euc_kr:g' ${WRKSRC}/lib/aliases.h
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/converters/libiconv/distinfo,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L converters/libiconv/distinfo -L converters/libiconv/distinfo -u -r1.1.1.1 -r1.2
--- converters/libiconv/distinfo
+++ converters/libiconv/distinfo
@@ -1,6 +1,6 @@
-MD5 (libiconv-1.9.2.tar.gz) = 6bc300365053c815b10b800a21e0bc7e
-SHA256 (libiconv-1.9.2.tar.gz) = fdb726c5d3761d4c1569e702b74cf9561dc07c6a5f48af3e3fd18685f50d490c
-SIZE (libiconv-1.9.2.tar.gz) = 3919945
-MD5 (libiconv-1.9.2-cp932.patch.gz) = e792be53c6feb6b41cd386e6feb725c9
-SHA256 (libiconv-1.9.2-cp932.patch.gz) = 5cb422931b8b2cf7e4f5d11fac7d8e3ca2c5b8254b3efcae3295b0f5921c4e32
-SIZE (libiconv-1.9.2-cp932.patch.gz) = 106981
+MD5 (libiconv-1.11.tar.gz) = b77a17e4a5a817100ad4b2613935055e
+SHA256 (libiconv-1.11.tar.gz) = fbf5b9a63ea6e3abebfabc04506f0e18a2860071031e34ea4ad4f450b8c43d4b
+SIZE (libiconv-1.11.tar.gz) = 4430930
+MD5 (libiconv-1.11-cp932.patch.gz) = 1d6c7711b6ec76c9c42230d8e097baa0
+SHA256 (libiconv-1.11-cp932.patch.gz) = 48ed20ab2bd59d9af9fa6d4328b363849bf0e155b70bdbe137dc8973341b65d1
+SIZE (libiconv-1.11-cp932.patch.gz) = 112830
--- converters/libiconv/files/patch-configure
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD: ports/converters/libiconv/files/patch-configure,v 1.3 2004/07/09 19:14:39 bland Exp $
-
---- configure.orig	Fri May 23 05:19:20 2003
-+++ configure	Fri May 30 11:22:14 2003
-@@ -1905,7 +1905,6 @@
- 
- 
- 
--test "$mandir" != '${prefix}/man' || mandir='${datadir}/man'
- 
- 
- ac_ext=c
Index: patch-src::Makefile.in
===================================================================
RCS file: /home/cvs/mports/converters/libiconv/files/patch-src::Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L converters/libiconv/files/patch-src::Makefile.in -L converters/libiconv/files/patch-src::Makefile.in -u -r1.1.1.1 -r1.2
--- converters/libiconv/files/patch-src::Makefile.in
+++ converters/libiconv/files/patch-src::Makefile.in
@@ -1,9 +1,9 @@
---- src/Makefile.in.orig	Sat Jul 10 03:03:28 2004
-+++ src/Makefile.in	Sat Jul 10 03:04:15 2004
-@@ -92,6 +92,7 @@
+--- src/Makefile.in.orig	Fri Jul 14 09:19:07 2006
++++ src/Makefile.in	Fri Jun 29 18:31:59 2007
+@@ -96,6 +96,7 @@ install : all force
  	if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi
  	case "@host_os@" in \
- 	  hpux*) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv. at OBJEXT@ ../srclib/libicrt.a -L$(libdir) -liconv @LIBINTL@ -o iconv;; \
+ 	  hpux*) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv. at OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv;; \
 +	  freebsd*) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv. at OBJEXT@ ../srclib/libicrt.a ../lib//libiconv.la @LTLIBINTL@ -o iconv;; \
  	  *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv. at OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ -o iconv;; \
  	esac
Index: patch-lib_Makefile.in
===================================================================
RCS file: /home/cvs/mports/converters/libiconv/files/patch-lib_Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L converters/libiconv/files/patch-lib_Makefile.in -L converters/libiconv/files/patch-lib_Makefile.in -u -r1.1.1.1 -r1.2
--- converters/libiconv/files/patch-lib_Makefile.in
+++ converters/libiconv/files/patch-lib_Makefile.in
@@ -1,10 +1,10 @@
---- lib/Makefile.in.orig	Wed Jun 11 13:05:08 2003
-+++ lib/Makefile.in	Wed Jun 11 13:05:15 2003
-@@ -44,7 +44,7 @@
+--- lib/Makefile.in.orig	Fri Jul 14 09:18:42 2006
++++ lib/Makefile.in	Fri Jun 29 18:30:13 2007
+@@ -48,7 +48,7 @@ SHELL = /bin/sh
  
  # Before making a release, change this according to the libtool documentation,
  # section "Library interface versions".
--LIBICONV_VERSION_INFO = 4:0:2
+-LIBICONV_VERSION_INFO = 6:0:4
 +LIBICONV_VERSION_INFO = 3
  
  # Needed by $(LIBTOOL).


More information about the Midnightbsd-cvs mailing list