pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc user-destdir support
details: https://anonhg.NetBSD.org/pkgsrc/rev/1503a0bbd5e0
branches: trunk
changeset: 561401:1503a0bbd5e0
user: joerg <joerg%pkgsrc.org@localhost>
date: Wed Jul 08 16:40:08 2009 +0000
description:
user-destdir support
diffstat:
emulators/xtrs/Makefile | 13 ++++++++-----
filesystems/fuse-gphotofs/Makefile | 6 ++++--
filesystems/fuse-pod/Makefile | 4 +++-
filesystems/fuse-wdfs/Makefile | 4 +++-
filesystems/fuse-wikipediafs/Makefile | 4 +++-
filesystems/u9fs/Makefile | 4 +++-
filesystems/u9fs/distinfo | 4 ++--
filesystems/u9fs/patches/patch-aa | 10 +++++-----
fonts/jmk-fonts/Makefile | 6 ++++--
fonts/kcfonts/Makefile | 4 +++-
fonts/kcfonts/distinfo | 4 ++--
fonts/kcfonts/patches/patch-aa | 28 ++++++++++++++++++----------
12 files changed, 58 insertions(+), 33 deletions(-)
diffs (279 lines):
diff -r 4c0e88a9e3ab -r 1503a0bbd5e0 emulators/xtrs/Makefile
--- a/emulators/xtrs/Makefile Wed Jul 08 16:38:35 2009 +0000
+++ b/emulators/xtrs/Makefile Wed Jul 08 16:40:08 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2009/05/20 00:58:15 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2009/07/08 16:46:14 joerg Exp $
#
DISTNAME= xtrs-4.9
@@ -10,6 +10,7 @@
HOMEPAGE= ${MASTER_SITES}
COMMENT= TRS-80 Model I/III/4 Emulator for Unix
+PKG_DESTDIR_SUPPORT= user-destdir
BUILD_TARGET= default
@@ -22,11 +23,13 @@
-e 's|^\(LDFLAGS = \)-L/usr/X11R6/lib|\1-Wl,-R${X11BASE}/lib -L${X11BASE}/lib|g' \
-e 's|/share/man|/man|g'
+INSTALL_MAKE_FLAGS+= BINDIR=${DESTDIR}${PREFIX}/bin \
+ MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}
+INSTALLATION_DIRS= bin lib/xtrs ${PKGMANDIR}/man1 share/doc/xtrs
+
post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/lib/xtrs
- ${INSTALL_DATA} ${WRKSRC}/xtrsrom4p.hex ${PREFIX}/lib/xtrs/romimage.m4p
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xtrs
- ${INSTALL_DATA} ${WRKSRC}/xtrsrom4p.README ${PREFIX}/share/doc/xtrs
+ ${INSTALL_DATA} ${WRKSRC}/xtrsrom4p.hex ${DESTDIR}${PREFIX}/lib/xtrs/romimage.m4p
+ ${INSTALL_DATA} ${WRKSRC}/xtrsrom4p.README ${DESTDIR}${PREFIX}/share/doc/xtrs
# The sources assume <malloc.h> exists. Create a fake one for platforms
# that don't have it.
diff -r 4c0e88a9e3ab -r 1503a0bbd5e0 filesystems/fuse-gphotofs/Makefile
--- a/filesystems/fuse-gphotofs/Makefile Wed Jul 08 16:38:35 2009 +0000
+++ b/filesystems/fuse-gphotofs/Makefile Wed Jul 08 16:40:08 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/04/29 09:39:17 sborrill Exp $
+# $NetBSD: Makefile,v 1.3 2009/07/08 16:43:51 joerg Exp $
#
DISTNAME= gphotofs-0.4.0
@@ -11,6 +11,8 @@
HOMEPAGE= http://gphoto.sourceforge.net/proj/gphotofs/
COMMENT= FUSE filesystem for accessing digital cameras
+PKG_DESTDIR_SUPPORT= user-destdir
+
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= gmake pkg-config
@@ -18,7 +20,7 @@
INSTALLATION_DIRS= share/doc/${PKGBASE}
post-install:
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/${PKGBASE}
+ ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libgphoto2/buildlink3.mk"
diff -r 4c0e88a9e3ab -r 1503a0bbd5e0 filesystems/fuse-pod/Makefile
--- a/filesystems/fuse-pod/Makefile Wed Jul 08 16:38:35 2009 +0000
+++ b/filesystems/fuse-pod/Makefile Wed Jul 08 16:40:08 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/05/04 23:48:33 agc Exp $
+# $NetBSD: Makefile,v 1.2 2009/07/08 16:45:19 joerg Exp $
#
DISTNAME= fusepod-0.5.1
@@ -11,6 +11,8 @@
HOMEPAGE= http://fusepod.sourceforge.net/
COMMENT= FUSE-based filesystem for iPod
+PKG_DESTDIR_SUPPORT= user-destdir
+
GNU_CONFIGURE= yes
USE_LANGUAGES+= c c++
USE_TOOLS+= gmake pkg-config
diff -r 4c0e88a9e3ab -r 1503a0bbd5e0 filesystems/fuse-wdfs/Makefile
--- a/filesystems/fuse-wdfs/Makefile Wed Jul 08 16:38:35 2009 +0000
+++ b/filesystems/fuse-wdfs/Makefile Wed Jul 08 16:40:08 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/04/16 21:42:43 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2009/07/08 16:40:08 joerg Exp $
#
DISTNAME= wdfs-1.4.2
@@ -11,6 +11,8 @@
HOMEPAGE= http://noedler.de/projekte/wdfs/
COMMENT= FUSE-based webdav filesystem
+PKG_DESTDIR_SUPPORT= user-destdir
+
GNU_CONFIGURE= yes
USE_TOOLS+= pkg-config
diff -r 4c0e88a9e3ab -r 1503a0bbd5e0 filesystems/fuse-wikipediafs/Makefile
--- a/filesystems/fuse-wikipediafs/Makefile Wed Jul 08 16:38:35 2009 +0000
+++ b/filesystems/fuse-wikipediafs/Makefile Wed Jul 08 16:40:08 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/02/09 22:56:23 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2009/07/08 16:43:13 joerg Exp $
#
DISTNAME= wikipediafs-0.3
@@ -11,6 +11,8 @@
HOMEPAGE= http://wikipediafs.sourceforge.net/
COMMENT= FUSE filesystem for accessing the wikipedia
+PKG_DESTDIR_SUPPORT= user-destdir
+
PYTHON_VERSIONS_ACCEPTED= 25 24
PYDISTUTILSPKG= yes
diff -r 4c0e88a9e3ab -r 1503a0bbd5e0 filesystems/u9fs/Makefile
--- a/filesystems/u9fs/Makefile Wed Jul 08 16:38:35 2009 +0000
+++ b/filesystems/u9fs/Makefile Wed Jul 08 16:40:08 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/05/13 15:34:05 agc Exp $
+# $NetBSD: Makefile,v 1.3 2009/07/08 16:44:49 joerg Exp $
#
DISTNAME= u9fs-2.0.3
@@ -9,6 +9,8 @@
HOMEPAGE= http://plan9.bell-labs.com/
COMMENT= Unix file server using the 9P protocol
+PKG_DESTDIR_SUPPORT= user-destdir
+
WRKSRC= ${WRKDIR}/u9fs
MAKE_FILE= makefile
diff -r 4c0e88a9e3ab -r 1503a0bbd5e0 filesystems/u9fs/distinfo
--- a/filesystems/u9fs/distinfo Wed Jul 08 16:38:35 2009 +0000
+++ b/filesystems/u9fs/distinfo Wed Jul 08 16:40:08 2009 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2007/05/13 15:34:05 agc Exp $
+$NetBSD: distinfo,v 1.3 2009/07/08 16:44:49 joerg Exp $
SHA1 (u9fs-2.0.3.tar.gz) = 98b6d1b26a516761ee392d2c3ed15528af84601b
RMD160 (u9fs-2.0.3.tar.gz) = 460879d27c4d282a3b4822c194b2abf458851b4d
Size (u9fs-2.0.3.tar.gz) = 42325 bytes
-SHA1 (patch-aa) = f346a8268d60ed6c24f0b16732768935fd946358
+SHA1 (patch-aa) = 2a8f531d85187737b779fe6e339def22ae3c76e5
SHA1 (patch-ab) = 0cd3d25449ddce2657a24ea3de531adaac477df0
SHA1 (patch-ac) = 7251853f1dc6cecaaf67c617e5dfb74ecae12b19
SHA1 (patch-ad) = d7a26f4db9eb543ee47dc621b7a79be11d4f42cd
diff -r 4c0e88a9e3ab -r 1503a0bbd5e0 filesystems/u9fs/patches/patch-aa
--- a/filesystems/u9fs/patches/patch-aa Wed Jul 08 16:38:35 2009 +0000
+++ b/filesystems/u9fs/patches/patch-aa Wed Jul 08 16:40:08 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2007/05/13 15:34:05 agc Exp $
+$NetBSD: patch-aa,v 1.3 2009/07/08 16:44:49 joerg Exp $
--- makefile 2007/04/23 21:54:35 1.1
+++ makefile 2007/04/23 21:55:35
@@ -19,9 +19,9 @@
install: u9fs
- cp u9fs ../../bin
-+ ${BSD_INSTALL_DATA_DIR} ${PREFIX}/libexec
-+ ${BSD_INSTALL_PROGRAM} u9fs ${PREFIX}/libexec/
-+ ${BSD_INSTALL_MAN_DIR} ${PREFIX}/${PKGMANDIR}/man8
-+ ${BSD_INSTALL_MAN} u9fs.8 ${PREFIX}/${PKGMANDIR}/man8/
++ ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/libexec
++ ${BSD_INSTALL_PROGRAM} u9fs ${DESTDIR}${PREFIX}/libexec/
++ ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
++ ${BSD_INSTALL_MAN} u9fs.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/
.PHONY: clean install
diff -r 4c0e88a9e3ab -r 1503a0bbd5e0 fonts/jmk-fonts/Makefile
--- a/fonts/jmk-fonts/Makefile Wed Jul 08 16:38:35 2009 +0000
+++ b/fonts/jmk-fonts/Makefile Wed Jul 08 16:40:08 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2008/01/22 17:09:55 tnn Exp $
+# $NetBSD: Makefile,v 1.14 2009/07/08 16:47:20 joerg Exp $
#
DISTNAME= jmk-x11-fonts-3.0
@@ -11,6 +11,8 @@
HOMEPAGE= http://www.jmknoble.net/fonts/
COMMENT= Jim Knoble's font collection for X11
+PKG_DESTDIR_SUPPORT= user-destdir
+
USE_IMAKE= yes
USE_TOOLS+= bdftopcf gzip
@@ -18,6 +20,6 @@
REQD_DIRS+= ${PREFIX}/lib/X11/fonts/jmk
post-install:
- ${RM} ${PREFIX}/lib/X11/fonts/jmk/fonts.scale
+ ${RM} ${DESTDIR}${PREFIX}/lib/X11/fonts/jmk/fonts.scale
.include "../../mk/bsd.pkg.mk"
diff -r 4c0e88a9e3ab -r 1503a0bbd5e0 fonts/kcfonts/Makefile
--- a/fonts/kcfonts/Makefile Wed Jul 08 16:38:35 2009 +0000
+++ b/fonts/kcfonts/Makefile Wed Jul 08 16:40:08 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2008/01/22 17:09:55 tnn Exp $
+# $NetBSD: Makefile,v 1.12 2009/07/08 16:49:05 joerg Exp $
DISTNAME= kcfonts-1.05
PKGREVISION= 3
@@ -8,6 +8,8 @@
MAINTAINER= kevlo%midassol.com@localhost
COMMENT= Kuo Chauo Chinese Fonts collection
+PKG_DESTDIR_SUPPORT= user-destdir
+
WRKSRC= ${WRKDIR}
USE_X11BASE= yes
FONTS_DIRS.x11= ${PREFIX}/lib/X11/fonts/local
diff -r 4c0e88a9e3ab -r 1503a0bbd5e0 fonts/kcfonts/distinfo
--- a/fonts/kcfonts/distinfo Wed Jul 08 16:38:35 2009 +0000
+++ b/fonts/kcfonts/distinfo Wed Jul 08 16:40:08 2009 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.3 2005/12/28 19:50:45 joerg Exp $
+$NetBSD: distinfo,v 1.4 2009/07/08 16:49:05 joerg Exp $
SHA1 (kcfonts-1.05.tar.gz) = b05d2aae45a7624cc9484e1bac0c0670200a0784
RMD160 (kcfonts-1.05.tar.gz) = 81beed36904d4a4a012da99d000ec6ddae6e3d37
Size (kcfonts-1.05.tar.gz) = 903701 bytes
-SHA1 (patch-aa) = c72e64cb5723015b463686d256c030b1e13358f5
+SHA1 (patch-aa) = 60f58f1e6d3db116f6bccceaa3b6420aa76c0c72
SHA1 (patch-ab) = 8e395c8f5a6c157db54a9b805fede7136250b11c
SHA1 (patch-ad) = 366ba0c305433845417fc5699eb188230f235d34
SHA1 (patch-ae) = 03d0a5c4b541177df800bcea2f80858cadefd98a
diff -r 4c0e88a9e3ab -r 1503a0bbd5e0 fonts/kcfonts/patches/patch-aa
--- a/fonts/kcfonts/patches/patch-aa Wed Jul 08 16:38:35 2009 +0000
+++ b/fonts/kcfonts/patches/patch-aa Wed Jul 08 16:40:08 2009 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/07/18 16:19:04 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2009/07/08 16:49:05 joerg Exp $
---- Makefile.orig Sat Dec 16 21:00:46 1995
+--- Makefile.orig 1995-12-16 21:00:46.000000000 +0100
+++ Makefile
@@ -2,13 +2,13 @@
# Kau Chauo Chinese Fanti Ming Fonts Version 1.05 For FreeBSD
@@ -20,7 +20,7 @@
FONTS =kc24f.pcf.gz kc15f.pcf.gz kc8x15.pcf.gz kc12x24.pcf.gz
PROGS =kc24f kc15f kc8x15 kc12x24 kca2et
OBJS =tran.o kc24f.o kc15f.o kc8x15.o kc12x24.o kca2et.o
-@@ -22,10 +22,14 @@
+@@ -22,10 +22,14 @@ kc15f.pcf.gz: kc15f
./kc15f | bdftopcf | gzip - > kc15f.pcf.gz
kc8x15.pcf.gz: kca2et kc8x15
./kca2et kctext16.f00 ascfont.15 256 16 15
@@ -37,11 +37,19 @@
kc24f: tran.o kc24f.o
$(CC) $(CFLAGS) tran.o kc24f.o -o $@
-@@ -42,6 +46,7 @@
- if [ ! -d $(CFONTDIR) ]; then mkdir $(CFONTDIR); fi
- cp kc*f.pcf.gz $(CFONTDIR)
- cp kc*x*.pcf.gz $(EFONTDIR)
-+ cp fonts.alias $(CFONTDIR)
- mkfontdir $(CFONTDIR)
- mkfontdir $(EFONTDIR)
+@@ -39,11 +43,10 @@ kca2et: kca2et.o
+ $(CC) $(CFLAGS) kca2et.o -o $@
+ install:
+- if [ ! -d $(CFONTDIR) ]; then mkdir $(CFONTDIR); fi
+- cp kc*f.pcf.gz $(CFONTDIR)
+- cp kc*x*.pcf.gz $(EFONTDIR)
+- mkfontdir $(CFONTDIR)
+- mkfontdir $(EFONTDIR)
++ if [ ! -d ${DESTDIR}$(CFONTDIR) ]; then mkdir ${DESTDIR}$(CFONTDIR); fi
++ ${BSD_INSTALL_DATA} kc*f.pcf.gz ${DESTDIR}$(CFONTDIR)
++ ${BSD_INSTALL_DATA} kc*x*.pcf.gz ${DESTDIR}$(EFONTDIR)
++ ${BSD_INSTALL_DATA} fonts.alias ${DESTDIR}$(CFONTDIR)
+
+ clean:
+ rm -f kc*.pcf.gz ascfont.* *.o *~ $(PROGS)
Home |
Main Index |
Thread Index |
Old Index