svn commit: r354503 - in head/chinese/libtabe: . files

Vanilla I. Shu vanilla at FreeBSD.org
Mon May 19 07:38:36 UTC 2014 

Author: vanilla
Date: Mon May 19 07:38:34 2014
New Revision: 354503
URL: http://svnweb.freebsd.org/changeset/ports/354503
QAT: https://qat.redports.org/buildarchive/r354503/

Log:
  Support staging.
  
  Approved by:	portmgr@

Added:
  head/chinese/libtabe/files/patch-src__Makefile.in   (contents, props changed)
  head/chinese/libtabe/files/patch-src__tabe_tsidbint.c
     - copied unchanged from r354502, head/chinese/libtabe/files/patch-src::tabe_tsidbint.c
  head/chinese/libtabe/files/patch-src__tabe_tsiyindbint.c
     - copied unchanged from r354502, head/chinese/libtabe/files/patch-src::tabe_tsiyindbint.c
  head/chinese/libtabe/files/patch-tsi-src__Makefile.in   (contents, props changed)
  head/chinese/libtabe/files/patch-util__Makefile.in   (contents, props changed)
  head/chinese/libtabe/files/patch-util__tsipackdb.in
     - copied unchanged from r354502, head/chinese/libtabe/files/patch-util-tsipackdb.in
Deleted:
  head/chinese/libtabe/files/patch-src::tabe_tsidbint.c
  head/chinese/libtabe/files/patch-src::tabe_tsiyindbint.c
  head/chinese/libtabe/files/patch-util-tsipackdb.in
Modified:
  head/chinese/libtabe/Makefile

Modified: head/chinese/libtabe/Makefile
==============================================================================
--- head/chinese/libtabe/Makefile	Mon May 19 07:18:19 2014	(r354502)
+++ head/chinese/libtabe/Makefile	Mon May 19 07:38:34 2014	(r354503)
@@ -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
 

Added: head/chinese/libtabe/files/patch-src__Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/chinese/libtabe/files/patch-src__Makefile.in	Mon May 19 07:38:34 2014	(r354503)
@@ -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
+ 

Copied: head/chinese/libtabe/files/patch-src__tabe_tsidbint.c (from r354502, head/chinese/libtabe/files/patch-src::tabe_tsidbint.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/chinese/libtabe/files/patch-src__tabe_tsidbint.c	Mon May 19 07:38:34 2014	(r354503, copy of r354502, head/chinese/libtabe/files/patch-src::tabe_tsidbint.c)
@@ -0,0 +1,13 @@
+--- src/tabe_tsidbint.c.orig	Fri Apr 21 23:04:10 2006
++++ src/tabe_tsidbint.c	Fri Apr 21 23:04:33 2006
+@@ -272,7 +272,9 @@
+   switch(tsidb->type) {
+   case DB_TYPE_DB:
+     dbp = (DB *)tsidb->dbp;
+-#if DB_VERSION >= 303011
++#if DB_VERSION >= 403000
++errno = dbp->stat(dbp, NULL, &sp, 0);
++#elif DB_VERSION >= 303011
+     errno = dbp->stat(dbp, &sp, 0);
+ #else
+     errno = dbp->stat(dbp, &sp, NULL, 0);

Copied: head/chinese/libtabe/files/patch-src__tabe_tsiyindbint.c (from r354502, head/chinese/libtabe/files/patch-src::tabe_tsiyindbint.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/chinese/libtabe/files/patch-src__tabe_tsiyindbint.c	Mon May 19 07:38:34 2014	(r354503, copy of r354502, head/chinese/libtabe/files/patch-src::tabe_tsiyindbint.c)
@@ -0,0 +1,13 @@
+--- src/tabe_tsiyindbint.c.orig	Fri Apr 21 23:04:40 2006
++++ src/tabe_tsiyindbint.c	Fri Apr 21 23:04:55 2006
+@@ -275,7 +275,9 @@
+   switch(tsiyindb->type) {
+   case DB_TYPE_DB:
+     dbp = (DB *)tsiyindb->dbp;
+-#if DB_VERSION >= 303011
++#if DB_VERSION >= 403000
++errno = dbp->stat(dbp, NULL, &sp, 0);
++#elif DB_VERSION >= 303011
+     errno = dbp->stat(dbp, &sp, 0);
+ #else
+     errno = dbp->stat(dbp, &sp, NULL, 0);

Added: head/chinese/libtabe/files/patch-tsi-src__Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/chinese/libtabe/files/patch-tsi-src__Makefile.in	Mon May 19 07:38:34 2014	(r354503)
@@ -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)
+ 

Added: head/chinese/libtabe/files/patch-util__Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/chinese/libtabe/files/patch-util__Makefile.in	Mon May 19 07:38:34 2014	(r354503)
@@ -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) \

Copied: head/chinese/libtabe/files/patch-util__tsipackdb.in (from r354502, head/chinese/libtabe/files/patch-util-tsipackdb.in)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/chinese/libtabe/files/patch-util__tsipackdb.in	Mon May 19 07:38:34 2014	(r354503, copy of r354502, head/chinese/libtabe/files/patch-util-tsipackdb.in)
@@ -0,0 +1,45 @@
+--- util/tsipackdb.in.orig	Sun Sep 19 22:25:51 2004
++++ util/tsipackdb.in	Fri Apr 21 23:31:23 2006
+@@ -26,14 +26,26 @@
+ }
+ 
+ pack_db_file () {
+-    db_dump=`mywhich ${1}_dump`
+-    db_load=`mywhich ${1}_load`
++    case "${1}" in
++    db|db3|db4|db41) 
++        db_dump=`mywhich ${1}_dump`
++        db_load=`mywhich ${1}_load`
++        ;;
++    db-4.[234])
++        db_name=${1#db-}
++        db_dump=`mywhich db_dump-${db_name}`
++        db_load=`mywhich db_load-${db_name}`
++        ;;
++    *)
++        echo "unsupportted Berkyley version: ${1}"
++        return 1
++    esac
+     if [ -x "$db_dump" ] && [ -x "$db_load" ]; then
+ 
+ 	echo "Try using $db_dump and $db_load to pack $2 ...."
+ 
+-	${1}_dump $2 > $2.tmp && \
+-	${1}_load $2.new < $2.tmp && \
++	$db_dump $2 > $2.tmp && \
++	$db_load $2.new < $2.tmp && \
+ 	mv $2.new $2 && \
+ 	return 0
+ 
+@@ -42,9 +54,9 @@
+     return 1
+ }
+ 
+-for dbprefix in db db2 db3 db4
++for dbname in @with_db_name@ db db2 db3 db4
+ do
+-    pack_db_file $dbprefix $1 && exit 0
++    pack_db_file $dbname $1 && exit 0
+ done
+ 
+ exit 0

More information about the svn-ports-head mailing list