summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2009-07-08 14:02:49 +0000
committerjoerg <joerg@pkgsrc.org>2009-07-08 14:02:49 +0000
commit56ce1d5cf75e3889a13fdb427451520d2eb5c0d4 (patch)
treeffc2a1fb98a30b8c4a6980d57307eb190aa503f2 /devel
parentcc1d77ba9becb703eec9a3c4eea9cc5ecccd80bf (diff)
downloadpkgsrc-56ce1d5cf75e3889a13fdb427451520d2eb5c0d4.tar.gz
user-destdir support
Diffstat (limited to 'devel')
-rw-r--r--devel/libscsi/Makefile9
-rw-r--r--devel/libscsi/distinfo4
-rw-r--r--devel/libscsi/patches/patch-ab10
3 files changed, 11 insertions, 12 deletions
diff --git a/devel/libscsi/Makefile b/devel/libscsi/Makefile
index 01b0aa7de3a..b00d428db5c 100644
--- a/devel/libscsi/Makefile
+++ b/devel/libscsi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2008/05/20 20:42:04 tnn Exp $
+# $NetBSD: Makefile,v 1.15 2009/07/08 14:02:49 joerg Exp $
#
DISTNAME= libscsi-1.6
@@ -12,12 +12,9 @@ COMMENT= FreeBSD SCSI user library
NOT_FOR_PLATFORM= Interix-*-*
PKG_INSTALLATION_TYPES= overwrite pkgviews
+PKG_DESTDIR_SUPPORT= user-destdir
-MAKE_ENV+= LIBDIR=${PREFIX:Q}/lib MANDIR=${PREFIX:Q}/man NOPIC=1 NOPROFILE=1
-MAKE_ENV+= BINOWN=${BINOWN} BINGRP=${BINGRP}
-MAKE_ENV+= MANOWN=${MANOWN} MANGRP=${MANGRP}
-
-MANCOMPRESSED_IF_MANZ= yes
+USE_BSD_MAKEFILE= yes
INSTALLATION_DIRS= include lib ${PKGMANDIR}/cat3 ${PKGMANDIR}/man3
diff --git a/devel/libscsi/distinfo b/devel/libscsi/distinfo
index fc44c53e965..dc72c3db6f8 100644
--- a/devel/libscsi/distinfo
+++ b/devel/libscsi/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2007/09/12 21:05:29 rillig Exp $
+$NetBSD: distinfo,v 1.7 2009/07/08 14:02:49 joerg Exp $
SHA1 (libscsi-1.6.tar.gz) = 8d6d47d2baa5e272e09ac5ee1330dd37461e922f
RMD160 (libscsi-1.6.tar.gz) = 586e0b73777a6be41f075c2b6f4fb73c81d7fa03
Size (libscsi-1.6.tar.gz) = 11896 bytes
SHA1 (patch-aa) = d34b6769997c3fe29b99d0465710bd3c5d9bcda8
-SHA1 (patch-ab) = 8b6894ca7084605d67a3b01dba06bab51e6c0bfa
+SHA1 (patch-ab) = 6f8f913a0348666b973dfb50509c77c1a0056cc9
SHA1 (patch-ac) = 26234441505ad213642692f5b705e166c48eba47
SHA1 (patch-ad) = 7772f992e3df11b0461db33c91ff570f90ea82db
diff --git a/devel/libscsi/patches/patch-ab b/devel/libscsi/patches/patch-ab
index 1f3c95c59a6..04e24cb97e0 100644
--- a/devel/libscsi/patches/patch-ab
+++ b/devel/libscsi/patches/patch-ab
@@ -1,13 +1,15 @@
-$NetBSD: patch-ab,v 1.6 2004/05/30 18:05:54 minskim Exp $
+$NetBSD: patch-ab,v 1.7 2009/07/08 14:02:49 joerg Exp $
--- Makefile.orig Wed Feb 18 15:43:00 1998
+++ Makefile Thu Dec 20 12:22:50 2001
-@@ -4,7 +4,11 @@
+@@ -4,7 +4,13 @@
#CFLAGS+=-DLIBC_SCCS -I${.CURDIR}/../../sys
SRCS= scsi.c
-MAN3= scsi.3
+NOLINT= 1
++NOPIC= 1
++NOPROFILE= 1
+
+MANINSTALL= maninstall catinstall
+
@@ -15,14 +17,14 @@ $NetBSD: patch-ab,v 1.6 2004/05/30 18:05:54 minskim Exp $
MLINKS+=scsi.3 scsireq_buff_decode.3 scsi.3 scsireq_build.3 \
scsi.3 scsireq_decode.3 scsi.3 scsireq_encode.3 \
-@@ -14,8 +18,8 @@
+@@ -14,8 +20,8 @@
scsi.3 scsi_debug_output.3
beforeinstall:
- ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/scsi.h \
- ${DESTDIR}/usr/include
+ ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/scsi.h \
-+ ${PREFIX}/include
++ ${DESTDIR}${PREFIX}/include
.include <bsd.lib.mk>