From 015beb387f3867be7182d9edd8876b8e20e45f91 Mon Sep 17 00:00:00 2001 From: bernd Date: Wed, 26 Sep 2007 05:05:40 +0000 Subject: [PATCH] Update to libidn-1.1, mention the new license (GPLv3), drop maintainership. Tested and ok steven@. --- devel/libidn/Makefile | 10 ++-- devel/libidn/distinfo | 10 ++-- devel/libidn/patches/patch-configure | 54 ++++++++++++++-------- devel/libidn/patches/patch-doc_Makefile_in | 14 +++--- devel/libidn/patches/patch-src_Makefile_in | 10 ++-- devel/libidn/pkg/PLIST | 4 +- 6 files changed, 58 insertions(+), 44 deletions(-) diff --git a/devel/libidn/Makefile b/devel/libidn/Makefile index 50e6bef57a0..357c106c03a 100644 --- a/devel/libidn/Makefile +++ b/devel/libidn/Makefile @@ -1,16 +1,14 @@ -# $OpenBSD: Makefile,v 1.6 2007/09/16 02:53:00 merdely Exp $ +# $OpenBSD: Makefile,v 1.7 2007/09/26 05:05:40 bernd Exp $ COMMENT= internationalized string handling -DISTNAME= libidn-0.6.1 -SHARED_LIBS= idn 16.15 +DISTNAME= libidn-1.1 +SHARED_LIBS= idn 16.30 CATEGORIES= devel HOMEPAGE= http://www.gnu.org/software/libidn/ -MAINTAINER= Bernd Ahlers - -# GPL / LGPL +# GPLv3 PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes diff --git a/devel/libidn/distinfo b/devel/libidn/distinfo index 9e65dc6bce5..7ed47d7cf08 100644 --- a/devel/libidn/distinfo +++ b/devel/libidn/distinfo @@ -1,5 +1,5 @@ -MD5 (libidn-0.6.1.tar.gz) = djTBFadHugybcQlVPc/Gxg== -RMD160 (libidn-0.6.1.tar.gz) = VrMqLwYA5PB6eLHCwgWnRlJxCsc= -SHA1 (libidn-0.6.1.tar.gz) = x2GNqqolhuqbZCA4H48/3iIUZjE= -SHA256 (libidn-0.6.1.tar.gz) = zuKJ96+KVyqbDOBwluo1M9cUh8s2GGtqvfPQOrmtg8U= -SIZE (libidn-0.6.1.tar.gz) = 2082781 +MD5 (libidn-1.1.tar.gz) = uH2pXFqn/7LIjcnMeSJUPg== +RMD160 (libidn-1.1.tar.gz) = OgzWSWA6LNQX+g7fRaJzF5nvGcQ= +SHA1 (libidn-1.1.tar.gz) = CGS+vtZLMnP/2GB6B6gpNxPw6Cc= +SHA256 (libidn-1.1.tar.gz) = IXa1EKe/46IRAArluE+QyJw/UMvXyR0TxyksCrl+X6A= +SIZE (libidn-1.1.tar.gz) = 2415413 diff --git a/devel/libidn/patches/patch-configure b/devel/libidn/patches/patch-configure index f9b92d5f690..d31023f4974 100644 --- a/devel/libidn/patches/patch-configure +++ b/devel/libidn/patches/patch-configure @@ -1,7 +1,16 @@ -$OpenBSD: patch-configure,v 1.3 2006/01/27 16:41:06 bernd Exp $ ---- configure.orig Fri Jan 20 13:36:16 2006 -+++ configure Sat Jan 21 12:26:54 2006 -@@ -10030,7 +10030,6 @@ openbsd*) +$OpenBSD: patch-configure,v 1.4 2007/09/26 05:05:40 bernd Exp $ +--- configure.orig Sat Sep 1 13:50:10 2007 ++++ configure Fri Sep 21 08:02:21 2007 +@@ -5708,7 +5708,7 @@ _ACEOF + + + +- INTLLIBS="$LIBINTL" ++ INTLLIBS="$LTLIBINTL" + + + +@@ -12499,7 +12499,6 @@ openbsd*) *) need_version=no ;; esac library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' @@ -9,7 +18,7 @@ $OpenBSD: patch-configure,v 1.3 2006/01/27 16:41:06 bernd Exp $ shlibpath_var=LD_LIBRARY_PATH if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then case $host_os in -@@ -13995,7 +13994,6 @@ openbsd*) +@@ -16409,7 +16408,6 @@ openbsd*) *) need_version=no ;; esac library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' @@ -17,7 +26,7 @@ $OpenBSD: patch-configure,v 1.3 2006/01/27 16:41:06 bernd Exp $ shlibpath_var=LD_LIBRARY_PATH if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then case $host_os in -@@ -16602,7 +16600,6 @@ openbsd*) +@@ -18981,7 +18979,6 @@ openbsd*) *) need_version=no ;; esac library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' @@ -25,7 +34,7 @@ $OpenBSD: patch-configure,v 1.3 2006/01/27 16:41:06 bernd Exp $ shlibpath_var=LD_LIBRARY_PATH if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then case $host_os in -@@ -19217,7 +19214,6 @@ openbsd*) +@@ -21560,7 +21557,6 @@ openbsd*) *) need_version=no ;; esac library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' @@ -33,16 +42,21 @@ $OpenBSD: patch-configure,v 1.3 2006/01/27 16:41:06 bernd Exp $ shlibpath_var=LD_LIBRARY_PATH if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then case $host_os in -@@ -27348,10 +27344,10 @@ s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t - s,@CCDEPMODE@,$CCDEPMODE,;t t - s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t - s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t --s,@LIBICONV@,$LIBICONV,;t t -+s,@LIBICONV@,$LTLIBICONV,;t t - s,@LTLIBICONV@,$LTLIBICONV,;t t - s,@INTLLIBS@,$INTLLIBS,;t t --s,@LIBINTL@,$LIBINTL,;t t -+s,@LIBINTL@,$LTLIBINTL,;t t - s,@LTLIBINTL@,$LTLIBINTL,;t t - s,@POSUB@,$POSUB,;t t - s,@EGREP@,$EGREP,;t t +@@ -28358,7 +28354,7 @@ CCDEPMODE!$CCDEPMODE$ac_delim + am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim + am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim + INTL_MACOSX_LIBS!$INTL_MACOSX_LIBS$ac_delim +-LIBICONV!$LIBICONV$ac_delim ++LIBICONV!$LTLIBICONV$ac_delim + LTLIBICONV!$LTLIBICONV$ac_delim + _ACEOF + +@@ -28402,7 +28398,7 @@ ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF + INTLLIBS!$INTLLIBS$ac_delim +-LIBINTL!$LIBINTL$ac_delim ++LIBINTL!$LTLIBINTL$ac_delim + LTLIBINTL!$LTLIBINTL$ac_delim + POSUB!$POSUB$ac_delim + RANLIB!$RANLIB$ac_delim diff --git a/devel/libidn/patches/patch-doc_Makefile_in b/devel/libidn/patches/patch-doc_Makefile_in index d182db2717f..e87b9f491c1 100644 --- a/devel/libidn/patches/patch-doc_Makefile_in +++ b/devel/libidn/patches/patch-doc_Makefile_in @@ -1,19 +1,19 @@ -$OpenBSD: patch-doc_Makefile_in,v 1.3 2006/01/27 16:41:06 bernd Exp $ ---- doc/Makefile.in.orig Fri Jan 20 13:38:07 2006 -+++ doc/Makefile.in Sat Jan 21 12:26:54 2006 -@@ -516,10 +516,7 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi +$OpenBSD: patch-doc_Makefile_in,v 1.4 2007/09/26 05:05:40 bernd Exp $ +--- doc/Makefile.in.orig Sat Sep 1 13:50:53 2007 ++++ doc/Makefile.in Fri Sep 21 08:04:14 2007 +@@ -646,10 +646,7 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir && exit 0; \ exit 1;; \ esac; \ - done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits doc/Makefile'; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ - cd $(top_srcdir) && \ -- $(AUTOMAKE) --gnits doc/Makefile +- $(AUTOMAKE) --gnu doc/Makefile + done; .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ -@@ -592,7 +589,7 @@ distclean-libtool: +@@ -719,7 +716,7 @@ clean-libtool: rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \ exit 1; \ fi diff --git a/devel/libidn/patches/patch-src_Makefile_in b/devel/libidn/patches/patch-src_Makefile_in index 1c64b6bc61c..59b00de34ac 100644 --- a/devel/libidn/patches/patch-src_Makefile_in +++ b/devel/libidn/patches/patch-src_Makefile_in @@ -1,12 +1,12 @@ -$OpenBSD: patch-src_Makefile_in,v 1.3 2006/01/27 16:41:06 bernd Exp $ ---- src/Makefile.in.orig Fri Jan 20 13:36:25 2006 -+++ src/Makefile.in Sat Jan 21 12:26:54 2006 -@@ -530,7 +530,7 @@ info: info-am +$OpenBSD: patch-src_Makefile_in,v 1.4 2007/09/26 05:05:40 bernd Exp $ +--- src/Makefile.in.orig Sat Sep 1 13:50:12 2007 ++++ src/Makefile.in Fri Sep 21 08:04:41 2007 +@@ -622,7 +622,7 @@ info: info-am info-am: -install-data-am: install-dist_lispDATA +install-data-am: - install-exec-am: install-binPROGRAMS + install-dvi: install-dvi-am diff --git a/devel/libidn/pkg/PLIST b/devel/libidn/pkg/PLIST index 491a943b6e3..73c06041d46 100644 --- a/devel/libidn/pkg/PLIST +++ b/devel/libidn/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.4 2006/01/27 16:41:06 bernd Exp $ +@comment $OpenBSD: PLIST,v 1.5 2007/09/26 05:05:40 bernd Exp $ %%SHARED%% bin/idn include/idn-free.h @@ -8,6 +8,7 @@ include/pr29.h include/punycode.h include/stringprep.h include/tld.h +info/libidn-components.png @info info/libidn.info lib/libidn.a lib/libidn.la @@ -67,6 +68,7 @@ share/locale/en@quot/LC_MESSAGES/libidn.mo share/locale/eo/LC_MESSAGES/libidn.mo share/locale/fr/LC_MESSAGES/libidn.mo share/locale/it/LC_MESSAGES/libidn.mo +share/locale/ja/LC_MESSAGES/libidn.mo share/locale/nl/LC_MESSAGES/libidn.mo share/locale/pl/LC_MESSAGES/libidn.mo share/locale/ro/LC_MESSAGES/libidn.mo