Attachment #132950 for bug #177321




# Created by: torstenb@FreeBSD.org
# Date created:		14 Jul 1995
# Whom:			torstenb@FreeBSD.org
#
# $FreeBSD$
#

PORTNAME=	recode
PORTVERSION=	3.6

USE_AUTOTOOLS=	libtool
USE_PERL5=	yes
USE_LDCONFIG=	yes
USE_ICONV=	yes
CONFIGURE_ARGS=	--without-included-gettext
CPPFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib




diff --git Makefile.in Makefile.in
index 9f6c992..0ccc48c 100644
--- Makefile.in
+++ Makefile.in
@@ -108,7 +108,7 @@ ACLOCAL_AMFLAGS = -I m4
 
 BABYL = ../rmail/* ../*/rmail/* ../*/*/RMAIL ../*/*/rmail/*
 EXTRA_DIST = COPYING-LIB PATCHES-AC rebox.el recode.spec aclocal.sh
-SUBDIRS = m4 doc lib libiconv i18n src tests contrib
+SUBDIRS = m4 doc lib i18n src tests contrib
 
 POTFILES = src/main.c src/names.c src/outer.c src/recode.c src/request.c src/strip-data.c src/task.c src/testdump.c
 

Lines 1-16 Link Here

(-)files/patch-src-Makefile.in (-6 / +102 lines)
1	--- src/Makefile.in.orig Mon Jan 22 19:14:16 2001	1	diff --git src/Makefile.in src/Makefile.in
2	+++ src/Makefile.in Mon Mar 10 10:17:54 2003	2	index 9bdb85d..5c2765f 100644
3	@@ -131,7 +131,7 @@	3	--- src/Makefile.in
		4	+++ src/Makefile.in
		5	@@ -129,11 +129,11 @@ L_SURFACES =
		6	recode_SOURCES = main.c freeze.c mixed.c
		7	recode_LDADD = librecode.la ../lib/libreco.a
4		8
5	librecode_la_SOURCES = argmatch.c charname.c combine.c fr-charname.c hash.c iconv.c libiconv.c localcharset.c merged.c names.c outer.c quotearg.c recode.c request.c strip-pool.c task.c xmalloc.c $(C_STEPS)	9	-librecode_la_SOURCES = argmatch.c charname.c combine.c fr-charname.c hash.c iconv.c libiconv.c localcharset.c merged.c names.c outer.c quotearg.c recode.c request.c strip-pool.c task.c xmalloc.c $(C_STEPS)
		10	+librecode_la_SOURCES = argmatch.c charname.c combine.c fr-charname.c hash.c libiconv.c localcharset.c merged.c names.c outer.c quotearg.c recode.c request.c strip-pool.c task.c xmalloc.c $(C_STEPS)
6		11
7	-librecode_la_LDFLAGS = -version-info 0:0:0	12	-librecode_la_LDFLAGS = -version-info 0:0:0
8	+librecode_la_LDFLAGS = -version-info 3:6:0	13	+librecode_la_LDFLAGS = -version-info 3:6:0
9		14
10	INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/libiconv	15	-INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/libiconv
		16	+INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/lib -I$(prefix)/include
11	DEFS = -DLIBDIR=\"$(libdir)\" @DEFS@	17	DEFS = -DLIBDIR=\"$(libdir)\" @DEFS@
12	@@ -153,7 +153,7 @@
13		18
		19	ETAGS_ARGS = $(L_STEPS)
		20	@@ -153,11 +153,11 @@ LTLIBRARIES = $(lib_LTLIBRARIES)
		21
14	CPPFLAGS = @CPPFLAGS@	22	CPPFLAGS = @CPPFLAGS@
15	LDFLAGS = @LDFLAGS@	23	LDFLAGS = @LDFLAGS@
16	-LIBS = @LIBS@	24	-LIBS = @LIBS@
Lines 18-20 Link Here
18	ANSI2KNR = @ANSI2KNR@	26	ANSI2KNR = @ANSI2KNR@
19	librecode_la_LIBADD =	27	librecode_la_LIBADD =
20	librecode_la_OBJECTS = argmatch$U.lo charname$U.lo combine$U.lo \	28	librecode_la_OBJECTS = argmatch$U.lo charname$U.lo combine$U.lo \
		29	-fr-charname$U.lo hash$U.lo iconv$U.lo libiconv$U.lo localcharset$U.lo \
		30	+fr-charname$U.lo hash$U.lo libiconv$U.lo localcharset$U.lo \
		31	merged$U.lo names$U.lo outer$U.lo quotearg$U.lo recode$U.lo \
		32	request$U.lo strip-pool$U.lo task$U.lo xmalloc$U.lo african$U.lo \
		33	afrtran$U.lo applemac$U.lo atarist$U.lo bangbang$U.lo cdcnos$U.lo \
		34	@@ -359,8 +359,6 @@ ibmpc_.c: ibmpc.c $(ANSI2KNR)
		35	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ibmpc.c; then echo $(srcdir)/ibmpc.c; else echo ibmpc.c; fi` \| sed 's/^# $[0-9]$/#line \1/' \| $(ANSI2KNR) > ibmpc_.c
		36	iconqnx_.c: iconqnx.c $(ANSI2KNR)
		37	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/iconqnx.c; then echo $(srcdir)/iconqnx.c; else echo iconqnx.c; fi` \| sed 's/^# $[0-9]$/#line \1/' \| $(ANSI2KNR) > iconqnx_.c
		38	-iconv_.c: iconv.c $(ANSI2KNR)
		39	- $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/iconv.c; then echo $(srcdir)/iconv.c; else echo iconv.c; fi` \| sed 's/^# $[0-9]$/#line \1/' \| $(ANSI2KNR) > iconv_.c
		40	lat1asci_.c: lat1asci.c $(ANSI2KNR)
		41	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/lat1asci.c; then echo $(srcdir)/lat1asci.c; else echo lat1asci.c; fi` \| sed 's/^# $[0-9]$/#line \1/' \| $(ANSI2KNR) > lat1asci_.c
		42	lat1ltex_.c: lat1ltex.c $(ANSI2KNR)
		43	@@ -425,7 +423,7 @@ bangbang_.lo base64_.o base64_.lo cdcnos_.o cdcnos_.lo charname_.o \
		44	charname_.lo combine_.o combine_.lo dump_.o dump_.lo ebcdic_.o \
		45	ebcdic_.lo endline_.o endline_.lo flat_.o flat_.lo fr-charname_.o \
		46	fr-charname_.lo freeze_.o freeze_.lo hash_.o hash_.lo html_.o html_.lo \
		47	-ibmpc_.o ibmpc_.lo iconqnx_.o iconqnx_.lo iconv_.o iconv_.lo \
		48	+ibmpc_.o ibmpc_.lo iconqnx_.o iconqnx_.lo \
		49	lat1asci_.o lat1asci_.lo lat1ltex_.o lat1ltex_.lo lat1txte_.o \
		50	lat1txte_.lo libiconv_.o libiconv_.lo localcharset_.o localcharset_.lo \
		51	main_.o main_.lo merged_.o merged_.lo mixed_.o mixed_.lo mule_.o \
		52	@@ -575,64 +573,6 @@ ibmpc.lo ibmpc.o : ibmpc.c common.h ../config.h xalloc.h argmatch.h \
		53	../lib/error.h recodext.h recode.h
		54	iconqnx.lo iconqnx.o : iconqnx.c common.h ../config.h xalloc.h \
		55	argmatch.h ../lib/error.h recodext.h recode.h
		56	-iconv.lo iconv.o : iconv.c common.h ../config.h xalloc.h argmatch.h \
		57	- ../lib/error.h recodext.h recode.h ../libiconv/iconv.h \
		58	- ../libiconv/libcharset.h ../libiconv/converters.h \
		59	- ../libiconv/ascii.h ../libiconv/utf8.h ../libiconv/ucs2.h \
		60	- ../libiconv/ucs2be.h ../libiconv/ucs2le.h ../libiconv/ucs4.h \
		61	- ../libiconv/ucs4be.h ../libiconv/ucs4le.h ../libiconv/utf16.h \
		62	- ../libiconv/utf16be.h ../libiconv/utf16le.h ../libiconv/utf7.h \
		63	- ../libiconv/ucs2internal.h ../libiconv/ucs2swapped.h \
		64	- ../libiconv/ucs4internal.h ../libiconv/ucs4swapped.h \
		65	- ../libiconv/java.h ../libiconv/iso8859_1.h \
		66	- ../libiconv/iso8859_2.h ../libiconv/iso8859_3.h \
		67	- ../libiconv/iso8859_4.h ../libiconv/iso8859_5.h \
		68	- ../libiconv/iso8859_6.h ../libiconv/iso8859_7.h \
		69	- ../libiconv/iso8859_8.h ../libiconv/iso8859_9.h \
		70	- ../libiconv/iso8859_10.h ../libiconv/iso8859_13.h \
		71	- ../libiconv/iso8859_14.h ../libiconv/iso8859_15.h \
		72	- ../libiconv/iso8859_16.h ../libiconv/koi8_r.h \
		73	- ../libiconv/koi8_u.h ../libiconv/koi8_ru.h ../libiconv/cp1250.h \
		74	- ../libiconv/cp1251.h ../libiconv/cp1252.h ../libiconv/cp1253.h \
		75	- ../libiconv/cp1254.h ../libiconv/cp1255.h ../libiconv/cp1256.h \
		76	- ../libiconv/cp1257.h ../libiconv/cp1258.h ../libiconv/cp850.h \
		77	- ../libiconv/cp866.h ../libiconv/mac_roman.h \
		78	- ../libiconv/mac_centraleurope.h ../libiconv/mac_iceland.h \
		79	- ../libiconv/mac_croatian.h ../libiconv/mac_romania.h \
		80	- ../libiconv/mac_cyrillic.h ../libiconv/mac_ukraine.h \
		81	- ../libiconv/mac_greek.h ../libiconv/mac_turkish.h \
		82	- ../libiconv/mac_hebrew.h ../libiconv/mac_arabic.h \
		83	- ../libiconv/mac_thai.h ../libiconv/hp_roman8.h \
		84	- ../libiconv/nextstep.h ../libiconv/armscii_8.h \
		85	- ../libiconv/georgian_academy.h ../libiconv/georgian_ps.h \
		86	- ../libiconv/mulelao.h ../libiconv/cp1133.h ../libiconv/tis620.h \
		87	- ../libiconv/cp874.h ../libiconv/viscii.h ../libiconv/tcvn.h \
		88	- ../libiconv/iso646_jp.h ../libiconv/jisx0201.h \
		89	- ../libiconv/jisx0208.h ../libiconv/jisx0212.h \
		90	- ../libiconv/iso646_cn.h ../libiconv/gb2312.h \
		91	- ../libiconv/isoir165.h ../libiconv/isoir165ext.h \
		92	- ../libiconv/gbk.h ../libiconv/gbkext1.h ../libiconv/gbkext2.h \
93	- ../libiconv/gbkext_inv.h ../libiconv/cp936ext.h \
94	- ../libiconv/cns11643.h ../libiconv/cns11643_1.h \
95	- ../libiconv/cns11643_2.h ../libiconv/cns11643_3.h \
96	- ../libiconv/cns11643_inv.h ../libiconv/big5.h \
97	- ../libiconv/ksc5601.h ../libiconv/johab_hangul.h \
98	- ../libiconv/euc_jp.h ../libiconv/sjis.h ../libiconv/cp932.h \
99	- ../libiconv/cp932ext.h ../libiconv/iso2022_jp.h \
100	- ../libiconv/iso2022_jp1.h ../libiconv/iso2022_jp2.h \
101	- ../libiconv/euc_cn.h ../libiconv/ces_gbk.h \
102	- ../libiconv/gb18030.h ../libiconv/gb18030ext.h \
103	- ../libiconv/gb18030uni.h ../libiconv/iso2022_cn.h \
104	- ../libiconv/iso2022_cnext.h ../libiconv/hz.h \
105	- ../libiconv/euc_tw.h ../libiconv/ces_big5.h ../libiconv/cp950.h \
106	- ../libiconv/cp950ext.h ../libiconv/big5hkscs.h \
107	- ../libiconv/hkscs.h ../libiconv/euc_kr.h ../libiconv/cp949.h \
108	- ../libiconv/uhc_1.h ../libiconv/uhc_2.h ../libiconv/johab.h \
109	- ../libiconv/iso2022_kr.h ../libiconv/cjk_variants.h \
110	- ../libiconv/translit.h ../libiconv/encodings.def \
111	- ../libiconv/encodings_local.def ../libiconv/flags.h \
112	- ../libiconv/loops.h ../libiconv/loop_unicode.h \
113	- ../libiconv/loop_wchar.h ../libiconv/aliases.h
114	lat1asci.lo lat1asci.o : lat1asci.c common.h ../config.h xalloc.h \
115	argmatch.h ../lib/error.h recodext.h recode.h
116	lat1ltex.lo lat1ltex.o : lat1ltex.c common.h ../config.h xalloc.h \

Return to bug 177321

Lines 1-9 Link Here

(-)Makefile (-5 / +2 lines)
1	# New ports collection makefile for: recode	1	# Created by: torstenb@FreeBSD.org
2	# Date created: 14 Jul 1995
3	# Whom: torstenb@FreeBSD.org
4	#
5	# $FreeBSD$	2	# $FreeBSD$
6	#
7		3
8	PORTNAME= recode	4	PORTNAME= recode
9	PORTVERSION= 3.6	5	PORTVERSION= 3.6
Lines 19-24 Link Here
19	USE_AUTOTOOLS= libtool	15	USE_AUTOTOOLS= libtool
20	USE_PERL5= yes	16	USE_PERL5= yes
21	USE_LDCONFIG= yes	17	USE_LDCONFIG= yes
		18	USE_ICONV= yes
22	CONFIGURE_ARGS= --without-included-gettext	19	CONFIGURE_ARGS= --without-included-gettext
23	CPPFLAGS+= -I${LOCALBASE}/include	20	CPPFLAGS+= -I${LOCALBASE}/include
24	LDFLAGS+= -L${LOCALBASE}/lib	21	LDFLAGS+= -L${LOCALBASE}/lib

Line 0 Link Here

(-)files/patch-Makefile.in (+13 lines)
	1	diff --git Makefile.in Makefile.in
	2	index 9f6c992..0ccc48c 100644
	3	--- Makefile.in
	4	+++ Makefile.in
	5	@@ -108,7 +108,7 @@ ACLOCAL_AMFLAGS = -I m4
	6
	7	BABYL = ../rmail/* ..//rmail/ ..///RMAIL ..///rmail/*
	8	EXTRA_DIST = COPYING-LIB PATCHES-AC rebox.el recode.spec aclocal.sh
	9	-SUBDIRS = m4 doc lib libiconv i18n src tests contrib
	10	+SUBDIRS = m4 doc lib i18n src tests contrib
	11
	12	POTFILES = src/main.c src/names.c src/outer.c src/recode.c src/request.c src/strip-data.c src/task.c src/testdump.c
	13