From e272ab1c24d70485043ee3f8bef920d3514babff Mon Sep 17 00:00:00 2001
From: hubertf <hubertf@pkgsrc.org>
Date: Tue, 11 Jan 2005 22:56:34 +0000
Subject: remove bogus VPATH line from the pkg's Makefile. This bug is was not
 discovered so far due to a bug in GNU make. On NetBSD, it happens only under
 certain conditions (/install present), see PR pkg/28934 for more information.

This commit is a stopgag, I'm still discussing with the xlockmore author
what the right fix is.
---
 x11/xlockmore/Makefile.common  |  4 ++--
 x11/xlockmore/distinfo         |  3 ++-
 x11/xlockmore/patches/patch-ad | 13 +++++++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 x11/xlockmore/patches/patch-ad

(limited to 'x11/xlockmore')

diff --git a/x11/xlockmore/Makefile.common b/x11/xlockmore/Makefile.common
index a678c523070..3aabd39f6cf 100644
--- a/x11/xlockmore/Makefile.common
+++ b/x11/xlockmore/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2004/11/27 00:15:22 hubertf Exp $
+# $NetBSD: Makefile.common,v 1.19 2005/01/11 22:56:34 hubertf Exp $
 #
 # This Makefile.common is included by:
 #
@@ -8,7 +8,7 @@
 # If these packages are updated, please remember to reset any PKGREVISIONs
 # in those Makefiles.
 
-DISTNAME=       xlockmore-5.14.1
+DISTNAME=       xlockmore-5.14.1nb1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.tux.org/pub/tux/bagleyd/xlockmore/ \
 		ftp://ibiblio.org/pub/Linux/X11/screensavers/ \
diff --git a/x11/xlockmore/distinfo b/x11/xlockmore/distinfo
index a14ba215f1d..202c5ed9ef1 100644
--- a/x11/xlockmore/distinfo
+++ b/x11/xlockmore/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.21 2004/11/27 00:15:22 hubertf Exp $
+$NetBSD: distinfo,v 1.22 2005/01/11 22:56:34 hubertf Exp $
 
 SHA1 (xlockmore-5.14.1.tar.bz2) = 0d3b120756275c1c3588b9a95430b97c1c3839ac
 Size (xlockmore-5.14.1.tar.bz2) = 1724387 bytes
 SHA1 (patch-aa) = 98243d9a615d3f44b6e3aab71388acb72b96d383
 SHA1 (patch-ab) = 93273c90ed447e5dec4c03c0f4ade960da2783b3
 SHA1 (patch-ac) = 1bcbf56cdb6709cf8f21855b141a4892a36751c1
+SHA1 (patch-ad) = 4d43cf55410f0d8a223c843a7e1f3df6b599d1f2
diff --git a/x11/xlockmore/patches/patch-ad b/x11/xlockmore/patches/patch-ad
new file mode 100644
index 00000000000..17b64e25a70
--- /dev/null
+++ b/x11/xlockmore/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.4 2005/01/11 22:56:34 hubertf Exp $
+
+--- Makefile.in.orig	2002-09-22 00:58:54.000000000 +0200
++++ Makefile.in
+@@ -24,7 +24,7 @@ SHELL = /bin/sh
+ 
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+-VPATH = @srcdir@/
++#HF#VPATH = @srcdir@/
+ 
+ TAR = tar
+ RM = rm -f
-- 
cgit v1.2.3