Attachment 21095 Details for Bug 37040 – file.diff

[patch] file.diff

file.diff (text/plain), 5.09 KB, created by kcwu on 2002-04-13 16:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: kcwu

Created: 2002-04-13 16:40:01 UTC

Size: 5.09 KB

patch

obsolete

>diff -urN libtabe.old/Makefile libtabe/Makefile
>--- libtabe.old/Makefile	Sat Apr 13 22:36:23 2002
>+++ libtabe/Makefile	Sat Apr 13 23:25:26 2002
>@@ -6,38 +6,54 @@
> #
> 
> PORTNAME=	libtabe
>-PORTVERSION=	0.2.2
>+PORTVERSION=	0.2.5
> CATEGORIES=	chinese
> MASTER_SITES=	ftp://xcin.linux.org.tw/pub/xcin/libtabe/devel/
> 
>-MAINTAINER=	keith@FreeBSD.org
>+MAINTAINER=	kcwu@ck.tp.edu.tw
> 
>+LIB_DEPENDS=	db3.2:${PORTSDIR}/databases/db3
>+.if defined(USE_DB2)
> LIB_DEPENDS=	db2.0:${PORTSDIR}/databases/db
>+.endif
> 
> WRKSRC=		${WRKDIR}/libtabe
>-USE_XLIB=	yes
> INSTALLS_SHLIB=	yes
> HAS_CONFIGURE=	yes
> USE_GMAKE=	yes
> CONFIGURE_ARGS=	--prefix=${PREFIX} \
> 		--includedir=${PREFIX}/include/tabe \
>-		--with-dbinc=${PREFIX}/include/db2 \
>-		--with-dblib=${PREFIX}/lib \
>+		--with-db-lib=${LOCALBASE}/lib \
>+		--with-db-bin=${LOCALBASE}/bin \
> 		--enable-shared
> 
>+.if !defined(USE_DB2)
>+CONFIGURE_ARGS+= --with-db-inc=${LOCALBASE}/include/db3
>+.else
>+CONFIGURE_ARGS+= --with-db-inc=${LOCALBASE}/include/db2
>+.endif
>+
> .include <bsd.port.pre.mk>
> 
>+pre-fetch:
>+.if !defined(USE_DB2)
>+	@${ECHO} --
>+	@${ECHO} "Type \"make -DUSE_DB2\" if you want use DB2."
>+	@${ECHO} "Otherwise, xcin2.5 will use DB3."
>+	@${ECHO} --
>+.endif
>+
> post-install:
> .if !defined(NOPORTDOCS)
> 	${MKDIR} ${PREFIX}/share/doc/tabe
>-	${INSTALL_DATA} ${WRKSRC}/src/tsi-src/README ${PREFIX}/share/doc/tabe/README.tsi
>+	${INSTALL_DATA} ${WRKSRC}/tsi-src/README ${PREFIX}/share/doc/tabe/README.tsi
> 	${INSTALL_DATA} ${WRKSRC}/src/supports/bims/README ${PREFIX}/share/doc/tabe/README.bims
> .for DOC in BoPoMoFo.shtml Changes Changes.pre-0.1 TODO ZuYinCode.txt \
> 		et26.txt libtabe.sgml
> 	${INSTALL_DATA} ${WRKSRC}/doc/${DOC} ${PREFIX}/share/doc/tabe
> .endfor
> .endif
>-	${TOUCH} ${PREFIX}/share/tabe/libtabe-0.2.2
>-	${RM} -f ${PREFIX}/lib/libtabe.la ${PREFIX}/lib/libbims.la
>+	${MKDIR} ${PREFIX}/share/tabe
>+	${TOUCH} ${PREFIX}/share/tabe/libtabe-0.2.5
> 
> .include <bsd.port.post.mk>
>diff -urN libtabe.old/distinfo libtabe/distinfo
>--- libtabe.old/distinfo	Sat Apr 13 22:36:23 2002
>+++ libtabe/distinfo	Sat Apr 13 22:36:23 2002
>@@ -1 +1 @@
>-MD5 (libtabe-0.2.2.tar.gz) = 53a4eadc12fe736cdaf7b6924fca811f
>+MD5 (libtabe-0.2.5.tar.gz) = 8b03826b2858ae999b18d41099eb73c9
>diff -urN libtabe.old/files/patch-aa libtabe/files/patch-aa
>--- libtabe.old/files/patch-aa	Sat Apr 13 22:36:23 2002
>+++ libtabe/files/patch-aa	Sat Apr 13 22:36:23 2002
>@@ -1,6 +1,6 @@
>---- src/Makefile.in.orig	Thu Jun  7 00:26:26 2001
>-+++ src/Makefile.in	Sun Jun 17 09:49:05 2001
>-@@ -60,8 +60,7 @@
>+--- src/Makefile.in.orig	Wed Dec  5 13:56:10 2001
>++++ src/Makefile.in	Wed Dec  5 13:56:23 2001
>+@@ -55,8 +55,7 @@
>  
>  $(LIBNAME): $(LIBOBJS)
>  	$(LIBTOOL) --mode=link $(CC) -o $@ $(LIBOBJS) -rpath $(libdir) \
>@@ -8,22 +8,5 @@
> -		-release $(RELEASE_VER)
> +		-version-info $(CURRENT_VER):$(REVISION_VER):$(AGE_VER)
>  
>- subsys:
>+ bims:
>  	(cd supports/bims; $(MAKE))
>-@@ -110,7 +109,7 @@
>- 
>- install: install_binary install_data
>- 
>--install_binary: binary
>-+install_binary:
>- 	if [ ! -d $(libdir) ]; then $(INSTALL) -d $(libdir); fi
>- 	if [ ! -d $(includedir) ]; then $(INSTALL) -d $(includedir); fi
>- 	$(LIBTOOL) --mode=install $(INSTALL_DATA) $(LIBNAME) $(libdir)
>-@@ -118,6 +117,6 @@
>- 	(cd supports/bims; $(MAKE) install)
>- 	(cd util; $(MAKE) install)
>- 
>--install_data: data
>-+install_data:
>- 	(cd tsi-src; $(MAKE) install)
>- 
>diff -urN libtabe.old/files/patch-ab libtabe/files/patch-ab
>--- libtabe.old/files/patch-ab	Sat Apr 13 22:36:23 2002
>+++ libtabe/files/patch-ab	Sat Apr 13 22:36:23 2002
>@@ -1,5 +1,5 @@
>---- src/supports/bims/Makefile.in.orig	Thu Jun  7 00:26:26 2001
>-+++ src/supports/bims/Makefile.in	Sun Jun 17 09:48:49 2001
>+--- src/supports/bims/Makefile.in.orig	Wed Dec  5 13:56:40 2001
>++++ src/supports/bims/Makefile.in	Wed Dec  5 13:56:47 2001
> @@ -45,8 +45,7 @@
>  
>  $(LIBNAME): $(LIBOBJS)
>@@ -10,12 +10,3 @@
>  
>  bims.lo: bims.c bims.h
>  	$(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(DEFS) $(INC) -o $@ bims.c
>-@@ -59,7 +58,7 @@
>- 	if [ -d obj-s ]; then rmdir obj-s; fi
>- 	$(RM) Makefile
>- 
>--install: all
>-+install:
>- 	if [ ! -d $(libdir) ]; then $(INSTALL) -d $(libdir); fi
>- 	if [ ! -d $(includedir) ]; then $(INSTALL) -d $(includedir); fi
>- 	$(LIBTOOL) --mode=install $(INSTALL_DATA) $(LIBNAME) $(libdir)
>diff -urN libtabe.old/pkg-plist libtabe/pkg-plist
>--- libtabe.old/pkg-plist	Sat Apr 13 22:36:23 2002
>+++ libtabe/pkg-plist	Sat Apr 13 22:36:23 2002
>@@ -1,15 +1,20 @@
> bin/tsiadd
> bin/tsidel
> bin/tsidump
>+bin/tsiyincheck
> bin/tsiyindump
> include/tabe/bims.h
> include/tabe/tabe.h
> lib/libbims.a
>+lib/libbims.la
> lib/libbims.so
>-lib/libbims.so.0
>+lib/libbims.so.2
> lib/libtabe.a
>+lib/libtabe.la
> lib/libtabe.so
>-lib/libtabe.so.0
>+lib/libtabe.so.2
>+lib/tabe/tsi.db
>+lib/tabe/yin.db
> %%PORTDOCS%%share/doc/tabe/BoPoMoFo.shtml
> %%PORTDOCS%%share/doc/tabe/Changes
> %%PORTDOCS%%share/doc/tabe/Changes.pre-0.1
>@@ -19,10 +24,8 @@
> %%PORTDOCS%%share/doc/tabe/ZuYinCode.txt
> %%PORTDOCS%%share/doc/tabe/et26.txt
> %%PORTDOCS%%share/doc/tabe/libtabe.sgml
>-share/tabe/libtabe-0.2.2
>-share/tabe/tsiyin/tsi.db
>-share/tabe/tsiyin/yin.db
>+share/tabe/libtabe-0.2.5
> @dirrm include/tabe
>+@dirrm lib/tabe
> %%PORTDOCS%%@dirrm share/doc/tabe
>-@dirrm share/tabe/tsiyin
> @dirrm share/tabe

Actions: View | Diff

Attachments on bug 37040: 21095