From 43bd9f14d9ce11690e9538bf3b03d3462faa6dbe Mon Sep 17 00:00:00 2001 From: marcus Date: Wed, 24 Oct 2007 23:37:25 +0000 Subject: Presenting GNOME 2.20.1 and all related works for FreeBSD. The official GNOME 2.20 release notes can be found at http://www.gnome.org/start/2.20/notes/en/ . Beyond that, this update includes the new GIMP 2.4 (courtesy of ahze). The GNOME 2.20 update also includes a huge change in the FreeBSD GNOME hierarchy. We are now using the more standard DATADIR of ${PREFIX}/share rather than ${PREFIX}/share/gnome. The result is that fewer patches and hacks are needed to port GNOME components to FreeBSD. This will mean some user changes may be required, so be sure to read /usr/ports/UPDATING for more details. This release and the things we accomplished in it would not have been possible without mezz's crazy idea to collapse DATADIR, and his persistence to make it happen successfully. Ahze and pav also deserve thanks for their work on porting modules and testing the whole ball of wax on pointyhat (respectively). The FreeBSD GNOME team would also like to thank our various testers and contributors: Yasuda Keisuke Frank Jahnke Pawel Worach Brian Gruber Franz Klammer Yuri Pankov Nick Barkas Cristian KLEIN Tony Maher Scot Hetzel Martin Matuska (mm) Benoit Dejean Martin Wilke (miwi) (And anyone else I may have missed) PRs fixed in this release: 111272, 113470, 115995, 116338 --- converters/libiconv/Makefile | 28 +++++++++++++----------- converters/libiconv/distinfo | 9 +++----- converters/libiconv/files/patch-configure | 13 ----------- converters/libiconv/files/patch-lib_Makefile.in | 8 +++---- converters/libiconv/files/patch-src::Makefile.in | 8 +++---- converters/libiconv/pkg-plist | 1 + 6 files changed, 27 insertions(+), 40 deletions(-) delete mode 100644 converters/libiconv/files/patch-configure (limited to 'converters/libiconv') diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile index a00741a786fc..6dc2b375acdd 100644 --- a/converters/libiconv/Makefile +++ b/converters/libiconv/Makefile @@ -6,8 +6,8 @@ # PORTNAME= libiconv -PORTVERSION= 1.9.2 -PORTREVISION= 2 +PORTVERSION= 1.11 +PORTREVISION= 1 CATEGORIES= converters devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -20,14 +20,16 @@ GNU_CONFIGURE= yes USE_GNOME= gnometarget LIBTOOLFILES= configure libcharset/configure CONFIGURE_ARGS= --enable-static \ - --without-libintl-prefix + --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 +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 \ @@ -40,13 +42,13 @@ OPTIONS= EXTRA_ENCODINGS "Include extra character sets" on \ CONFIGURE_ARGS+= --enable-extra-encodings .endif -.if defined(WITH_EXTRA_PATCHES) -PATCH_SITES+= http://www2d.biglobe.ne.jp/~msyk/software/libiconv/ -PATCH_SITES+= ${MASTER_SITE_LOCAL} -PATCH_SITE_SUBDIR= nork -PATCHFILES+= ${DISTNAME}-cp932.patch.gz -PATCH_DIST_STRIP+= -p1 -.endif +#.if defined(WITH_EXTRA_PATCHES) +#PATCH_SITES+= http://www2d.biglobe.ne.jp/~msyk/software/libiconv/ +#PATCH_SITES+= ${MASTER_SITE_LOCAL} +#PATCH_SITE_SUBDIR= nork +#PATCHFILES+= ${DISTNAME}-cp932.patch.gz +#PATCH_DIST_STRIP+= -p1 +#.endif post-patch: @${REINPLACE_CMD} -e 's:ei_ksc5601:ei_euc_kr:g' ${WRKSRC}/lib/aliases.h diff --git a/converters/libiconv/distinfo b/converters/libiconv/distinfo index 28cb99d9cc39..e53fffbe7462 100644 --- a/converters/libiconv/distinfo +++ b/converters/libiconv/distinfo @@ -1,6 +1,3 @@ -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 diff --git a/converters/libiconv/files/patch-configure b/converters/libiconv/files/patch-configure deleted file mode 100644 index 121192880a29..000000000000 --- a/converters/libiconv/files/patch-configure +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- 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 diff --git a/converters/libiconv/files/patch-lib_Makefile.in b/converters/libiconv/files/patch-lib_Makefile.in index 4a59d96cf9e3..1731460465a7 100644 --- a/converters/libiconv/files/patch-lib_Makefile.in +++ b/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). diff --git a/converters/libiconv/files/patch-src::Makefile.in b/converters/libiconv/files/patch-src::Makefile.in index 2f2b51c4b08c..52b5865d3fdc 100644 --- a/converters/libiconv/files/patch-src::Makefile.in +++ b/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.@OBJEXT@ ../srclib/libicrt.a -L$(libdir) -liconv @LIBINTL@ -o iconv;; \ + hpux*) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@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.@OBJEXT@ ../srclib/libicrt.a ../lib//libiconv.la @LTLIBINTL@ -o iconv;; \ *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ -o iconv;; \ esac diff --git a/converters/libiconv/pkg-plist b/converters/libiconv/pkg-plist index adcc3248beec..aca2a2d8412c 100644 --- a/converters/libiconv/pkg-plist +++ b/converters/libiconv/pkg-plist @@ -15,4 +15,5 @@ libdata/charset.alias %%DOCSDIR%%/iconv.3.html %%DOCSDIR%%/iconv_close.3.html %%DOCSDIR%%/iconv_open.3.html +%%DOCSDIR%%/iconvctl.3.html @dirrm %%DOCSDIR%% -- cgit