pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc DESTDIR support.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b82cfbe14956
branches:  trunk
changeset: 520940:b82cfbe14956
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Nov 03 07:12:24 2006 +0000

description:
DESTDIR support.

diffstat:

 chat/irssi-icb/Makefile    |   8 ++++++--
 chat/irssi/Makefile        |   8 +++++---
 devel/autoconf/Makefile    |   3 ++-
 fonts/fontconfig/Makefile  |   3 ++-
 fonts/gentium-ttf/Makefile |  15 +++++++++------
 5 files changed, 24 insertions(+), 13 deletions(-)

diffs (134 lines):

diff -r e515453afdc1 -r b82cfbe14956 chat/irssi-icb/Makefile
--- a/chat/irssi-icb/Makefile   Fri Nov 03 07:09:45 2006 +0000
+++ b/chat/irssi-icb/Makefile   Fri Nov 03 07:12:24 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/07/07 15:49:31 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2006/11/03 07:12:25 joerg Exp $
 #
 
 DISTNAME=      irssi-icb-0.14
@@ -11,6 +11,8 @@
 HOMEPAGE=      http://www.irssi.org/
 COMMENT=       Irssi plugin to access ICB networks
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 .include "../../chat/irssi/Makefile.common"
 
 WRKSRC=                ${WRKDIR}/${IRSSI_DISTNAME}/${DISTNAME}
@@ -24,6 +26,8 @@
 
 CONFIGURE_ARGS+=       --with-irssi=${WRKDIR}/${IRSSI_DISTNAME}
 
+INSTALLATION_DIRS+=    share/doc/irssi
+
 post-extract:
        cd ${WRKDIR} && ${LN} -s ${IRSSI_DISTNAME:S/a//} ${IRSSI_DISTNAME}
        ${MV} ${WRKDIR}/${DISTNAME} ${WRKDIR}/${IRSSI_DISTNAME}
@@ -31,7 +35,7 @@
        ${CP} ${IRSSI_CONFIG} ${WRKDIR}/${IRSSI_DISTNAME}/irssi-config
 
 post-install:
-       ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/irssi/README.icb
+       ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/irssi/README.icb
 
 .include "../../devel/glib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r e515453afdc1 -r b82cfbe14956 chat/irssi/Makefile
--- a/chat/irssi/Makefile       Fri Nov 03 07:09:45 2006 +0000
+++ b/chat/irssi/Makefile       Fri Nov 03 07:12:24 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2006/03/04 06:34:13 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2006/11/03 07:12:24 joerg Exp $
 
 DISTNAME=              ${IRSSI_DISTNAME}
 CATEGORIES=            chat
@@ -9,6 +9,8 @@
 HOMEPAGE=              http://www.irssi.org/
 COMMENT=                Secure and modular IRC client with text mode user interface
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 .include "Makefile.common"
 
 GNU_CONFIGURE=         yes
@@ -31,7 +33,7 @@
 .include "../../devel/glib2/buildlink3.mk"
 
 post-install:
-       ${INSTALL_DATA} ${WRKSRC}/config.h ${IRSSI_CONFIG_H}
-       ${INSTALL_DATA} ${WRKSRC}/irssi-config ${IRSSI_CONFIG}
+       ${INSTALL_DATA} ${WRKSRC}/config.h ${DESTDIR}${IRSSI_CONFIG_H}
+       ${INSTALL_DATA} ${WRKSRC}/irssi-config ${DESTDIR}${IRSSI_CONFIG}
 
 .include "../../mk/bsd.pkg.mk"
diff -r e515453afdc1 -r b82cfbe14956 devel/autoconf/Makefile
--- a/devel/autoconf/Makefile   Fri Nov 03 07:09:45 2006 +0000
+++ b/devel/autoconf/Makefile   Fri Nov 03 07:12:24 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2006/10/08 23:02:30 ben Exp $
+# $NetBSD: Makefile,v 1.63 2006/11/03 07:12:51 joerg Exp $
 
 DISTNAME=              autoconf-2.60
 CATEGORIES=            devel
@@ -16,6 +16,7 @@
 CONFLICTS=             autoconf-devel-[0-9]*
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 USE_LANGUAGES=         # empty
 GNU_CONFIGURE=         YES
diff -r e515453afdc1 -r b82cfbe14956 fonts/fontconfig/Makefile
--- a/fonts/fontconfig/Makefile Fri Nov 03 07:09:45 2006 +0000
+++ b/fonts/fontconfig/Makefile Fri Nov 03 07:12:24 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2006/10/03 18:16:13 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2006/11/03 07:13:31 joerg Exp $
 
 DISTNAME=      fontconfig-2.4.1
 CATEGORIES=    fonts
@@ -9,6 +9,7 @@
 COMMENT=       Library for configuring and customizing font access
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 GNU_CONFIGURE=         YES
 USE_LIBTOOL=           YES
diff -r e515453afdc1 -r b82cfbe14956 fonts/gentium-ttf/Makefile
--- a/fonts/gentium-ttf/Makefile        Fri Nov 03 07:09:45 2006 +0000
+++ b/fonts/gentium-ttf/Makefile        Fri Nov 03 07:12:24 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/05/26 21:12:59 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2006/11/03 07:13:31 joerg Exp $
 #
 
 DISTNAME=      Gentium_102_W
@@ -12,6 +12,8 @@
 HOMEPAGE=      http://scripts.sil.org/
 COMMENT=       Free TrueType fonts from Bitstream, useful for web viewing
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 MASTER_SITES=  ${MASTER_SITE_LOCAL}
 
 NO_CONFIGURE=  YES
@@ -19,11 +21,12 @@
 
 FONTS_DIRS.ttf+=       ${PREFIX}/lib/X11/fonts/TTF
 
+INSTALLATION_DIRS=     lib/X11/fonts/TTF
+
 do-install:
-       ${INSTALL_DATA_DIR} ${FONTS_DIRS.ttf}
-       ${INSTALL_DATA} ${WRKSRC}/GenAI102.TTF ${FONTS_DIRS.ttf}/genai102.ttf
-       ${INSTALL_DATA} ${WRKSRC}/GenAR102.TTF ${FONTS_DIRS.ttf}/genar102.ttf
-       ${INSTALL_DATA} ${WRKSRC}/GenI102.TTF ${FONTS_DIRS.ttf}/geni102.ttf
-       ${INSTALL_DATA} ${WRKSRC}/GenR102.TTF ${FONTS_DIRS.ttf}/genr102.ttf
+       ${INSTALL_DATA} ${WRKSRC}/GenAI102.TTF ${DESTDIR}${FONTS_DIRS.ttf}/genai102.ttf
+       ${INSTALL_DATA} ${WRKSRC}/GenAR102.TTF ${DESTDIR}${FONTS_DIRS.ttf}/genar102.ttf
+       ${INSTALL_DATA} ${WRKSRC}/GenI102.TTF ${DESTDIR}${FONTS_DIRS.ttf}/geni102.ttf
+       ${INSTALL_DATA} ${WRKSRC}/GenR102.TTF ${DESTDIR}${FONTS_DIRS.ttf}/genr102.ttf
 
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index