Support STAGEDIR.

Approved by:	portmgr@

3 files changed, 119 insertions, 38 deletions

diff --git a/converters/bsdconv/Makefile b/converters/bsdconv/Makefile
index 1c8cec689940..f84f10f48fc3 100644
--- a/converters/bsdconv/Makefile
+++ b/converters/bsdconv/Makefile
@@ -19,7 +19,6 @@ OPTIONS_DEFINE=	CHINESE EBCDIC
 CHINESE_DESC=	Extra Chinese codecs
 EBCDIC_DESC=	EBCDIC codecs
 
-NO_STAGE=	yes
 USE_LDCONFIG=	yes
 
 MAKE_ARGS=	PREFIX=${PREFIX}
@@ -46,6 +45,6 @@ PLIST_SUB+=	EBCDIC="@comment "
 .endif
 
 pre-install:
-	${MKDIR} ${DATADIR}/ ${DATADIR}/from/ ${DATADIR}/inter/ ${DATADIR}/to/
+	${MKDIR} ${STAGEDIR}${DATADIR}/ ${STAGEDIR}${DATADIR}/from/ ${STAGEDIR}${DATADIR}/inter/ ${STAGEDIR}${DATADIR}/to/
 
 .include <bsd.port.mk>
diff --git a/converters/bsdconv/files/patch-Makefile b/converters/bsdconv/files/patch-Makefile
index 86d905d2a090..150a851b6205 100644
--- a/converters/bsdconv/files/patch-Makefile
+++ b/converters/bsdconv/files/patch-Makefile
@@ -1,8 +1,8 @@
---- Makefile.orig	2012-08-16 22:36:27.000000000 +0800
-+++ Makefile	2012-08-16 22:36:47.000000000 +0800
-@@ -3,17 +3,9 @@
+--- Makefile.orig	2013-09-16 12:15:40.000000000 +0800
++++ Makefile	2014-05-15 23:43:23.541980613 +0800
+@@ -3,17 +3,9 @@ BSDCONV_PATH?=${PREFIX}
  CFLAGS+=-Wall -DPREFIX='"${PREFIX}"' -DBSDCONV_PATH='"${BSDCONV_PATH}"'
- SHLIBVER=7
+ SHLIBVER=11
  
 -UNAME_S=$(shell uname -s)
 -ifeq (${UNAME_S}, Darwin)
@@ -16,4 +16,86 @@
 -LIBS+=-ldl
 -endif
  
- TODO_CODECS_BASIC_TABLE=
+ TODO_CODECS_BASIC=
+ TODO_CODECS_BASIC+=from/00
+@@ -174,12 +166,12 @@ builddir:
+ 	mkdir -p build/share/bsdconv/to
+ 
+ installdir:
+-	mkdir -p ${PREFIX}/bin
+-	mkdir -p ${PREFIX}/lib
+-	mkdir -p ${PREFIX}/include
+-	mkdir -p ${PREFIX}/share/bsdconv/from
+-	mkdir -p ${PREFIX}/share/bsdconv/inter
+-	mkdir -p ${PREFIX}/share/bsdconv/to
++	mkdir -p ${DESTDIR}${PREFIX}/bin
++	mkdir -p ${DESTDIR}${PREFIX}/lib
++	mkdir -p ${DESTDIR}${PREFIX}/include
++	mkdir -p ${DESTDIR}${PREFIX}/share/bsdconv/from
++	mkdir -p ${DESTDIR}${PREFIX}/share/bsdconv/inter
++	mkdir -p ${DESTDIR}${PREFIX}/share/bsdconv/to
+ 
+ libbsdconv: builddir src/libbsdconv.c src/bsdconv.h
+ 	$(CC) ${CFLAGS} src/libbsdconv.c -fPIC -shared -o build/lib/${SHLIBNAME} ${LIBS}
+@@ -238,41 +230,41 @@ clean:
+ install: installdir install_main install_basic install_chinese install_ebcdic
+ 
+ install_main:
+-	install -m 555 build/bin/bsdconv ${PREFIX}/bin
+-	install -m 555 build/bin/bsdconv-man ${PREFIX}/bin
+-	install -m 555 build/bin/bsdconv-mktable ${PREFIX}/bin
+-	install -m 555 build/bin/bsdconv-completion ${PREFIX}/bin
+-	install -m 444 build/include/bsdconv.h ${PREFIX}/include
+-	install -m 444 build/lib/${SHLIBNAME} ${PREFIX}/lib
+-	install -m 444 build/share/bsdconv/from/alias ${PREFIX}/share/bsdconv/from/alias
+-	install -m 444 build/share/bsdconv/inter/alias ${PREFIX}/share/bsdconv/inter/alias
+-	install -m 444 build/share/bsdconv/to/alias ${PREFIX}/share/bsdconv/to/alias
++	install -m 555 build/bin/bsdconv ${DESTDIR}${PREFIX}/bin
++	install -m 555 build/bin/bsdconv-man ${DESTDIR}${PREFIX}/bin
++	install -m 555 build/bin/bsdconv-mktable ${DESTDIR}${PREFIX}/bin
++	install -m 555 build/bin/bsdconv-completion ${DESTDIR}${PREFIX}/bin
++	install -m 444 build/include/bsdconv.h ${DESTDIR}${PREFIX}/include
++	install -m 444 build/lib/${SHLIBNAME} ${DESTDIR}${PREFIX}/lib
++	install -m 444 build/share/bsdconv/from/alias ${DESTDIR}${PREFIX}/share/bsdconv/from/alias
++	install -m 444 build/share/bsdconv/inter/alias ${DESTDIR}${PREFIX}/share/bsdconv/inter/alias
++	install -m 444 build/share/bsdconv/to/alias ${DESTDIR}${PREFIX}/share/bsdconv/to/alias
+ 	if [ ${SHLIBNAME} != libbsdconv.so ]; then \
+-		ln -sf libbsdconv.so.${SHLIBVER} ${PREFIX}/lib/libbsdconv.so ; \
++		ln -sf libbsdconv.so.${SHLIBVER} ${DESTDIR}${PREFIX}/lib/libbsdconv.so ; \
+ 	fi
+ 
+ install_doc:
+-	install -m 555 build/bin/bsdconv-man ${PREFIX}/bin
++	install -m 555 build/bin/bsdconv-man ${DESTDIR}${PREFIX}/bin
+ 
+ install_basic:
+ 	for item in ${TODO_CODECS_BASIC} ; do \
+-		install -m 444 build/share/bsdconv/$${item} ${PREFIX}/share/bsdconv/$${item} ; \
+-		if [ -e build/share/bsdconv/$${item}.man ]; then install -m 444 build/share/bsdconv/$${item}.man ${PREFIX}/share/bsdconv/$${item}.man ; fi ; \
+-		if [ -e build/share/bsdconv/$${item}.so ]; then install -m 444 build/share/bsdconv/$${item}.so ${PREFIX}/share/bsdconv/$${item}.so ; fi ; \
++		install -m 444 build/share/bsdconv/$${item} ${DESTDIR}${PREFIX}/share/bsdconv/$${item} ; \
++		if [ -e build/share/bsdconv/$${item}.man ]; then install -m 444 build/share/bsdconv/$${item}.man ${DESTDIR}${PREFIX}/share/bsdconv/$${item}.man ; fi ; \
++		if [ -e build/share/bsdconv/$${item}.so ]; then install -m 444 build/share/bsdconv/$${item}.so ${DESTDIR}${PREFIX}/share/bsdconv/$${item}.so ; fi ; \
+ 	done
+ 
+ install_chinese:
+ 	for item in ${TODO_CODECS_CHINESE} ; do \
+-		install -m 444 build/share/bsdconv/$${item} ${PREFIX}/share/bsdconv/$${item} ; \
+-		if [ -e build/share/bsdconv/$${item}.man ]; then install -m 444 build/share/bsdconv/$${item}.man ${PREFIX}/share/bsdconv/$${item}.man ; fi ; \
+-		if [ -e build/share/bsdconv/$${item}.so ]; then install -m 444 build/share/bsdconv/$${item}.so ${PREFIX}/share/bsdconv/$${item}.so ; fi ; \
++		install -m 444 build/share/bsdconv/$${item} ${DESTDIR}${PREFIX}/share/bsdconv/$${item} ; \
++		if [ -e build/share/bsdconv/$${item}.man ]; then install -m 444 build/share/bsdconv/$${item}.man ${DESTDIR}${PREFIX}/share/bsdconv/$${item}.man ; fi ; \
++		if [ -e build/share/bsdconv/$${item}.so ]; then install -m 444 build/share/bsdconv/$${item}.so ${DESTDIR}${PREFIX}/share/bsdconv/$${item}.so ; fi ; \
+ 	done
+ 
+ install_ebcdic:
+ 	for item in ${TODO_CODECS_EBCDIC} ; do \
+-		install -m 444 build/share/bsdconv/$${item} ${PREFIX}/share/bsdconv/$${item} ; \
+-		if [ -e build/share/bsdconv/$${item}.man ]; then install -m 444 build/share/bsdconv/$${item}.man ${PREFIX}/share/bsdconv/$${item}.man ; fi ; \
+-		if [ -e build/share/bsdconv/$${item}.so ]; then install -m 444 build/share/bsdconv/$${item}.so ${PREFIX}/share/bsdconv/$${item}.so ; fi ; \
++		install -m 444 build/share/bsdconv/$${item} ${DESTDIR}${PREFIX}/share/bsdconv/$${item} ; \
++		if [ -e build/share/bsdconv/$${item}.man ]; then install -m 444 build/share/bsdconv/$${item}.man ${DESTDIR}${PREFIX}/share/bsdconv/$${item}.man ; fi ; \
++		if [ -e build/share/bsdconv/$${item}.so ]; then install -m 444 build/share/bsdconv/$${item}.so ${DESTDIR}${PREFIX}/share/bsdconv/$${item}.so ; fi ; \
+ 	done
+ 
+ plist:
diff --git a/converters/bsdconv/pkg-plist b/converters/bsdconv/pkg-plist
index 55e245eeb1be..6c40339ca245 100644
--- a/converters/bsdconv/pkg-plist
+++ b/converters/bsdconv/pkg-plist
@@ -5,9 +5,6 @@ bin/bsdconv-mktable
 include/bsdconv.h
 lib/libbsdconv.so
 lib/libbsdconv.so.11
-%%DATADIR%%/from/alias
-%%DATADIR%%/inter/alias
-%%DATADIR%%/to/alias
 %%DATADIR%%/from/00
 %%DATADIR%%/from/00.man
 %%DATADIR%%/from/ANSI-CONTROL
@@ -16,19 +13,19 @@ lib/libbsdconv.so.11
 %%DATADIR%%/from/ANY
 %%DATADIR%%/from/ANY.man
 %%DATADIR%%/from/ANY.so
+%%DATADIR%%/from/ASCII
 %%DATADIR%%/from/ASCII-NAMED-HTML-ENTITY
 %%DATADIR%%/from/ASCII-NUMERIC-HTML-ENTITY
 %%DATADIR%%/from/ASCII-NUMERIC-HTML-ENTITY.so
-%%DATADIR%%/from/ASCII
 %%DATADIR%%/from/BIG5-5C
 %%DATADIR%%/from/BSDCONV
-%%DATADIR%%/from/BSDCONV.man
-%%DATADIR%%/from/BSDCONV.so
 %%DATADIR%%/from/BSDCONV-KEYWORD
 %%DATADIR%%/from/BSDCONV-KEYWORD.man
 %%DATADIR%%/from/BSDCONV-LOG
 %%DATADIR%%/from/BSDCONV-LOG.man
 %%DATADIR%%/from/BSDCONV-LOG.so
+%%DATADIR%%/from/BSDCONV.man
+%%DATADIR%%/from/BSDCONV.so
 %%DATADIR%%/from/BYTE
 %%DATADIR%%/from/ESCAPE
 %%DATADIR%%/from/ESCAPE.man
@@ -59,6 +56,7 @@ lib/libbsdconv.so.11
 %%DATADIR%%/from/_UTF-8
 %%DATADIR%%/from/_UTF-8.man
 %%DATADIR%%/from/_UTF-8.so
+%%DATADIR%%/from/alias
 %%DATADIR%%/inter/ALIAS-FROM
 %%DATADIR%%/inter/ALIAS-FROM.so
 %%DATADIR%%/inter/ALIAS-INTER
@@ -83,15 +81,15 @@ lib/libbsdconv.so.11
 %%DATADIR%%/inter/KANA-PHONETIC
 %%DATADIR%%/inter/LOWER
 %%DATADIR%%/inter/MAC
-%%DATADIR%%/inter/NOBOM
 %%DATADIR%%/inter/NL2BR
+%%DATADIR%%/inter/NOBOM
 %%DATADIR%%/inter/PASS
 %%DATADIR%%/inter/PASS.man
 %%DATADIR%%/inter/PASS.so
 %%DATADIR%%/inter/SCORE
-%%DATADIR%%/inter/SCORE.so
 %%DATADIR%%/inter/SCORE-TRAIN
 %%DATADIR%%/inter/SCORE-TRAIN.so
+%%DATADIR%%/inter/SCORE.so
 %%DATADIR%%/inter/TRIM-WIDTH
 %%DATADIR%%/inter/TRIM-WIDTH.so
 %%DATADIR%%/inter/UNIX
@@ -105,29 +103,31 @@ lib/libbsdconv.so.11
 %%DATADIR%%/inter/WIDTH.man
 %%DATADIR%%/inter/WIDTH.so
 %%DATADIR%%/inter/WIN
+%%DATADIR%%/inter/ZH-FUZZY-CN
+%%DATADIR%%/inter/ZH-FUZZY-TW
 %%DATADIR%%/inter/ZH-STRINGS
 %%DATADIR%%/inter/ZH-STRINGS.man
 %%DATADIR%%/inter/ZH-STRINGS.so
 %%DATADIR%%/inter/ZHCN
 %%DATADIR%%/inter/ZHTW
 %%DATADIR%%/inter/ZHTW-WORDS
-%%DATADIR%%/inter/ZH-FUZZY-TW
-%%DATADIR%%/inter/ZH-FUZZY-CN
-%%DATADIR%%/inter/_NFC
-%%DATADIR%%/inter/_NFC.so
-%%DATADIR%%/inter/_NFC-MAP
-%%DATADIR%%/inter/_NFD
-%%DATADIR%%/inter/_NFKD
 %%DATADIR%%/inter/_NF-HANGUL-COMPOSITION
 %%DATADIR%%/inter/_NF-HANGUL-COMPOSITION.so
 %%DATADIR%%/inter/_NF-HANGUL-DECOMPOSITION
 %%DATADIR%%/inter/_NF-HANGUL-DECOMPOSITION.so
 %%DATADIR%%/inter/_NF-ORDER
 %%DATADIR%%/inter/_NF-ORDER.so
+%%DATADIR%%/inter/_NFC
+%%DATADIR%%/inter/_NFC-MAP
+%%DATADIR%%/inter/_NFC.so
+%%DATADIR%%/inter/_NFD
+%%DATADIR%%/inter/_NFKD
+%%DATADIR%%/inter/alias
 %%DATADIR%%/to/00
 %%DATADIR%%/to/ANY
 %%DATADIR%%/to/ANY.man
 %%DATADIR%%/to/ANY.so
+%%DATADIR%%/to/ASCII
 %%DATADIR%%/to/ASCII-HTML-CNS11643-IMG
 %%DATADIR%%/to/ASCII-HTML-CNS11643-IMG.so
 %%DATADIR%%/to/ASCII-HTML-INFO
@@ -135,35 +135,21 @@ lib/libbsdconv.so.11
 %%DATADIR%%/to/ASCII-HTML-UNICODE-IMG
 %%DATADIR%%/to/ASCII-HTML-UNICODE-IMG.so
 %%DATADIR%%/to/ASCII-NAMED-HTML-ENTITY
-%%DATADIR%%/to/ASCII
 %%DATADIR%%/to/BIG5-5C
 %%DATADIR%%/to/BSDCONV
-%%DATADIR%%/to/BSDCONV.so
 %%DATADIR%%/to/BSDCONV-KEYWORD
 %%DATADIR%%/to/BSDCONV-KEYWORD.man
 %%DATADIR%%/to/BSDCONV-LOG
 %%DATADIR%%/to/BSDCONV-LOG.so
 %%DATADIR%%/to/BSDCONV-STDOUT
 %%DATADIR%%/to/BSDCONV-STDOUT.so
+%%DATADIR%%/to/BSDCONV.so
 %%DATADIR%%/to/BYTE
-%%DATADIR%%/to/_CP1251
-%%DATADIR%%/to/_CP1252
-%%DATADIR%%/to/_CP1253
-%%DATADIR%%/to/_CP874
-%%DATADIR%%/to/_CP936
 %%DATADIR%%/to/CP936-TRANS
-%%DATADIR%%/to/_CP949
-%%DATADIR%%/to/_CP950
 %%DATADIR%%/to/CP950-TRANS
 %%DATADIR%%/to/ESCAPE
 %%DATADIR%%/to/ESCAPE.man
 %%DATADIR%%/to/ESCAPE.so
-%%DATADIR%%/to/_GB18030
-%%DATADIR%%/to/_GB18030.so
-%%DATADIR%%/to/_GBK
-%%DATADIR%%/to/_ISO-8859-1
-%%DATADIR%%/to/_JIS0212
-%%DATADIR%%/to/_SHIFT-JIS
 %%DATADIR%%/to/NULL
 %%DATADIR%%/to/NULL.so
 %%DATADIR%%/to/PASS
@@ -172,7 +158,6 @@ lib/libbsdconv.so.11
 %%DATADIR%%/to/RAW
 %%DATADIR%%/to/RAW.man
 %%DATADIR%%/to/RAW.so
-%%DATADIR%%/to/_UAO250
 %%DATADIR%%/to/UCS-2BE
 %%DATADIR%%/to/UCS-2BE.so
 %%DATADIR%%/to/UCS-2LE
@@ -185,8 +170,23 @@ lib/libbsdconv.so.11
 %%DATADIR%%/to/UTF-32BE.so
 %%DATADIR%%/to/UTF-32LE
 %%DATADIR%%/to/UTF-32LE.so
+%%DATADIR%%/to/_CP1251
+%%DATADIR%%/to/_CP1252
+%%DATADIR%%/to/_CP1253
+%%DATADIR%%/to/_CP874
+%%DATADIR%%/to/_CP936
+%%DATADIR%%/to/_CP949
+%%DATADIR%%/to/_CP950
+%%DATADIR%%/to/_GB18030
+%%DATADIR%%/to/_GB18030.so
+%%DATADIR%%/to/_GBK
+%%DATADIR%%/to/_ISO-8859-1
+%%DATADIR%%/to/_JIS0212
+%%DATADIR%%/to/_SHIFT-JIS
+%%DATADIR%%/to/_UAO250
 %%DATADIR%%/to/_UTF-8
 %%DATADIR%%/to/_UTF-8.so
+%%DATADIR%%/to/alias
 %%CHINESE%%%%DATADIR%%/from/CCCII
 %%CHINESE%%%%DATADIR%%/from/_CNS11643
 %%CHINESE%%%%DATADIR%%/from/_CNS11643.so