[Midnightbsd-cvs] mports [16708] trunk/converters/libiconv: fix patch site
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Aug 30 08:42:12 EDT 2014
Revision: 16708
http://svnweb.midnightbsd.org/mports/?rev=16708
Author: laffer1
Date: 2014-08-30 08:42:12 -0400 (Sat, 30 Aug 2014)
Log Message:
-----------
fix patch site
Modified Paths:
--------------
trunk/converters/libiconv/Makefile
Added Paths:
-----------
trunk/converters/libiconv/files/patch-lib-iconv.c
trunk/converters/libiconv/files/patch-libcharset__lib__config.charset
trunk/converters/libiconv/files/patch-src__Makefile.in
Removed Paths:
-------------
trunk/converters/libiconv/files/patch-libcharset::lib::config.charset
trunk/converters/libiconv/files/patch-src::Makefile.in
Modified: trunk/converters/libiconv/Makefile
===================================================================
--- trunk/converters/libiconv/Makefile 2014-08-30 01:01:34 UTC (rev 16707)
+++ trunk/converters/libiconv/Makefile 2014-08-30 12:42:12 UTC (rev 16708)
@@ -2,7 +2,7 @@
PORTNAME= libiconv
PORTVERSION= 1.14
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= converters devel
MASTER_SITES= GNU
@@ -34,7 +34,7 @@
.if ${PORT_OPTIONS:MPATCHES}
PATCH_SITES+= http://apolloron.org/software/libiconv-1.14-ja/
-PATCH_SITES+= ${MASTER_SITE_LOCAL}
+PATCH_SITES+= ${MASTER_SITE_FREEBSD_LOCAL}
PATCH_SITE_SUBDIR+= kwm
PATCHFILES+= ${DISTNAME}-ja-1.patch.gz
PATCH_DIST_STRIP+= -p1
Added: trunk/converters/libiconv/files/patch-lib-iconv.c
===================================================================
--- trunk/converters/libiconv/files/patch-lib-iconv.c (rev 0)
+++ trunk/converters/libiconv/files/patch-lib-iconv.c 2014-08-30 12:42:12 UTC (rev 16708)
@@ -0,0 +1,11 @@
+--- lib/iconv.c.orig
++++ lib/iconv.c
+@@ -598,7 +598,7 @@
+ It wants to define the symbols 'iconv_open', 'iconv', 'iconv_close'. */
+ #define strong_alias(name, aliasname) _strong_alias(name, aliasname)
+ #define _strong_alias(name, aliasname) \
+- extern __typeof (name) aliasname __attribute__ ((alias (#name)));
++ extern LIBICONV_DLL_EXPORTED __typeof (name) aliasname __attribute__ ((alias (#name)));
+ #undef iconv_open
+ #undef iconv
+ #undef iconv_close
Deleted: trunk/converters/libiconv/files/patch-libcharset::lib::config.charset
===================================================================
--- trunk/converters/libiconv/files/patch-libcharset::lib::config.charset 2014-08-30 01:01:34 UTC (rev 16707)
+++ trunk/converters/libiconv/files/patch-libcharset::lib::config.charset 2014-08-30 12:42:12 UTC (rev 16708)
@@ -1,43 +0,0 @@
---- libcharset/lib/config.charset.orig 2010-04-05 02:25:38.000000000 +0200
-+++ libcharset/lib/config.charset 2011-10-23 22:05:50.000000000 +0200
-@@ -348,7 +348,7 @@ case "$os" in
- #echo "sun_eu_greek ?" # what is this?
- echo "UTF-8 UTF-8"
- ;;
-- freebsd* | os2*)
-+ freebsd4.[0-5]* | os2*)
- # FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore
- # localcharset.c falls back to using the full locale name
- # from the environment variables.
-@@ -385,6 +385,31 @@ case "$os" in
- echo "ja_JP.Shift_JIS SHIFT_JIS"
- echo "ko_KR.EUC EUC-KR"
- ;;
-+ freebsd*)
-+ echo "US-ASCII ASCII"
-+ echo "ISO8859-1 ISO-8859-1"
-+ echo "ISO_8859-1 ISO-8859-1"
-+ echo "ISO8859-2 ISO-8859-2"
-+ echo "ISO_8859-2 ISO-8859-2"
-+ echo "ISO8859-4 ISO-8859-4"
-+ echo "ISO_8859-4 ISO-8859-4"
-+ echo "ISO8859-5 ISO-8859-5"
-+ echo "ISO_8859-5 ISO-8859-5"
-+ echo "ISO8859-7 ISO-8859-7"
-+ echo "ISO_8859-7 ISO-8859-7"
-+ echo "ISO8859-9 ISO-8859-9"
-+ echo "ISO_8859-9 ISO-8859-9"
-+ echo "ISO8859-13 ISO-8859-13"
-+ echo "ISO_8859-13 ISO-8859-13"
-+ echo "ISO8859-15 ISO-8859-15"
-+ echo "ISO_8859-15 ISO-8859-15"
-+ echo "eucCN GB2312"
-+ echo "eucJP EUC-JP"
-+ echo "eucKR EUC-KR"
-+ echo "Big5 BIG5"
-+ echo "Big5HKSCS BIG5-HKSCS"
-+ echo "SJIS SHIFT_JIS"
-+ ;;
- netbsd*)
- echo "646 ASCII"
- echo "ISO8859-1 ISO-8859-1"
Added: trunk/converters/libiconv/files/patch-libcharset__lib__config.charset
===================================================================
--- trunk/converters/libiconv/files/patch-libcharset__lib__config.charset (rev 0)
+++ trunk/converters/libiconv/files/patch-libcharset__lib__config.charset 2014-08-30 12:42:12 UTC (rev 16708)
@@ -0,0 +1,43 @@
+--- libcharset/lib/config.charset.orig 2010-04-05 02:25:38.000000000 +0200
++++ libcharset/lib/config.charset 2011-10-23 22:05:50.000000000 +0200
+@@ -348,7 +348,7 @@ case "$os" in
+ #echo "sun_eu_greek ?" # what is this?
+ echo "UTF-8 UTF-8"
+ ;;
+- freebsd* | os2*)
++ freebsd4.[0-5]* | os2*)
+ # FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore
+ # localcharset.c falls back to using the full locale name
+ # from the environment variables.
+@@ -385,6 +385,31 @@ case "$os" in
+ echo "ja_JP.Shift_JIS SHIFT_JIS"
+ echo "ko_KR.EUC EUC-KR"
+ ;;
++ freebsd*)
++ echo "US-ASCII ASCII"
++ echo "ISO8859-1 ISO-8859-1"
++ echo "ISO_8859-1 ISO-8859-1"
++ echo "ISO8859-2 ISO-8859-2"
++ echo "ISO_8859-2 ISO-8859-2"
++ echo "ISO8859-4 ISO-8859-4"
++ echo "ISO_8859-4 ISO-8859-4"
++ echo "ISO8859-5 ISO-8859-5"
++ echo "ISO_8859-5 ISO-8859-5"
++ echo "ISO8859-7 ISO-8859-7"
++ echo "ISO_8859-7 ISO-8859-7"
++ echo "ISO8859-9 ISO-8859-9"
++ echo "ISO_8859-9 ISO-8859-9"
++ echo "ISO8859-13 ISO-8859-13"
++ echo "ISO_8859-13 ISO-8859-13"
++ echo "ISO8859-15 ISO-8859-15"
++ echo "ISO_8859-15 ISO-8859-15"
++ echo "eucCN GB2312"
++ echo "eucJP EUC-JP"
++ echo "eucKR EUC-KR"
++ echo "Big5 BIG5"
++ echo "Big5HKSCS BIG5-HKSCS"
++ echo "SJIS SHIFT_JIS"
++ ;;
+ netbsd*)
+ echo "646 ASCII"
+ echo "ISO8859-1 ISO-8859-1"
Deleted: trunk/converters/libiconv/files/patch-src::Makefile.in
===================================================================
--- trunk/converters/libiconv/files/patch-src::Makefile.in 2014-08-30 01:01:34 UTC (rev 16707)
+++ trunk/converters/libiconv/files/patch-src::Makefile.in 2014-08-30 12:42:12 UTC (rev 16708)
@@ -1,18 +0,0 @@
---- src/Makefile.in.orig 2011-06-04 19:05:58.000000000 +0200
-+++ src/Makefile.in 2013-07-06 18:49:54.000000000 +0200
-@@ -71,7 +71,6 @@
- # without internationalization and not linked with libintl.
-
- all : iconv_no_i18n$(EXEEXT) iconv. at OBJEXT@ $(OBJECTS_RES_ at WOE32@)
-- test `ls -ld . | sed -e 's/^d\(.........\).*/\1/'` = rwxrwxrwx || chmod 777 .
-
- # This is the temporary iconv executable, without internationalization.
- iconv_no_i18n$(EXEEXT) : iconv_no_i18n. at OBJEXT@ ../lib/libiconv.la $(OBJECTS_RES_ at WOE32@)
-@@ -113,6 +112,7 @@
- if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi
- case "@host_os@" in \
- hpux*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv. at OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(OBJECTS_RES_ at WOE32@) `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv$(EXEEXT);; \
-+ freebsd*) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv. at OBJEXT@ ../srclib/libicrt.a ../lib/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_ at WOE32@) -o iconv;; \
- *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv. at OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_ at WOE32@) -o iconv$(EXEEXT);; \
- esac
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv$(EXEEXT) $(DESTDIR)$(bindir)/iconv$(EXEEXT)
Added: trunk/converters/libiconv/files/patch-src__Makefile.in
===================================================================
--- trunk/converters/libiconv/files/patch-src__Makefile.in (rev 0)
+++ trunk/converters/libiconv/files/patch-src__Makefile.in 2014-08-30 12:42:12 UTC (rev 16708)
@@ -0,0 +1,18 @@
+--- src/Makefile.in.orig 2011-06-04 19:05:58.000000000 +0200
++++ src/Makefile.in 2013-07-06 18:49:54.000000000 +0200
+@@ -71,7 +71,6 @@
+ # without internationalization and not linked with libintl.
+
+ all : iconv_no_i18n$(EXEEXT) iconv. at OBJEXT@ $(OBJECTS_RES_ at WOE32@)
+- test `ls -ld . | sed -e 's/^d\(.........\).*/\1/'` = rwxrwxrwx || chmod 777 .
+
+ # This is the temporary iconv executable, without internationalization.
+ iconv_no_i18n$(EXEEXT) : iconv_no_i18n. at OBJEXT@ ../lib/libiconv.la $(OBJECTS_RES_ at WOE32@)
+@@ -113,6 +112,7 @@
+ if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi
+ case "@host_os@" in \
+ hpux*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv. at OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(OBJECTS_RES_ at WOE32@) `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv$(EXEEXT);; \
++ freebsd*) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv. at OBJEXT@ ../srclib/libicrt.a ../lib/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_ at WOE32@) -o iconv;; \
+ *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv. at OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_ at WOE32@) -o iconv$(EXEEXT);; \
+ esac
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv$(EXEEXT) $(DESTDIR)$(bindir)/iconv$(EXEEXT)
More information about the Midnightbsd-cvs
mailing list