diff options
author | joerg <joerg@pkgsrc.org> | 2006-04-22 14:32:42 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2006-04-22 14:32:42 +0000 |
commit | 399190fceea4087e5ce52f29ed8e46b1de71552a (patch) | |
tree | 3abdf4a4841cad487417557f6d35e20b0f6dabcc /x11 | |
parent | bb7b03a855f762b6079a73ede27ddfec3047b724 (diff) | |
download | pkgsrc-399190fceea4087e5ce52f29ed8e46b1de71552a.tar.gz |
Fix Perl reference in getconfig and getconfig.pl and also require
Perl at runtime. Bump revision.
Diffstat (limited to 'x11')
-rw-r--r-- | x11/xorg-libs/distinfo | 3 | ||||
-rw-r--r-- | x11/xorg-libs/patches/patch-bp | 10 | ||||
-rw-r--r-- | x11/xorg-server/Makefile | 11 |
3 files changed, 17 insertions, 7 deletions
diff --git a/x11/xorg-libs/distinfo b/x11/xorg-libs/distinfo index f5b104162b0..a476597977f 100644 --- a/x11/xorg-libs/distinfo +++ b/x11/xorg-libs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.40 2006/04/13 02:11:05 joerg Exp $ +$NetBSD: distinfo,v 1.41 2006/04/22 14:32:42 joerg Exp $ SHA1 (X11R6.9.0-src1.tar.gz) = a6c077ed8fdeee5fe1956a427c4cb0bc266e1bef RMD160 (X11R6.9.0-src1.tar.gz) = d12270a4f41a3ceee4bfd5da22d387a3aa707df8 @@ -46,3 +46,4 @@ SHA1 (patch-bl) = ccfd290ebffc08b9cd03b7eb83a9671b0e16baec SHA1 (patch-bm) = f9b73b7c1bd7d6d6db6d23741d5d1125eea5f860 SHA1 (patch-bn) = 58049eb799b469b70b5a2c611b8aef37a5631c0c SHA1 (patch-bo) = fd34e4c71756f17294aeab63db1f15090b3edc1b +SHA1 (patch-bp) = 6bf5252ceeefb2a59cfa16b7375bba61f4867d01 diff --git a/x11/xorg-libs/patches/patch-bp b/x11/xorg-libs/patches/patch-bp new file mode 100644 index 00000000000..c7181a089de --- /dev/null +++ b/x11/xorg-libs/patches/patch-bp @@ -0,0 +1,10 @@ +$NetBSD: patch-bp,v 1.1 2006/04/22 14:32:42 joerg Exp $ + +--- programs/Xserver/hw/xfree86/getconfig/getconfig.sh.orig 2006-04-22 16:05:00.000000000 +0200 ++++ programs/Xserver/hw/xfree86/getconfig/getconfig.sh +@@ -40,4 +40,4 @@ if echo $0 | grep / >/dev/null 2>&1; the + DIR=`dirname $0`/ + fi + +-exec perl ${DIR}getconfig.pl "$@" ++exec /usr/pkg/bin/perl ${DIR}getconfig.pl "$@" diff --git a/x11/xorg-server/Makefile b/x11/xorg-server/Makefile index d428de0d822..e04a7df9940 100644 --- a/x11/xorg-server/Makefile +++ b/x11/xorg-server/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.40 2006/03/20 21:34:59 joerg Exp $ +# $NetBSD: Makefile,v 1.41 2006/04/22 14:32:42 joerg Exp $ DISTNAME= ${DISTFILES} PKGNAME= xorg-server-${XORG_VER} -PKGREVISION= 7 +PKGREVISION= 8 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG} DISTFILES= X11R${XORG_VER}-src1.tar.gz \ @@ -30,6 +30,9 @@ PLIST_SRC= ${WRKDIR}/.PLIST_SRC XORG_PLIST_ENTRY= ${OPSYS} REPLACE_PERL+= exports/lib/modules/getconfig* +REPLACE_PERL+= programs/Xserver/hw/xfree86/getconfig/getconfig.pl +REPLACE_PERL+= programs/Xserver/hw/xfree86/getconfig/getconfig.sh +USE_TOOLS+= perl:run SUBST_CLASSES+= parser SUBST_STAGE.parser= pre-install @@ -48,10 +51,6 @@ SUBST_MESSAGE.stubs= Fixing stubs Makefile. .include "../../mk/bsd.prefs.mk" -.if ${OPSYS} != "NetBSD" -USE_TOOLS+= perl # Yeah, we need this :-) -.endif - .if ${OPSYS} == "Darwin" BUILDLINK_PASSTHRU_DIRS+= /System .else |