pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/xfstt Set proper dependencies. This now builds for...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/e4adcd59a819
branches:  trunk
changeset: 546408:e4adcd59a819
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Sun Aug 31 07:35:09 2008 +0000

description:
Set proper dependencies. This now builds for xorg as well as xfree.
I'm not entirely clear on whether it's expected to be useful with
xorg, but that's a different story...
PKGREVISION++

While here, add destdir support.

diffstat:

 x11/xfstt/Makefile |  32 ++++++++++++++++++--------------
 1 files changed, 18 insertions(+), 14 deletions(-)

diffs (62 lines):

diff -r fe305c0c12d1 -r e4adcd59a819 x11/xfstt/Makefile
--- a/x11/xfstt/Makefile        Sun Aug 31 06:53:00 2008 +0000
+++ b/x11/xfstt/Makefile        Sun Aug 31 07:35:09 2008 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2007/01/07 09:14:16 rillig Exp $
+# $NetBSD: Makefile,v 1.31 2008/08/31 07:35:09 dholland Exp $
 #
 
 DISTNAME=              xfstt-1.6
-PKGREVISION=           4
+PKGREVISION=           5
 CATEGORIES=            x11 net fonts
 MASTER_SITES=          http://download.berlios.de/xfstt/
 
@@ -10,6 +10,8 @@
 HOMEPAGE=              http://developer.berlios.de/projects/xfstt/
 COMMENT=               TrueType font server for X11
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 USE_LANGUAGES=         c c++
 USE_X11BASE=           YES
 USE_TOOLS+=            gmake
@@ -23,24 +25,26 @@
 RCD_SCRIPTS=           xfstt
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 
-.include "../../mk/x11.buildlink3.mk"
-
 SUBST_CLASSES+=                paths
 SUBST_FILES.paths=     doc/FAQ doc/xfstt.1x
 SUBST_SED.paths=       -e 's,@PREFIX@,${PREFIX},g'
 SUBST_STAGE.paths=     post-patch
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/src/xfstt ${PREFIX}/bin
-       ${INSTALL_MAN} ${WRKSRC}/doc/xfstt.1x ${PREFIX}/${PKGMANDIR}/man1/xfstt.1
-       ${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/fonts/TTF
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xfstt
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/xfstt
-       cd ${WRKSRC} && (                               \
-       ${INSTALL_DATA} doc/FAQ CHANGES TODO THANKS     \
-               ${PREFIX}/share/doc/xfstt/ ;            \
-       ${INSTALL_DATA} doc/examples/font.properties    \
-                ${PREFIX}/share/examples/xfstt/        \
+       ${INSTALL_PROGRAM} ${WRKSRC}/src/xfstt ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_MAN} ${WRKSRC}/doc/xfstt.1x \
+               ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/xfstt.1
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/X11/fonts/TTF
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/xfstt
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/xfstt
+       cd ${WRKSRC} && (                                       \
+           ${INSTALL_DATA} doc/FAQ CHANGES TODO THANKS         \
+               ${DESTDIR}${PREFIX}/share/doc/xfstt/ ;          \
+           ${INSTALL_DATA} doc/examples/font.properties        \
+                ${DESTDIR}${PREFIX}/share/examples/xfstt/      \
        )
 
+.include "../../x11/fontsproto/buildlink3.mk"
+.include "../../x11/xproto/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index