From owner-freebsd-ports@FreeBSD.ORG  Fri Jan  2 07:23:34 2004
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
Delivered-To: freebsd-ports@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 796FA16A4CE
	for <ports@FreeBSD.org>; Fri,  2 Jan 2004 07:23:34 -0800 (PST)
Received: from arginine.spc.org (arginine.spc.org [195.206.69.236])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9C28443D31
	for <ports@FreeBSD.org>; Fri,  2 Jan 2004 07:23:32 -0800 (PST)
	(envelope-from bms@spc.org)
Received: from localhost (localhost [127.0.0.1])
	by arginine.spc.org (Postfix) with ESMTP id 6952A6520C
	for <ports@FreeBSD.org>; Fri,  2 Jan 2004 15:23:30 +0000 (GMT)
Received: from arginine.spc.org ([127.0.0.1])
 by localhost (arginine.spc.org [127.0.0.1]) (amavisd-new, port 10024)
 with LMTP id 33518-03 for <ports@FreeBSD.org>;
 Fri,  2 Jan 2004 15:23:30 +0000 (GMT)
Received: from saboteur.dek.spc.org (82-147-18-36.dsl.uk.rapidplay.com
	[82.147.18.36])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by arginine.spc.org (Postfix) with ESMTP id A6A9C651FC
	for <ports@FreeBSD.org>; Fri,  2 Jan 2004 15:23:29 +0000 (GMT)
Received: by saboteur.dek.spc.org (Postfix, from userid 1001)
	id 2EE51D; Fri,  2 Jan 2004 15:23:27 +0000 (GMT)
Date: Fri, 2 Jan 2004 15:23:27 +0000
From: Bruce M Simpson <bms@spc.org>
To: ports@FreeBSD.org
Message-ID: <20040102152327.GA95612@saboteur.dek.spc.org>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="0F1p//8PRICkK4MW"
Content-Disposition: inline
Subject: [PATCH] graphics/ImageMagick: fix install step for perl
X-BeenThere: freebsd-ports@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Porting software to FreeBSD <freebsd-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports>
List-Post: <mailto:freebsd-ports@freebsd.org>
List-Help: <mailto:freebsd-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Jan 2004 15:23:34 -0000


--0F1p//8PRICkK4MW
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On my -CURRENT system the installation of ImageMagick fails when it gets
to the perl-sources install target (which strictly speaking it shouldn't
need as the source is present in ${WRKSRC}/PerlMagick).

The attached patch touches perl-sources in a preinstall target so that
the VPATH isn't looked at (VPATH seems to map to /usr/src/sys for some
reason). This appears to fix installation of ImageMagick for me, YMMV.

BMS

--0F1p//8PRICkK4MW
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=patch-Makefile

--- Makefile.orig	Fri Jan  2 15:20:23 2004
+++ Makefile	Fri Jan  2 15:20:08 2004
@@ -58,6 +58,12 @@
 PLIST_SUB+=		WITH_PERL='@comment '
 .endif
 
+# Fix perl install step
+.if !defined(WITHOUT_IMAGEMAGICK_PERL)
+pre-install:
+	@( cd ${WRKSRC} ; touch perl-sources )
+.endif
+
 # PerlMagick not works with threads, if perl is not threaded, and vice versa
 .if defined(WITH_IMAGEMAGICK_THREADS) || \
     (!defined(WITHOUT_IMAGEMAGICK_PERL) && \

--0F1p//8PRICkK4MW--