diff options
author | Maxim Sobolev <sobomax@FreeBSD.org> | 2001-08-27 09:39:53 +0000 |
---|---|---|
committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2001-08-27 09:39:53 +0000 |
commit | e0e4012d5b29370734f8062afbbe9b9bbed0fff8 (patch) | |
tree | 07b0447fe64486fde99a8c1280ef7874521d49a7 /converters | |
parent | Update to 0.5. (diff) |
- Remove useless USE_LIBTOOL;
- properly name shared libraries (get rid of bogus .so.X.Y convention);
- add files missed from pkg-plist (documentation);
- don't waste time building/running tests included into distribution.
Notes
Notes:
svn path=/head/; revision=46959
Diffstat (limited to 'converters')
-rw-r--r-- | converters/libiconv/Makefile | 12 | ||||
-rw-r--r-- | converters/libiconv/files/patch-aa | 33 | ||||
-rw-r--r-- | converters/libiconv/files/patch-ac | 28 | ||||
-rw-r--r-- | converters/libiconv/files/patch-ad | 16 | ||||
-rw-r--r-- | converters/libiconv/files/patch-ae | 14 | ||||
-rw-r--r-- | converters/libiconv/files/patch-autoconf::ltmain.sh | 18 | ||||
-rw-r--r-- | converters/libiconv/files/patch-libcharset::autoconf::ltmain.sh | 18 | ||||
-rw-r--r-- | converters/libiconv/files/patch-tests | 27 | ||||
-rw-r--r-- | converters/libiconv/pkg-plist | 9 |
9 files changed, 123 insertions, 52 deletions
diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile index 4897ef07e2d9..da7942b14559 100644 --- a/converters/libiconv/Makefile +++ b/converters/libiconv/Makefile @@ -7,6 +7,7 @@ PORTNAME= libiconv PORTVERSION= 1.7 +PORTREVISION= 1 CATEGORIES= converters devel MASTER_SITES= ${MASTER_SITE_GNU} \ ftp://ftp.ilog.fr/pub/Users/haible/gnu/ @@ -14,20 +15,11 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= gnome@FreeBSD.org -USE_LIBTOOL= yes -LIBTOOLFILES= configure libcharset/configure +GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-static INSTALLS_SHLIB= yes MAN1= giconv.1 MAN3= giconv.3 giconv_open.3 giconv_close.3 -MAKE_FLAGS+= LIBTOOL="${LIBTOOL}" -ELIBTOOL - -post-patch: - # Patching the test scripts to exit -1 if a comparision fails: - @${PERL} -pi -e 's,(cmp [^\s]+\s[^\s]+)(\s*2>\s*/dev/null)?\s*\n,\1\ - || exit -1\n,,' ${WRKSRC}/tests/check-translit \ - ${WRKSRC}/tests/check-stateless \ - ${WRKSRC}/tests/check-stateful .include <bsd.port.mk> diff --git a/converters/libiconv/files/patch-aa b/converters/libiconv/files/patch-aa index e5e3dd08992d..084afa2ad6b5 100644 --- a/converters/libiconv/files/patch-aa +++ b/converters/libiconv/files/patch-aa @@ -1,17 +1,40 @@ ---- Makefile.in.orig Tue Dec 12 13:39:43 2000 -+++ Makefile.in Thu Feb 8 22:56:38 2001 -@@ -40,3 +40,3 @@ + +$FreeBSD$ + +--- Makefile.in.orig Tue Feb 20 21:43:19 2001 ++++ Makefile.in Mon Aug 27 12:25:03 2001 +@@ -31,14 +31,14 @@ + cd lib && $(MAKE) all + cd src && $(MAKE) all + cd man && $(MAKE) all +- if test -d tests; then cd tests && $(MAKE) all; fi ++ #if test -d tests; then cd tests && $(MAKE) all; fi + + # Installs the library and include files only. Typically called with only + # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here. + install-lib : all force + cd lib && $(MAKE) install-lib libdir='$(libdir)' includedir='$(includedir)' if [ ! -d $(includedir) ] ; then mkdir $(includedir) ; fi - $(INSTALL_DATA) include/iconv.h $(includedir)/iconv.h + $(INSTALL_DATA) include/iconv.h $(includedir)/giconv.h -@@ -49,3 +49,3 @@ + install : force + cd libcharset && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)' +@@ -47,7 +47,7 @@ + if [ ! -d $(DESTDIR)$(prefix) ] ; then mkdir $(DESTDIR)$(prefix) ; fi + if [ ! -d $(DESTDIR)$(exec_prefix) ] ; then mkdir $(DESTDIR)$(exec_prefix) ; fi if [ ! -d $(DESTDIR)$(includedir) ] ; then mkdir $(DESTDIR)$(includedir) ; fi - $(INSTALL_DATA) include/iconv.h $(DESTDIR)$(includedir)/iconv.h + $(INSTALL_DATA) include/iconv.h $(DESTDIR)$(includedir)/giconv.h cd man && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' mandir='$(mandir)' -@@ -65,3 +65,3 @@ + + installdirs : force +@@ -63,7 +63,7 @@ + cd libcharset && $(MAKE) uninstall prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)' + cd lib && $(MAKE) uninstall prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)' cd src && $(MAKE) uninstall prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)' - $(RM) $(DESTDIR)$(includedir)/iconv.h + $(RM) $(DESTDIR)$(includedir)/giconv.h cd man && $(MAKE) uninstall prefix='$(prefix)' exec_prefix='$(exec_prefix)' mandir='$(mandir)' + + check : all force diff --git a/converters/libiconv/files/patch-ac b/converters/libiconv/files/patch-ac index 0ea4deb8bf64..0652cac6dc61 100644 --- a/converters/libiconv/files/patch-ac +++ b/converters/libiconv/files/patch-ac @@ -1,17 +1,37 @@ ---- man/Makefile.in.orig Fri Dec 8 08:49:07 2000 -+++ man/Makefile.in Thu Feb 8 23:00:54 2001 -@@ -32,5 +32,5 @@ + +$FreeBSD$ + +--- man/Makefile.in.orig Mon May 21 15:30:41 2001 ++++ man/Makefile.in Mon Aug 27 12:28:49 2001 +@@ -10,7 +10,7 @@ + local_prefix = /usr/local + exec_prefix = @exec_prefix@ + mandir = @mandir@ +-docdir = $(prefix)/doc/libiconv ++docdir = $(prefix)/share/doc/libiconv + htmldir = $(docdir) + + # Programs used by "make": +@@ -32,9 +32,9 @@ + if [ ! -d $(DESTDIR)$(prefix) ] ; then mkdir $(DESTDIR)$(prefix) ; fi + if [ ! -d $(DESTDIR)$(mandir) ] ; then mkdir $(DESTDIR)$(mandir) ; fi if [ ! -d $(DESTDIR)$(mandir)/man1 ] ; then mkdir $(DESTDIR)$(mandir)/man1 ; fi - cd $(srcdir) && for f in *.1 ; do echo $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man1/$$f ; $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man1/$$f ; done + cd $(srcdir) && for f in *.1 ; do echo $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man1/$$f ; $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man1/g$$f ; done if [ ! -d $(DESTDIR)$(mandir)/man3 ] ; then mkdir $(DESTDIR)$(mandir)/man3 ; fi - cd $(srcdir) && for f in *.3 ; do echo $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man3/$$f ; $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man3/$$f ; done + cd $(srcdir) && for f in *.3 ; do echo $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man3/$$f ; $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man3/g$$f ; done + if [ ! -d $(DESTDIR)$(prefix)/doc ] ; then mkdir $(DESTDIR)$(prefix)/doc ; fi + if [ ! -d $(DESTDIR)$(docdir) ] ; then mkdir $(DESTDIR)$(docdir) ; fi + if [ ! -d $(DESTDIR)$(htmldir) ] ; then mkdir $(DESTDIR)$(htmldir) ; fi +@@ -50,8 +50,8 @@ + if [ ! -d $(DESTDIR)$(htmldir) ] ; then mkdir $(DESTDIR)$(htmldir) ; fi -@@ -43,4 +43,4 @@ uninstall : force - cd $(srcdir) && for f in *.1 ; do echo $(RM) $(DESTDIR)$(mandir)/man1/$$f ; $(RM) $(DESTDIR)$(mandir)/man1/$$f ; done - cd $(srcdir) && for f in *.3 ; do echo $(RM) $(DESTDIR)$(mandir)/man3/$$f ; $(RM) $(DESTDIR)$(mandir)/man3/$$f ; done + cd $(srcdir) && for f in *.1 ; do echo $(RM) $(DESTDIR)$(mandir)/man1/$$f ; $(RM) $(DESTDIR)$(mandir)/man1/g$$f ; done + cd $(srcdir) && for f in *.3 ; do echo $(RM) $(DESTDIR)$(mandir)/man3/$$f ; $(RM) $(DESTDIR)$(mandir)/man3/g$$f ; done + cd $(srcdir) && for f in *.html ; do echo $(RM) $(DESTDIR)$(htmldir)/$$f ; $(RM) $(DESTDIR)$(htmldir)/$$f ; done + check : diff --git a/converters/libiconv/files/patch-ad b/converters/libiconv/files/patch-ad index 2fb99909fee2..68d5533c69a6 100644 --- a/converters/libiconv/files/patch-ad +++ b/converters/libiconv/files/patch-ad @@ -1,11 +1,23 @@ ---- lib/Makefile.in Wed Jun 27 18:37:49 2001 -+++ lib/Makefile.in Thu Aug 23 10:24:29 2001 + +$FreeBSD$ + +--- lib/Makefile.in.orig Thu Jun 28 01:37:49 2001 ++++ lib/Makefile.in Mon Aug 27 12:31:31 2001 @@ -1,4 +1,4 @@ -# Makefile for libiconv/lib +# Makefile for libgiconv/lib #### Start of system configuration section. #### +@@ -39,7 +39,7 @@ + + # Before making a release, change this according to the libtool documentation, + # section "Library interface versions". +-LIBICONV_VERSION_INFO = 2:4:0 ++LIBICONV_VERSION_INFO = 2 + + # Needed by $(LIBTOOL). + top_builddir = .. @@ -50,31 +50,31 @@ LIBCHARSET_OBJECTS = ../libcharset/lib/localcharset.lo diff --git a/converters/libiconv/files/patch-ae b/converters/libiconv/files/patch-ae index 3822a21281bc..3357d4489461 100644 --- a/converters/libiconv/files/patch-ae +++ b/converters/libiconv/files/patch-ae @@ -1,7 +1,8 @@ + $FreeBSD$ ---- libcharset/lib/Makefile.in Wed Jun 27 18:56:56 2001 -+++ libcharset/lib/Makefile.in Thu Aug 23 10:28:27 2001 +--- libcharset/lib/Makefile.in.orig Thu Jun 28 01:56:56 2001 ++++ libcharset/lib/Makefile.in Mon Aug 27 12:32:43 2001 @@ -10,6 +10,7 @@ local_prefix = /usr/local exec_prefix = @exec_prefix@ @@ -10,6 +11,15 @@ $FreeBSD$ # Programs used by "make": CC = @CC@ +@@ -38,7 +39,7 @@ + + # Before making a release, change this according to the libtool documentation, + # section "Library interface versions". +-LIBCHARSET_VERSION_INFO = 1:0:0 ++LIBCHARSET_VERSION_INFO = 1 + + # Needed by $(LIBTOOL). + top_builddir = .. @@ -53,7 +54,7 @@ $(LIBTOOL_LINK) $(CC) $(LDFLAGS) -o libcharset.la -rpath $(libdir) -version-info $(LIBCHARSET_VERSION_INFO) -no-undefined $(OBJECTS) diff --git a/converters/libiconv/files/patch-autoconf::ltmain.sh b/converters/libiconv/files/patch-autoconf::ltmain.sh new file mode 100644 index 000000000000..ced8fb750dfd --- /dev/null +++ b/converters/libiconv/files/patch-autoconf::ltmain.sh @@ -0,0 +1,18 @@ + +$FreeBSD$ + +--- autoconf/ltmain.sh 2001/08/27 09:19:40 1.1 ++++ autoconf/ltmain.sh 2001/08/27 09:20:41 +@@ -4175,10 +4175,12 @@ + fi + + # Install the pseudo-library for information purposes. ++ if /usr/bin/false; then + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + instname="$dir/$name"i + $show "$install_prog $instname $destdir/$name" + $run eval "$install_prog $instname $destdir/$name" || exit $? ++ fi + + # Maybe install the static library, too. + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/converters/libiconv/files/patch-libcharset::autoconf::ltmain.sh b/converters/libiconv/files/patch-libcharset::autoconf::ltmain.sh new file mode 100644 index 000000000000..137f40a7c95b --- /dev/null +++ b/converters/libiconv/files/patch-libcharset::autoconf::ltmain.sh @@ -0,0 +1,18 @@ + +$FreeBSD$ + +--- libcharset/autoconf/ltmain.sh 2001/08/27 09:21:11 1.1 ++++ libcharset/autoconf/ltmain.sh 2001/08/27 09:21:41 +@@ -4175,10 +4175,12 @@ + fi + + # Install the pseudo-library for information purposes. ++ if /usr/bin/false; then + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + instname="$dir/$name"i + $show "$install_prog $instname $destdir/$name" + $run eval "$install_prog $instname $destdir/$name" || exit $? ++ fi + + # Maybe install the static library, too. + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/converters/libiconv/files/patch-tests b/converters/libiconv/files/patch-tests deleted file mode 100644 index 341c04752a84..000000000000 --- a/converters/libiconv/files/patch-tests +++ /dev/null @@ -1,27 +0,0 @@ ---- tests/Makefile.in Mon Jun 25 18:03:32 2001 -+++ tests/Makefile.in Thu Aug 23 10:41:17 2001 -@@ -28,5 +28,3 @@ - --all : -- --check : all table-from table-to ../src/iconv -+check all: table-from table-to - $(srcdir)/check-stateless $(srcdir) ASCII -@@ -138,11 +136,11 @@ - --table-from : $(srcdir)/table-from.c ../lib/libiconv.la -- $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(srcdir)/table-from.c ../lib/libiconv.la -o $@ -+table-from : $(srcdir)/table-from.c ../lib/libgiconv.la -+ $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(srcdir)/table-from.c ../lib/libgiconv.la -o $@ - --table-to : $(srcdir)/table-to.c ../lib/libiconv.la -- $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(srcdir)/table-to.c ../lib/libiconv.la -o $@ -+table-to : $(srcdir)/table-to.c ../lib/libgiconv.la -+ $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(srcdir)/table-to.c ../lib/libgiconv.la -o $@ - - # The following rule is necessary to avoid a toplevel "make -n check" failure. --../lib/libiconv.la : -- cd ../lib && $(MAKE) libiconv.la -+../lib/libgiconv.la : -+ cd ../lib && $(MAKE) libgiconv.la - diff --git a/converters/libiconv/pkg-plist b/converters/libiconv/pkg-plist index 3a0c3dfc2c2e..728cd6bc5afa 100644 --- a/converters/libiconv/pkg-plist +++ b/converters/libiconv/pkg-plist @@ -3,8 +3,13 @@ include/giconv.h include/libcharset.h lib/libcharset.a lib/libcharset.so -lib/libcharset.so.1.0 +lib/libcharset.so.1 lib/libgiconv.a lib/libgiconv.so -lib/libgiconv.so.2.4 +lib/libgiconv.so.2 libdata/charset.alias +share/doc/libiconv/iconv.1.html +share/doc/libiconv/iconv.3.html +share/doc/libiconv/iconv_close.3.html +share/doc/libiconv/iconv_open.3.html +@dirrm share/doc/libiconv |