Support staging.

Approved by:	portmgr@

7 files changed, 56 insertions, 5 deletions

diff --git a/chinese/libtabe/Makefile b/chinese/libtabe/Makefile
index b6e49800a14b..af22759d615b 100644
--- a/chinese/libtabe/Makefile
+++ b/chinese/libtabe/Makefile
@@ -26,7 +26,6 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--enable-shared
 MAKE_JOBS_UNSAFE=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_X11)
@@ -56,14 +55,14 @@ post-patch:
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/tsi-src/README ${DOCSDIR}/README.tsi
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/tsi-src/README ${STAGEDIR}${DOCSDIR}/README.tsi
 .if !defined(WITHOUT_X11)
-	${INSTALL_DATA} ${WRKSRC}/src/supports/bims/README ${DOCSDIR}/README.bims
+	${INSTALL_DATA} ${WRKSRC}/src/supports/bims/README ${STAGEDIR}${DOCSDIR}/README.bims
 .endif
 .for DOC in BoPoMoFo.shtml Changes Changes.pre-0.1 TODO ZuYinCode.txt \
 		et26.txt libtabe.sgml
-	${INSTALL_DATA} ${WRKSRC}/doc/${DOC} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/${DOC} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif
 
diff --git a/chinese/libtabe/files/patch-src__Makefile.in b/chinese/libtabe/files/patch-src__Makefile.in
new file mode 100644
index 000000000000..cbfbbe495c3b
--- /dev/null
+++ b/chinese/libtabe/files/patch-src__Makefile.in
@@ -0,0 +1,16 @@
+--- ./src/Makefile.in.orig	2014-05-19 15:26:42.836106845 +0800
++++ ./src/Makefile.in	2014-05-19 15:27:25.010111107 +0800
+@@ -98,9 +98,9 @@
+ 	for i in @build_supports@; do cd supports/$$i; $(MAKE) distclean; done
+ 
+ install: all
+-	if [ ! -d $(libdir) ]; then $(INSTALL) -d $(libdir); fi
+-	if [ ! -d $(includedir) ]; then $(INSTALL) -d $(includedir); fi
+-	$(LIBTOOL) --mode=install $(INSTALL_DATA) $(LIBNAME) $(libdir)
+-	$(INSTALL_DATA) $(INCLUDES) $(includedir)
++	if [ ! -d $(DESTDIR)$(libdir) ]; then $(INSTALL) -d $(DESTDIR)$(libdir); fi
++	if [ ! -d $(DESTDIR)$(includedir) ]; then $(INSTALL) -d $(DESTDIR)$(includedir); fi
++	$(LIBTOOL) --mode=install $(INSTALL_DATA) $(LIBNAME) $(DESTDIR)$(libdir)
++	$(INSTALL_DATA) $(INCLUDES) $(DESTDIR)$(includedir)
+ 	for i in @build_supports@; do cd supports/$$i; $(MAKE) install; done
+ 
diff --git a/chinese/libtabe/files/patch-src::tabe_tsidbint.c b/chinese/libtabe/files/patch-src__tabe_tsidbint.c
index 59fc267ca9e3..59fc267ca9e3 100644
--- a/chinese/libtabe/files/patch-src::tabe_tsidbint.c
+++ b/chinese/libtabe/files/patch-src__tabe_tsidbint.c
diff --git a/chinese/libtabe/files/patch-src::tabe_tsiyindbint.c b/chinese/libtabe/files/patch-src__tabe_tsiyindbint.c
index 7cebbc6deb47..7cebbc6deb47 100644
--- a/chinese/libtabe/files/patch-src::tabe_tsiyindbint.c
+++ b/chinese/libtabe/files/patch-src__tabe_tsiyindbint.c
diff --git a/chinese/libtabe/files/patch-tsi-src__Makefile.in b/chinese/libtabe/files/patch-tsi-src__Makefile.in
new file mode 100644
index 000000000000..8deef3e6ed89
--- /dev/null
+++ b/chinese/libtabe/files/patch-tsi-src__Makefile.in
@@ -0,0 +1,13 @@
+--- ./tsi-src/Makefile.in.orig	2014-05-19 15:30:26.484091387 +0800
++++ ./tsi-src/Makefile.in	2014-05-19 15:30:43.205088750 +0800
+@@ -57,7 +57,7 @@
+ 	$(RM) Makefile
+ 
+ install: all
+-	if [ ! -d $(datadir) ]; then $(INSTALL) -d $(datadir); fi
+-	$(INSTALL_DATA) $(TSIDB) $(datadir)
+-	$(INSTALL_DATA) $(YINDB) $(datadir)
++	if [ ! -d $(DESTDIR)$(datadir) ]; then $(INSTALL) -d $(DESTDIR)$(datadir); fi
++	$(INSTALL_DATA) $(TSIDB) $(DESTDIR)$(datadir)
++	$(INSTALL_DATA) $(YINDB) $(DESTDIR)$(datadir)
+ 
diff --git a/chinese/libtabe/files/patch-util__Makefile.in b/chinese/libtabe/files/patch-util__Makefile.in
new file mode 100644
index 000000000000..809eaa610e11
--- /dev/null
+++ b/chinese/libtabe/files/patch-util__Makefile.in
@@ -0,0 +1,23 @@
+--- ./util/Makefile.in.orig	2014-05-19 15:29:43.541103099 +0800
++++ ./util/Makefile.in	2014-05-19 15:30:16.727090377 +0800
+@@ -87,13 +87,13 @@
+ 
+ .PHONY: install clean distclean
+ install: $(DUMP) $(DEL) $(ADD) $(CHK) $(TY) $(GUESS)
+-	if [ ! -d $(bindir) ]; then $(INSTALL) -d $(bindir); fi
+-	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(DUMP) $(bindir)
+-	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(DEL) $(bindir)
+-	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(ADD) $(bindir)
+-	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(CHK) $(bindir)
+-	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(TY) $(bindir)
+-	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(GUESS) $(bindir)
++	if [ ! -d $(DESTDIR)$(bindir) ]; then $(INSTALL) -d $(DESTDIR)$(bindir); fi
++	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(DUMP) $(DESTDIR)$(bindir)
++	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(DEL) $(DESTDIR)$(bindir)
++	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(ADD) $(DESTDIR)$(bindir)
++	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(CHK) $(DESTDIR)$(bindir)
++	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(TY) $(DESTDIR)$(bindir)
++	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(GUESS) $(DESTDIR)$(bindir)
+ 
+ clean:
+ 	$(RM) $(DUMP) $(DUMPOBJ) $(DEL) $(DELOBJ) $(ADD) $(ADDOBJ) \
diff --git a/chinese/libtabe/files/patch-util-tsipackdb.in b/chinese/libtabe/files/patch-util__tsipackdb.in
index b2a574cfb057..b2a574cfb057 100644
--- a/chinese/libtabe/files/patch-util-tsipackdb.in
+++ b/chinese/libtabe/files/patch-util__tsipackdb.in