Date: Sun, 13 Aug 2006 02:57:43 +0800 (CST) From: Gea-Suan Lin <gslin@gslin.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: gslin@gslin.org Subject: ports/101935: [PATCH] chinese/vflib: Respect DESTDIR, USE_LDCONFIG Message-ID: <20060812185743.E17E9116@netnews.NCTU.edu.tw> Resent-Message-ID: <200608121900.k7CJ0b1h046280@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 101935
>Category: ports
>Synopsis: [PATCH] chinese/vflib: Respect DESTDIR, USE_LDCONFIG
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Aug 12 19:00:37 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Gea-Suan Lin
>Release: FreeBSD 6.1-RELEASE i386
>Organization:
>Environment:
System: FreeBSD netnews.NCTU.edu.tw 6.1-RELEASE FreeBSD 6.1-RELEASE #0: Sat May 13 03:43:48 CST 2006
>Description:
- Respect DESTDIR
- Use USE_LDCONFIG
- Specify and use DATADIR
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- vflib-2.25.1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/chinese/vflib/Makefile /home/staff/gslin/work/ports/vflib/Makefile
--- /usr/ports/chinese/vflib/Makefile Thu May 4 07:38:33 2006
+++ /home/staff/gslin/work/ports/vflib/Makefile Sun Aug 13 02:54:53 2006
@@ -26,13 +26,14 @@
VFLIB_VERSION= 2.25.1
PLIST_SUB= VFLIB_VERSION=${VFLIB_VERSION}
+DATADIR= ${TARGETDIR}/share/VFlib
GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --with-freetype \
+ --with-freetype-includedir=${LOCALBASE}/include/freetype1/freetype \
+ --with-freetype-libdir=${LOCALBASE}/lib
USE_FREETYPE= yes
+USE_LDCONFIG= yes
USE_XLIB= yes
-INSTALLS_SHLIB= yes
-CONFIGURE_ARGS= --with-freetype \
- --with-freetype-includedir=${PREFIX}/include/freetype1/freetype \
- --with-freetype-libdir=${PREFIX}/lib
.include <bsd.port.pre.mk>
@@ -44,13 +45,13 @@
pre-install:
@(cd ${WRKSRC}/tools; \
- ${INSTALL_SCRIPT} fmtest disol kban vfperf vftest ${PREFIX}/bin)
+ ${INSTALL_SCRIPT} fmtest disol kban vfperf vftest ${TARGETDIR}/bin)
@(cd ${WRKSRC}; \
- ${MKDIR} ${PREFIX}/share/VFlib/${VFLIB_VERSION} ;\
- ${CP} COPYING COPYING.LIB README.txt.JP_EUC \
- ${PREFIX}/share/VFlib/${VFLIB_VERSION})
+ ${MKDIR} ${DATADIR}/${VFLIB_VERSION} ;\
+ ${CP} COPYING COPYING.LIB README.txt.JP_EUC \
+ ${DATADIR}/${VFLIB_VERSION})
post-install:
- ${MV} ${PREFIX}/share/VFlib/${VFLIB_VERSION}/VF.h ${PREFIX}/include
+ ${MV} ${DATADIR}/${VFLIB_VERSION}/VF.h ${TARGETDIR}/include
.include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/chinese/vflib/pkg-plist /home/staff/gslin/work/ports/vflib/pkg-plist
--- /usr/ports/chinese/vflib/pkg-plist Mon Dec 11 17:47:22 2000
+++ /home/staff/gslin/work/ports/vflib/pkg-plist Sun Aug 13 02:54:19 2006
@@ -1,3 +1,16 @@
+@comment $FreeBSD$
+%%DATADIR%%/%%VFLIB_VERSION%%/COPYING
+%%DATADIR%%/%%VFLIB_VERSION%%/COPYING.LIB
+%%DATADIR%%/%%VFLIB_VERSION%%/QA-english.tex
+%%DATADIR%%/%%VFLIB_VERSION%%/QA.txt
+%%DATADIR%%/%%VFLIB_VERSION%%/README.txt.JP_EUC
+%%DATADIR%%/%%VFLIB_VERSION%%/man.dvi
+%%DATADIR%%/%%VFLIB_VERSION%%/man.ps
+%%DATADIR%%/%%VFLIB_VERSION%%/vfontcap
+%%DATADIR%%/%%VFLIB_VERSION%%/vfontcap.ORG
+%%DATADIR%%/%%VFLIB_VERSION%%/vfontcap.bdf
+%%DATADIR%%/%%VFLIB_VERSION%%/vfontcap.comp2
+%%DATADIR%%/%%VFLIB_VERSION%%/vfontcap.mgp
bin/VFlib2-config
bin/bdfindex
bin/disol
@@ -10,20 +23,8 @@
bin/vftest
include/VF.h
lib/libVFlib2.so.24.1
+lib/libVFlib2.la
@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
-share/VFlib/%%VFLIB_VERSION%%/vfontcap.mgp
-share/VFlib/%%VFLIB_VERSION%%/vfontcap.comp2
-share/VFlib/%%VFLIB_VERSION%%/vfontcap.bdf
-share/VFlib/%%VFLIB_VERSION%%/vfontcap.ORG
-share/VFlib/%%VFLIB_VERSION%%/vfontcap
-share/VFlib/%%VFLIB_VERSION%%/QA.txt
-share/VFlib/%%VFLIB_VERSION%%/QA-english.tex
-share/VFlib/%%VFLIB_VERSION%%/man.ps
-share/VFlib/%%VFLIB_VERSION%%/man.dvi
-@dirrm share/VFlib/%%VFLIB_VERSION%%
-@dirrm share/VFlib
+@dirrm %%DATADIR%%/%%VFLIB_VERSION%%
+@dirrm %%DATADIR%%
--- vflib-2.25.1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060812185743.E17E9116>