summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg>2010-02-01 02:41:52 +0000
committerjoerg <joerg>2010-02-01 02:41:52 +0000
commit3efea4f3cf9939b6df34b911dfd64810709b61c7 (patch)
tree3aaff12531427edcc8d39cf361a82a1a42a7450a
parent4a41a4842b7dc3398e68c010b7c89b2c1d8a3275 (diff)
downloadpkgsrc-3efea4f3cf9939b6df34b911dfd64810709b61c7.tar.gz
DESTDIR support
-rw-r--r--graphics/SDLKit/Makefile4
-rw-r--r--graphics/SDLKit/distinfo4
-rw-r--r--graphics/SDLKit/patches/patch-ab4
-rw-r--r--graphics/camediaplay/Makefile15
-rw-r--r--graphics/claraocr/Makefile8
-rw-r--r--graphics/claraocr/distinfo4
-rw-r--r--graphics/claraocr/patches/patch-aa15
7 files changed, 33 insertions, 21 deletions
diff --git a/graphics/SDLKit/Makefile b/graphics/SDLKit/Makefile
index 34876d95f85..a9020cf708b 100644
--- a/graphics/SDLKit/Makefile
+++ b/graphics/SDLKit/Makefile
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2009/07/07 05:50:21 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2010/02/01 02:41:52 joerg Exp $
#
+PKG_DESTDIR_SUPPORT= user-destdir
+
.include "../../graphics/3DKit/Makefile.common"
PKGNAME= ${DISTNAME:S/3DKit/SDLKit/}
diff --git a/graphics/SDLKit/distinfo b/graphics/SDLKit/distinfo
index a0f92eaf90f..a527e4b7c13 100644
--- a/graphics/SDLKit/distinfo
+++ b/graphics/SDLKit/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2009/07/07 05:50:21 joerg Exp $
+$NetBSD: distinfo,v 1.4 2010/02/01 02:41:52 joerg Exp $
SHA1 (3DKit/3DKit-0.3.1r2.tar.gz) = 780e7dc975cb2ac0b96f8f605aa6ad0b3af596b9
RMD160 (3DKit/3DKit-0.3.1r2.tar.gz) = bc6f154479156a10fb336fcf6a142b1474df4c61
Size (3DKit/3DKit-0.3.1r2.tar.gz) = 216093 bytes
SHA1 (patch-aa) = f60cf7bb977f5471bdf54399928aa2086c064b05
-SHA1 (patch-ab) = 8dee09676a35d7a377428e2c5de9d0fcd054a5e2
+SHA1 (patch-ab) = 42c4d4d9cf3d0b39c5b956d492913370e354700b
diff --git a/graphics/SDLKit/patches/patch-ab b/graphics/SDLKit/patches/patch-ab
index 8c86f5c0c14..8a168580f89 100644
--- a/graphics/SDLKit/patches/patch-ab
+++ b/graphics/SDLKit/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1 2009/07/07 05:50:22 joerg Exp $
+$NetBSD: patch-ab,v 1.2 2010/02/01 02:41:52 joerg Exp $
--- GNUmakefile.orig 2010-05-31 23:39:15.000000000 +0200
+++ GNUmakefile
@@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.1 2009/07/07 05:50:22 joerg Exp $
#
+# Install into the system root by default
-+GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
++GNUSTEP_INSTALLATION_DIR = ${DESTDIR}$(GNUSTEP_SYSTEM_ROOT)
+
include $(GNUSTEP_MAKEFILES)/common.make
include Version
diff --git a/graphics/camediaplay/Makefile b/graphics/camediaplay/Makefile
index 3a9f1b51b54..9bbfaa09848 100644
--- a/graphics/camediaplay/Makefile
+++ b/graphics/camediaplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/12/02 00:04:48 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2010/02/01 02:48:06 joerg Exp $
DISTNAME= camediaplay-20010211
CATEGORIES= graphics
@@ -7,16 +7,23 @@ MASTER_SITES= ftp://ftp.itojun.org/pub/digi-cam/C-400L/unix/
MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= Digital camera downloading tool for Epson/Sanyo/Olympus/Agfa camera
+PKG_DESTDIR_SUPPORT= user-destdir
+
WRKSRC= ${WRKDIR}/camediaplay/build
GNU_CONFIGURE= yes
DOC= README.english README.japanese PROTOCOL
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/camediaplay
+INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 share/doc/camediaplay
+
+SPECIAL_PERMS+= bin/camediaplay uucp bin 04555
+
+do-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/camediaplay ${DESTDIR}${PREFIX}/bin
+ ${INSTALL_MAN} ${WRKSRC}/../src/camediaplay.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/camediaplay.1
for i in ${DOC}; do \
${INSTALL_DATA} ${WRKSRC}/../$$i \
- ${PREFIX}/share/doc/camediaplay; \
+ ${DESTDIR}${PREFIX}/share/doc/camediaplay; \
done
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/claraocr/Makefile b/graphics/claraocr/Makefile
index 182ef0b9458..8b58f8f203d 100644
--- a/graphics/claraocr/Makefile
+++ b/graphics/claraocr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2007/02/16 00:53:40 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2010/02/01 02:51:29 joerg Exp $
#
DISTNAME= clara-0.9.9
@@ -15,6 +15,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.geocities.com/claraocr/
COMMENT= Optical Character Recognition (OCR) program for books
+PKG_DESTDIR_SUPPORT= user-destdir
+
DEPENDS+= netpbm-[0-9]*:../../graphics/netpbm
USE_TOOLS+= perl:run
@@ -22,9 +24,11 @@ REPLACE_PERL= clara.pl mkdoc.pl selthresh.pl
CONFLICTS+= clara-[0-9]*
+INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 share/doc/clara
+
# install a example input file
post-install:
- ${INSTALL_DATA} ${WRKSRC}/imre.pbm ${PREFIX}/share/doc/clara
+ ${INSTALL_DATA} ${WRKSRC}/imre.pbm ${DESTDIR}${PREFIX}/share/doc/clara
.include "../../x11/libX11/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/claraocr/distinfo b/graphics/claraocr/distinfo
index c6c99b12899..265becbcaa4 100644
--- a/graphics/claraocr/distinfo
+++ b/graphics/claraocr/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 08:45:04 agc Exp $
+$NetBSD: distinfo,v 1.5 2010/02/01 02:51:29 joerg Exp $
SHA1 (clara-0.9.9.tar.gz) = 7d18088ad086d476cce2821497db16f4f444231e
RMD160 (clara-0.9.9.tar.gz) = 6831d71a5ae383fd025d57050edbabe4a5359666
Size (clara-0.9.9.tar.gz) = 419529 bytes
-SHA1 (patch-aa) = 3c8ae0031b579917299f314eb34918b7e2b955a1
+SHA1 (patch-aa) = bfabc610299887e9b8331357d457657aa8c0eb26
diff --git a/graphics/claraocr/patches/patch-aa b/graphics/claraocr/patches/patch-aa
index c9619ac589c..3fdf219c356 100644
--- a/graphics/claraocr/patches/patch-aa
+++ b/graphics/claraocr/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2002/09/22 00:07:57 jlam Exp $
+$NetBSD: patch-aa,v 1.4 2010/02/01 02:51:30 joerg Exp $
--- Makefile.orig Sat May 4 03:45:07 2002
+++ Makefile
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.3 2002/09/22 00:07:57 jlam Exp $
#MANDIR=/usr/local/man/man1
-MANDIR=/usr/man/man1
-+MANDIR=${PREFIX}/man/man1
++MANDIR=${PREFIX}/${PKGMANDIR}/man1
#DOCDIR=/usr/local/doc/clara
#DOCDIR=/usr/doc/clara
@@ -47,7 +47,7 @@ $NetBSD: patch-aa,v 1.3 2002/09/22 00:07:57 jlam Exp $
#
# If your system requires additional libs, please add them:
-@@ -175,13 +175,11 @@
+@@ -175,13 +175,10 @@
./clara -p 2
install: all
@@ -58,11 +58,10 @@ $NetBSD: patch-aa,v 1.3 2002/09/22 00:07:57 jlam Exp $
- install doc/clara.1 doc/clara-dev.1 doc/clara-adv.1 $(MANDIR)
- install -d $(DOCDIR)
- install ANNOUNCE CHANGELOG doc/FAQ doc/*.html $(DOCDIR)
-+ ${BSD_INSTALL_PROGRAM} clara $(BINDIR)
-+ ${BSD_INSTALL_SCRIPT} selthresh.pl $(BINDIR)
-+ ${BSD_INSTALL_MAN} doc/clara.1 doc/clara-dev.1 doc/clara-adv.1 $(MANDIR)
-+ ${BSD_INSTALL_DATA_DIR} $(DOCDIR)
-+ ${BSD_INSTALL_DATA} ANNOUNCE CHANGELOG doc/FAQ doc/*.html $(DOCDIR)
++ ${BSD_INSTALL_PROGRAM} clara ${DESTDIR}$(BINDIR)
++ ${BSD_INSTALL_SCRIPT} selthresh.pl ${DESTDIR}$(BINDIR)
++ ${BSD_INSTALL_MAN} doc/clara.1 doc/clara-dev.1 doc/clara-adv.1 ${DESTDIR}$(MANDIR)
++ ${BSD_INSTALL_DATA} ANNOUNCE CHANGELOG doc/FAQ doc/*.html ${DESTDIR}$(DOCDIR)
clean:
rm -f clara sclara $(OBJS) doc/clara*.1 doc/clara*.html doc/FAQ