Attachment #93780 for bug #131769

View | Details | Raw Unified | Return to bug 131769
Collapse All | Expand All




#

PORTNAME=	libiconv
PORTVERSION=	1.12
PORTREVISION=	1
CATEGORIES=	converters devel
MASTER_SITES=	${MASTER_SITE_GNU}

USE_LDCONFIG=	yes
CONFIGURE_ENV=	gl_cv_cc_visibility="no"

MAN1=		iconv.1
MAN3=		iconv.3 iconv_open.3 iconv_close.3 iconvctl.3

OPTIONS=	ICONV_1 "Install iconv(1)" off \
		EXTRA_ENCODINGS	"Include extra character sets" on \
		EXTRA_PATCHES	"Apply patches to fix CP932 add EUCJP-MS" off

.ifdef USE_ICONV

PATCH_SITES+=	http://www2d.biglobe.ne.jp/~msyk/software/libiconv/
PATCH_SITES+=	${MASTER_SITE_LOCAL}
PATCH_SITE_SUBDIR=	nork
PATCHFILES+=	${DISTNAME}-ja-4.patch.gz
PATCH_DIST_STRIP+=	-p1
.endif

.if !defined(WITH_ICONV_1)
EXTRA_PATCHES=  ${FILESDIR}/WITHOUT_ICONV_1.patch
PLIST_SUB+=     WITHOUT_ICONV_1="@comment "
MAKE_ARGS+=     WITHOUT_ICONV_1=yes
.else
MAN1=		iconv.1
PLIST_SUB+=	WITHOUT_ICONV_1=""
.endif

post-patch:
	@${REINPLACE_CMD} -e 's:ei_ksc5601:ei_euc_kr:g' ${WRKSRC}/lib/aliases.h


Lines 1-6 Link Here

(-)./libiconv/distinfo (-6 / +6 lines)
1	MD5 (libiconv-1.11.tar.gz) = b77a17e4a5a817100ad4b2613935055e	1	MD5 (libiconv-1.12.tar.gz) = c2be282595751535a618ae0edeb8f648
2	SHA256 (libiconv-1.11.tar.gz) = fbf5b9a63ea6e3abebfabc04506f0e18a2860071031e34ea4ad4f450b8c43d4b	2	SHA256 (libiconv-1.12.tar.gz) = a99e244fd78babb95ea3c9a5c88b964994edaa1d15fd8dde5b4067801e23f0cd
3	SIZE (libiconv-1.11.tar.gz) = 4430930	3	SIZE (libiconv-1.12.tar.gz) = 4513309
4	MD5 (libiconv-1.11-cp932.patch.gz) = 1d6c7711b6ec76c9c42230d8e097baa0	4	MD5 (libiconv-1.12-ja-4.patch.gz) = 5c666dc2622fda5650aafe0931cff412
5	SHA256 (libiconv-1.11-cp932.patch.gz) = 48ed20ab2bd59d9af9fa6d4328b363849bf0e155b70bdbe137dc8973341b65d1	5	SHA256 (libiconv-1.12-ja-4.patch.gz) = cf33ab5202fff9faae8fce8925984242272749c96ebbc801f332537111967a73
6	SIZE (libiconv-1.11-cp932.patch.gz) = 112830	6	SIZE (libiconv-1.12-ja-4.patch.gz) = 229623




--- Makefile.in.orig	2009-02-17 13:10:19.000000000 +0900
+++ Makefile.in	2009-02-17 13:15:37.000000000 +0900
@@ -32,7 +32,9 @@
 all : lib/localcharset.h force
 	cd lib && $(MAKE) all
 	cd srclib && $(MAKE) all
+.if !defined(WITHOUT_ICONV_1)
 	cd src && $(MAKE) all
+.endif
 	cd po && $(MAKE) all
 	cd man && $(MAKE) all
 	if test -d tests; then cd tests && $(MAKE) all; fi
@@ -51,7 +53,9 @@
 	cd libcharset && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
 	cd lib && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
 	cd srclib && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
+.if !defined(WITHOUT_ICONV_1)
 	cd src && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
+.endif
 	if [ ! -d $(DESTDIR)$(includedir) ] ; then $(mkinstalldirs) $(DESTDIR)$(includedir) ; fi
 	$(INSTALL_DATA) include/iconv.h.inst $(DESTDIR)$(includedir)/iconv.h
 	cd po && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' datarootdir='$(datarootdir)' datadir='$(datadir)'
--- man/Makefile.in.orig	2009-02-17 13:16:08.000000000 +0900
+++ man/Makefile.in	2009-02-17 13:23:43.000000000 +0900
@@ -35,20 +35,31 @@
 all :
 
 install : force
+.if !defined(WITHOUT_ICONV_1)
 	if [ ! -d $(DESTDIR)$(mandir)/man1 ] ; then $(mkinstalldirs) $(DESTDIR)$(mandir)/man1 ; fi
 	builddir="`pwd`"; cd $(srcdir) && for f in *.1 ; do (cd "$$builddir"; echo $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(mandir)/man1/$$f ; $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(mandir)/man1/$$f) ; done
+.endif
 	if [ ! -d $(DESTDIR)$(mandir)/man3 ] ; then $(mkinstalldirs) $(DESTDIR)$(mandir)/man3 ; fi
 	builddir="`pwd`"; cd $(srcdir) && for f in *.3 ; do (cd "$$builddir"; echo $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(mandir)/man3/$$f ; $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(mandir)/man3/$$f) ; done
 	if [ ! -d $(DESTDIR)$(htmldir) ] ; then $(mkinstalldirs) $(DESTDIR)$(htmldir) ; fi
+.if !defined(WITHOUT_ICONV_1)
 	builddir="`pwd`"; cd $(srcdir) && for f in *.html ; do (cd "$$builddir"; echo $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(htmldir)/$$f ; $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(htmldir)/$$f) ; done
+.else
+	builddir="`pwd`"; cd $(srcdir) && for f in *.3.html ; do (cd "$$builddir"; echo $(INSTALL_DIR) $(srcdir)/$$f $(DESTDIR)$(htmldir)/$$f ; $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(htmldir)/$$f) ; done
+
+.endif
 
 installdirs : force
+.if !defined(WITHOUT_ICONV_1)
 	if [ ! -d $(DESTDIR)$(mandir)/man1 ] ; then $(mkinstalldirs) $(DESTDIR)$(mandir)/man1 ; fi
+.endif
 	if [ ! -d $(DESTDIR)$(mandir)/man3 ] ; then $(mkinstalldirs) $(DESTDIR)$(mandir)/man3 ; fi
 	if [ ! -d $(DESTDIR)$(htmldir) ] ; then $(mkinstalldirs) $(DESTDIR)$(htmldir) ; fi
 
 uninstall : force
+.if !defined(WITHOUT_ICONV_1)
 	cd $(srcdir) && for f in *.1 ; do echo $(RM) $(DESTDIR)$(mandir)/man1/$$f ; $(RM) $(DESTDIR)$(mandir)/man1/$$f ; done
+.endif
 	cd $(srcdir) && for f in *.3 ; do echo $(RM) $(DESTDIR)$(mandir)/man3/$$f ; $(RM) $(DESTDIR)$(mandir)/man3/$$f ; done
 	cd $(srcdir) && for f in *.html ; do echo $(RM) $(DESTDIR)$(htmldir)/$$f ; $(RM) $(DESTDIR)$(htmldir)/$$f ; done
 

Lines 1-10 Link Here

(-)./libiconv/files/patch-src::Makefile.in (-6 / +6 lines)
1	--- src/Makefile.in.orig Fri Jul 14 09:19:07 2006	1	--- src/Makefile.in.orig 2007-05-28 07:15:52.000000000 +0900
2	+++ src/Makefile.in Fri Jun 29 18:31:59 2007	2	+++ src/Makefile.in 2009-01-28 10:25:10.000000000 +0900
3	@@ -96,6 +96,7 @@ install : all force	3	@@ -104,6 +104,7 @@
4	if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi	4	if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi
5	case "@host_os@" in \	5	case "@host_os@" in \
6	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;; \	6	hpux*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(OBJECTS_RES_@WOE32@) `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv;; \
7	+ freebsd*) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a ../lib//libiconv.la @LTLIBINTL@ -o iconv;; \	7	+ freebsd*) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a ../lib/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv;; \
8	*) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ -o iconv;; \	8	*) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv;; \
9	esac	9	esac
10	$(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv $(DESTDIR)$(bindir)/iconv	10	$(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv $(DESTDIR)$(bindir)/iconv

Lines 1-4 Link Here

(-)./libiconv/pkg-plist (-2 / +2 lines)
1	bin/iconv	1	%%WITHOUT_ICONV_1%%bin/iconv
2	include/iconv.h	2	include/iconv.h
3	include/libcharset.h	3	include/libcharset.h
4	include/localcharset.h	4	include/localcharset.h
Lines 11-17 Link Here
11	lib/libiconv.so	11	lib/libiconv.so
12	lib/libiconv.so.3	12	lib/libiconv.so.3
13	libdata/charset.alias	13	libdata/charset.alias
14	%%DOCSDIR%%/iconv.1.html	14	%%WITHOUT_ICONV_1%%%%DOCSDIR%%/iconv.1.html
15	%%DOCSDIR%%/iconv.3.html	15	%%DOCSDIR%%/iconv.3.html
16	%%DOCSDIR%%/iconv_close.3.html	16	%%DOCSDIR%%/iconv_close.3.html
17	%%DOCSDIR%%/iconv_open.3.html	17	%%DOCSDIR%%/iconv_open.3.html

Return to bug 131769

Lines 6-12 Link Here

(-)./libiconv/Makefile (-4 / +13 lines)
6	#	6	#
7		7
8	PORTNAME= libiconv	8	PORTNAME= libiconv
9	PORTVERSION= 1.11	9	PORTVERSION= 1.12
10	PORTREVISION= 1	10	PORTREVISION= 1
11	CATEGORIES= converters devel	11	CATEGORIES= converters devel
12	MASTER_SITES= ${MASTER_SITE_GNU}	12	MASTER_SITES= ${MASTER_SITE_GNU}
Lines 25-34 Link Here
25	USE_LDCONFIG= yes	25	USE_LDCONFIG= yes
26	CONFIGURE_ENV= gl_cv_cc_visibility="no"	26	CONFIGURE_ENV= gl_cv_cc_visibility="no"
27		27
28	MAN1= iconv.1
29	MAN3= iconv.3 iconv_open.3 iconv_close.3 iconvctl.3	28	MAN3= iconv.3 iconv_open.3 iconv_close.3 iconvctl.3
30		29
31	OPTIONS= EXTRA_ENCODINGS "Include extra character sets" on \	30	OPTIONS= ICONV_1 "Install iconv(1)" off \
		31	EXTRA_ENCODINGS "Include extra character sets" on \
32	EXTRA_PATCHES "Apply patches to fix CP932 add EUCJP-MS" off	32	EXTRA_PATCHES "Apply patches to fix CP932 add EUCJP-MS" off
33		33
34	.ifdef USE_ICONV	34	.ifdef USE_ICONV
Lines 46-55 Link Here
46	PATCH_SITES+= http://www2d.biglobe.ne.jp/~msyk/software/libiconv/	46	PATCH_SITES+= http://www2d.biglobe.ne.jp/~msyk/software/libiconv/
47	PATCH_SITES+= ${MASTER_SITE_LOCAL}	47	PATCH_SITES+= ${MASTER_SITE_LOCAL}
48	PATCH_SITE_SUBDIR= nork	48	PATCH_SITE_SUBDIR= nork
49	PATCHFILES+= ${DISTNAME}-cp932.patch.gz	49	PATCHFILES+= ${DISTNAME}-ja-4.patch.gz
50	PATCH_DIST_STRIP+= -p1	50	PATCH_DIST_STRIP+= -p1
51	.endif	51	.endif
52		52
		53	.if !defined(WITH_ICONV_1)
		54	EXTRA_PATCHES= ${FILESDIR}/WITHOUT_ICONV_1.patch
		55	PLIST_SUB+= WITHOUT_ICONV_1="@comment "
		56	MAKE_ARGS+= WITHOUT_ICONV_1=yes
		57	.else
		58	MAN1= iconv.1
		59	PLIST_SUB+= WITHOUT_ICONV_1=""
		60	.endif
		61
53	post-patch:	62	post-patch:
54	@${REINPLACE_CMD} -e 's:ei_ksc5601:ei_euc_kr:g' ${WRKSRC}/lib/aliases.h	63	@${REINPLACE_CMD} -e 's:ei_ksc5601:ei_euc_kr:g' ${WRKSRC}/lib/aliases.h
55		64

Line 0 Link Here

(-)./libiconv/files/WITHOUT_ICONV_1.patch (+56 lines)
	1	--- Makefile.in.orig 2009-02-17 13:10:19.000000000 +0900
	2	+++ Makefile.in 2009-02-17 13:15:37.000000000 +0900
	3	@@ -32,7 +32,9 @@
	4	all : lib/localcharset.h force
	5	cd lib && $(MAKE) all
	6	cd srclib && $(MAKE) all
	7	+.if !defined(WITHOUT_ICONV_1)
	8	cd src && $(MAKE) all
	9	+.endif
	10	cd po && $(MAKE) all
	11	cd man && $(MAKE) all
	12	if test -d tests; then cd tests && $(MAKE) all; fi
	13	@@ -51,7 +53,9 @@
	14	cd libcharset && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
	15	cd lib && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
	16	cd srclib && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
	17	+.if !defined(WITHOUT_ICONV_1)
	18	cd src && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
	19	+.endif
	20	if [ ! -d $(DESTDIR)$(includedir) ] ; then $(mkinstalldirs) $(DESTDIR)$(includedir) ; fi
	21	$(INSTALL_DATA) include/iconv.h.inst $(DESTDIR)$(includedir)/iconv.h
	22	cd po && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' datarootdir='$(datarootdir)' datadir='$(datadir)'
	23	--- man/Makefile.in.orig 2009-02-17 13:16:08.000000000 +0900
	24	+++ man/Makefile.in 2009-02-17 13:23:43.000000000 +0900
	25	@@ -35,20 +35,31 @@
	26	all :
	27
	28	install : force
	29	+.if !defined(WITHOUT_ICONV_1)
	30	if [ ! -d $(DESTDIR)$(mandir)/man1 ] ; then $(mkinstalldirs) $(DESTDIR)$(mandir)/man1 ; fi
	31	builddir="`pwd`"; cd $(srcdir) && for f in *.1 ; do (cd "$$builddir"; echo $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(mandir)/man1/$$f ; $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(mandir)/man1/$$f) ; done
	32	+.endif
	33	if [ ! -d $(DESTDIR)$(mandir)/man3 ] ; then $(mkinstalldirs) $(DESTDIR)$(mandir)/man3 ; fi
	34	builddir="`pwd`"; cd $(srcdir) && for f in *.3 ; do (cd "$$builddir"; echo $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(mandir)/man3/$$f ; $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(mandir)/man3/$$f) ; done
	35	if [ ! -d $(DESTDIR)$(htmldir) ] ; then $(mkinstalldirs) $(DESTDIR)$(htmldir) ; fi
	36	+.if !defined(WITHOUT_ICONV_1)
	37	builddir="`pwd`"; cd $(srcdir) && for f in *.html ; do (cd "$$builddir"; echo $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(htmldir)/$$f ; $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(htmldir)/$$f) ; done
	38	+.else
	39	+ builddir="`pwd`"; cd $(srcdir) && for f in *.3.html ; do (cd "$$builddir"; echo $(INSTALL_DIR) $(srcdir)/$$f $(DESTDIR)$(htmldir)/$$f ; $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(htmldir)/$$f) ; done
	40	+
	41	+.endif
	42
	43	installdirs : force
	44	+.if !defined(WITHOUT_ICONV_1)
	45	if [ ! -d $(DESTDIR)$(mandir)/man1 ] ; then $(mkinstalldirs) $(DESTDIR)$(mandir)/man1 ; fi
	46	+.endif
	47	if [ ! -d $(DESTDIR)$(mandir)/man3 ] ; then $(mkinstalldirs) $(DESTDIR)$(mandir)/man3 ; fi
	48	if [ ! -d $(DESTDIR)$(htmldir) ] ; then $(mkinstalldirs) $(DESTDIR)$(htmldir) ; fi
	49
	50	uninstall : force
	51	+.if !defined(WITHOUT_ICONV_1)
	52	cd $(srcdir) && for f in *.1 ; do echo $(RM) $(DESTDIR)$(mandir)/man1/$$f ; $(RM) $(DESTDIR)$(mandir)/man1/$$f ; done
	53	+.endif
	54	cd $(srcdir) && for f in *.3 ; do echo $(RM) $(DESTDIR)$(mandir)/man3/$$f ; $(RM) $(DESTDIR)$(mandir)/man3/$$f ; done
	55	cd $(srcdir) && for f in *.html ; do echo $(RM) $(DESTDIR)$(htmldir)/$$f ; $(RM) $(DESTDIR)$(htmldir)/$$f ; done
	56