ports/54256: japanese/vflib: fix dependency on japanese/kochi-ttfonts etc.

KOMATSU Shinichiro koma2 at jiro.c.u-tokyo.ac.jp
Wed Jul 9 13:10:16 UTC 2003 

>Number:         54256
>Category:       ports
>Synopsis:       japanese/vflib: fix dependency on japanese/kochi-ttfonts etc.
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jul 09 06:10:13 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     KOMATSU Shinichiro
>Release:        FreeBSD 4.7-RELEASE
>Organization:
>Environment:
FreeBSD 4.7-RELEASE


	
>Description:

o Files in ja-kochi-ttfonts has been renamed 
  from kochi-{mincho,gothic}.ttf to kochi-{mincho,gothic}-subst.ttf.
  So, fix RUN_DEPENDS and vfontcap.

o Use ${BSD_INSTALL_*} instead of ${CP}.

o fmtest disol kban vfperf vftest in ${WRKSRC}/tools are 
  just wrappers for libtool.
  Install true programs (in ${WRKSRC}/tools/.libs).

o Respect PORTDOCS.

o bump PORTREVISION

>How-To-Repeat:
	
>Fix:

diff -urN --exclude=CVS --exclude=*.log* vflib.orig/Makefile vflib/Makefile
--- vflib.orig/Makefile	Fri Mar  7 15:04:57 2003
+++ vflib/Makefile	Wed Jul  9 21:41:21 2003
@@ -7,7 +7,7 @@
 
 PORTNAME=	vflib
 PORTVERSION=	${VFLIB_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://gull.se.hiroshima-u.ac.jp/pub/TypeHack/
 DISTNAME=	VFlib2-${PORTVERSION}
@@ -18,7 +18,7 @@
 
 BUILD_DEPENDS=	xmkmf:${PORTSDIR}/devel/imake-4
 LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
-RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/TrueType/kochi-mincho.ttf:${PORTSDIR}/japanese/kochi-ttfonts
+RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf:${PORTSDIR}/japanese/kochi-ttfonts
 
 VFLIB_VERSION=	2.25.6
 PLIST_SUB=	VFLIB_VERSION=${VFLIB_VERSION}
@@ -32,15 +32,13 @@
 		--with-freetype-libdir=${LOCALBASE}/lib
 
 pre-install:
-	@(cd ${WRKSRC}/tools; \
-	    ${INSTALL_SCRIPT} fmtest disol kban vfperf vftest ${PREFIX}/bin)
+	${MKDIR} ${PREFIX}/share/VFlib/${VFLIB_VERSION}
+.if !defined(NOPORTDOCS)
+	@(cd ${WRKSRC}; \
+	  ${INSTALL_DATA} COPYING COPYING.LIB README.txt.JP_EUC \
+		${PREFIX}/share/VFlib/${VFLIB_VERSION})
+.endif
 	@(cd ${WRKSRC}; \
-	  ${MKDIR} ${PREFIX}/share/VFlib/${VFLIB_VERSION} ;\
-	  ${CP} COPYING COPYING.LIB README.txt.JP_EUC \
-		${PREFIX}/share/VFlib/${VFLIB_VERSION} ;\
 	  ${CP} -R jTeX ${PREFIX}/share/VFlib/${VFLIB_VERSION})
-
-post-install:
-	${MV} ${PREFIX}/share/VFlib/${VFLIB_VERSION}/VF.h ${PREFIX}/include
 
 .include <bsd.port.mk>
diff -urN --exclude=CVS --exclude=*.log* vflib.orig/files/patch-aa vflib/files/patch-aa
--- vflib.orig/files/patch-aa	Mon May  3 10:58:50 1999
+++ vflib/files/patch-aa	Wed Jul  9 21:43:32 2003
@@ -1,5 +1,5 @@
---- tools/Imakefile.in.orig	Tue Oct 27 17:02:45 1998
-+++ tools/Imakefile.in	Wed Dec 16 23:41:05 1998
+--- tools/Imakefile.in.orig	Fri Oct 19 21:17:25 2001
++++ tools/Imakefile.in	Wed Jul  9 21:43:10 2003
 @@ -19,7 +19,11 @@
   * copies. 
   */
@@ -13,3 +13,21 @@
    VFLIB_INCDIR = ../src
    VFLIB_LIBDIR = ../src
  
+@@ -28,7 +32,7 @@
+           PROGRAMS = disol    kban    ktest    vfperf    vftest    fmtest  
+               SRCS = disol.c  kban.c  ktest.c  vfperf.c  vftest.c  fmtest.c
+               OBJS = disol.lo kban.lo ktest.lo vfperf.lo vftest.lo fmtest.lo
+-  INSTALL_PROGRAMS = ktest
++  INSTALL_PROGRAMS = ${PROGRAMS}
+ 
+ default all:: $(PROGRAMS)
+ include ../make-sub
+@@ -98,7 +102,7 @@
+ 	@if [ ! -d $(bindir) ] ; then \
+ 	    ./recmkdir $(bindir); fi
+ 	@for P in $(INSTALL_PROGRAMS) ; do \
+-	    $(LIBTOOL) $(CP)  $$P $(bindir)/$$P ;  \
++	    $(LIBTOOL) $(BSD_INSTALL_PROGRAM)  $$P $(bindir)/$$P ;  \
+ 	done; 
+ uninstall::
+ 	@for P in $(INSTALL_PROGRAMS) ; do \
diff -urN --exclude=CVS --exclude=*.log* vflib.orig/files/patch-ab vflib/files/patch-ab
--- vflib.orig/files/patch-ab	Thu Jan 17 20:00:35 2002
+++ vflib/files/patch-ab	Wed Jul  9 21:11:55 2003
@@ -1,5 +1,5 @@
---- vfontcap.orig	Mon Jan 14 06:14:01 2002
-+++ vfontcap	Mon Jan 14 06:16:41 2002
+--- vfontcap.orig	Wed Jul 21 18:17:04 1999
++++ vfontcap	Wed Jul  9 21:11:30 2003
 @@ -33,9 +33,9 @@
  ####
  
@@ -23,10 +23,10 @@
 +	:fc=r-kochi-gothic:
 +r-kochi-mincho|Kochi Mincho:\
 +	:ft=freetype:\
-+	:ff=/usr/X11R6/lib/X11/fonts/TrueType/kochi-mincho.ttf:
++	:ff=/usr/X11R6/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf:
 +r-kochi-gothic|Kochi Gothic:\
 +	:ft=freetype:\
-+	:ff=/usr/X11R6/lib/X11/fonts/TrueType/kochi-gothic.ttf:
++	:ff=/usr/X11R6/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf:
  
  ### SONY VECTOR FONTS
  r-sony-mincho|Sony Vector Font (Mincho):\
diff -urN --exclude=CVS --exclude=*.log* vflib.orig/files/patch-makefile.in vflib/files/patch-makefile.in
--- vflib.orig/files/patch-makefile.in	Thu Jan  1 09:00:00 1970
+++ vflib/files/patch-makefile.in	Wed Jul  9 21:27:48 2003
@@ -0,0 +1,15 @@
+--- Makefile.in.orig	Fri Oct 19 21:01:55 2001
++++ Makefile.in	Wed Jul  9 21:26:22 2003
+@@ -31,9 +31,9 @@
+ 	    ./recmkdir $(runtimedir); fi
+ 	(cd src;   $(MAKE) $@)
+ 	(cd tools; $(MAKE) $@)
+-	$(LIBTOOL) $(CP) VFlib2-config $(bindir)
+-	$(CP) vfontcap* $(runtimedir)
+-	$(CP) doc/*.dvi doc/*.ps doc/QA* $(runtimedir)
++	$(LIBTOOL) $(BSD_INSTALL_SCRIPT) VFlib2-config $(bindir)
++	$(BSD_INSTALL_DATA) vfontcap* $(runtimedir)
++	$(BSD_INSTALL_DATA) doc/*.dvi doc/*.ps doc/QA* $(runtimedir)
+ 
+ uninstall:
+ 	-(cd src;   $(MAKE) $@)
diff -urN --exclude=CVS --exclude=*.log* vflib.orig/files/patch-src-makefile.in vflib/files/patch-src-makefile.in
--- vflib.orig/files/patch-src-makefile.in	Thu Jan  1 09:00:00 1970
+++ vflib/files/patch-src-makefile.in	Wed Jul  9 21:28:40 2003
@@ -0,0 +1,21 @@
+--- src/Makefile.in.orig	Fri Oct 19 21:16:34 2001
++++ src/Makefile.in	Wed Jul  9 21:25:42 2003
+@@ -183,13 +183,12 @@
+ 
+ # Installing
+ install:
+-	$(LIBTOOL) $(CP) $(VFLIB) $(libdir)/$(VFLIB)
++	$(LIBTOOL) $(BSD_INSTALL_DATA) $(VFLIB) $(libdir)/$(VFLIB)
+ 	$(LIBTOOL) -n --finish $(libdir)
+-	$(CP) VF.h     $(includedir)/VF.h
+-	$(CP) VF.h     $(runtimedir)/VF.h
+-	$(LIBTOOL) $(CP) ttindex  $(bindir)/ttindex
+-	$(LIBTOOL) $(CP) bdfindex $(bindir)/bdfindex
+-	$(LIBTOOL) $(CP) fwindex  $(bindir)/fwindex
++	$(BSD_INSTALL_DATA) VF.h     $(includedir)/VF.h
++	$(LIBTOOL) $(BSD_INSTALL_PROGRAM) ttindex  $(bindir)/ttindex
++	$(LIBTOOL) $(BSD_INSTALL_PROGRAM) bdfindex $(bindir)/bdfindex
++	$(LIBTOOL) $(BSD_INSTALL_PROGRAM) fwindex  $(bindir)/fwindex
+ uninstall:
+ 	-$(LIBTOOL) $(RM) $(libdir)/$(VFLIB)
+ 	-$(RM)  $(includedir)/VF.h
diff -urN --exclude=CVS --exclude=*.log* vflib.orig/pkg-plist vflib/pkg-plist
--- vflib.orig/pkg-plist	Thu Jan 17 20:00:35 2002
+++ vflib/pkg-plist	Wed Jul  9 21:38:11 2003
@@ -13,9 +13,9 @@
 @exec /bin/ln -fs %D/%F %D/lib/libVFlib2.so
 @unexec /bin/rm -f %D/lib/libVFlib2.so
 lib/libVFlib2.la
-share/VFlib/%%VFLIB_VERSION%%/README.txt.JP_EUC
-share/VFlib/%%VFLIB_VERSION%%/COPYING.LIB
-share/VFlib/%%VFLIB_VERSION%%/COPYING
+%%PORTDOCS%%share/VFlib/%%VFLIB_VERSION%%/README.txt.JP_EUC
+%%PORTDOCS%%share/VFlib/%%VFLIB_VERSION%%/COPYING.LIB
+%%PORTDOCS%%share/VFlib/%%VFLIB_VERSION%%/COPYING
 share/VFlib/%%VFLIB_VERSION%%/jTeX/jfonts/Gen
 share/VFlib/%%VFLIB_VERSION%%/jTeX/jfonts/Makefile
 share/VFlib/%%VFLIB_VERSION%%/jTeX/jfmsrc/MakeSlantTFM
>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list