From owner-freebsd-gnome@FreeBSD.ORG  Fri Mar 28 04:20:42 2003
Return-Path: <owner-freebsd-gnome@FreeBSD.ORG>
Delivered-To: freebsd-gnome@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id ACE7637B401; Fri, 28 Mar 2003 04:20:42 -0800 (PST)
Received: from topaz.ad1810.com (topaz.ad1810.com [212.204.230.141])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 07BB943F3F; Fri, 28 Mar 2003 04:20:42 -0800 (PST)
	(envelope-from edwin@mavetju.org)
Received: from k7.mavetju (topaz.ad1810.com [212.204.230.141])
	by topaz.ad1810.com (Postfix) with ESMTP
	id 2895A2BA06; Fri, 28 Mar 2003 13:20:38 +0100 (CET)
Received: by k7.mavetju (Postfix, from userid 1001)
	id D447E6A712B; Fri, 28 Mar 2003 23:20:35 +1100 (EST)
To: FreeBSD-gnats-submit@freebsd.org
From: Edwin Groothuis <edwin@mavetju.org>
X-send-pr-version: 3.113
X-GNATS-Notify: 
Message-Id: <20030328122035.D447E6A712B@k7.mavetju>
Date: Fri, 28 Mar 2003 23:20:35 +1100 (EST)
X-Spam-Status: No, hits=-6.0 required=5.0
	tests=PATCH_UNIFIED_DIFF
	autolearn=ham	version=2.50
X-Spam-Level: 
X-Spam-Checker-Version: SpamAssassin 2.50 (1.173-2003-02-20-exp)
cc: gnome@freebsd.org
Subject: 
	[patch] x11-fonts/Xft doesn't make include/X11/Xft before installing
X-BeenThere: freebsd-gnome@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
Reply-To: Edwin Groothuis <edwin@mavetju.org>
List-Id: GNOME for FreeBSD -- porting and maintaining
	<freebsd-gnome.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gnome>,
	<mailto:freebsd-gnome-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-gnome>
List-Post: <mailto:freebsd-gnome@freebsd.org>
List-Help: <mailto:freebsd-gnome-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gnome>,
	<mailto:freebsd-gnome-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Mar 2003 12:20:43 -0000


>Submitter-Id:	current-users
>Originator:	Edwin Groothuis
>Organization:	-
>Confidential:	no 
>Synopsis:	[patch] x11-fonts/Xft doesn't make include/X11/Xft before installing
>Severity:	non-critical
>Priority:	low
>Category:	ports
>Class:		change-request
>Release:	FreeBSD 4.7-RELEASE i386
>Environment:
FreeBSD ref5.freebsd.org 5.0-CURRENT FreeBSD 5.0-CURRENT #46: Sun Mar  2 08:58:49 PST 2003     root@ref5.freebsd.org:/usr/src/sys/i386/compile/REF5  i386

Only XFree86-4-libraries installed, not the full server.

>Description:

x11-fonts/Xft does copy the include files to X11BASE/include/X11/Xft,
but doesn't check if that directory exists before doing so:
===>  Installing for Xft-2.1_3
install  -o root -g wheel -m 444 Xft.h /usr/X11R6/include/X11/Xft
install  -o root -g wheel -m 444 XftCompat.h /usr/X11R6/include/X11/Xft

>How-To-Repeat:

install XFree86-4-libraries, install x11-fonts/Xft, check
X11BASE/include/X11/Xft which should be a directory but is a file.

>Fix:

Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/x11-fonts/Xft/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- Makefile    2 Mar 2003 17:16:46 -0000       1.10
+++ Makefile    28 Mar 2003 12:20:19 -0000
@@ -40,6 +40,9 @@
 pre-patch:
        @${REINPLACE_CMD} -e 's|[(]LIBDIR[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' ${WRKSRC}/Makefile.in
 
+pre-install:
+       -${MKDIR} ${X11BASE}/include/X11/Xft
+
 post-install:
        @${INSTALL_DATA} ${WRKSRC}/Xft.man ${PREFIX}/man/man3/Xft.3