Date: Mon, 26 Mar 2001 16:57:44 +0200 (CEST)
From: stijn@win.tue.nl
To: FreeBSD-gnats-submit@freebsd.org
Cc: billf@freebsd.org
Subject: ports/26104: PORT UPDATE: add ${FREETYPE_CONFIG} support for graphics/gd
Message-ID: <200103261457.f2QEviB03708@pcwin002.win.tue.nl>
next in thread | raw e-mail | index | archive | help
>Number: 26104
>Category: ports
>Synopsis: PORT UPDATE: add ${FREETYPE_CONFIG} support for graphics/gd
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon Mar 26 07:00:02 PST 2001
>Closed-Date:
>Last-Modified:
>Originator: Stijn Hoop
>Release: FreeBSD 4.3-RC i386
>Organization:
>Environment:
System: FreeBSD 4.3-RC #0: Mon Mar 26 04:36:57 CEST 2001
>Description:
- Add ${FREETYPE_CONFIG} support to graphics/gd port.
The problem: If you have an XFree86-4 installation that *does* install
freetype-config, it still won't get picked up because freetype2 is
hardwired to ${LOCALBASE} in this port.
- CC: maintainer (billf@FreeBSD.org)
>How-To-Repeat:
- Install x11/XFree86-4 or x11/XFree86-4-libraries et al.
- Install a /usr/X11R6/bin/freetype-config that points to the freetype
installation in /usr/X11R6/lib/libfreetype.so.6.
- Try to install graphics/gd.
>Fix:
diff -urN /usr/ports/graphics/gd/Makefile gd/Makefile
--- /usr/ports/graphics/gd/Makefile Sun Feb 25 05:30:46 2001
+++ gd/Makefile Mon Mar 26 11:05:28 2001
@@ -20,6 +20,8 @@
jpeg.9:${PORTSDIR}/graphics/jpeg \
freetype.6:${PORTSDIR}/print/freetype2
+FREETYPE_CONFIG?= ${LOCALBASE}/bin/freetype-config
+
.if defined(WITH_X11)
USE_XLIB= yes
USE_XPM= yes
diff -urN /usr/ports/graphics/gd/files/patch-ac gd/files/patch-ac
--- /usr/ports/graphics/gd/files/patch-ac Sun Feb 25 05:30:46 2001
+++ gd/files/patch-ac Mon Mar 26 11:04:40 2001
@@ -1,5 +1,5 @@
---- Makefile.orig Thu Feb 22 09:03:43 2001
-+++ Makefile Sat Feb 24 16:25:23 2001
+--- Makefile.orig Thu Feb 22 18:03:43 2001
++++ Makefile Mon Mar 26 11:04:17 2001
@@ -3,11 +3,11 @@
#If you do not have gcc, change the setting for COMPILER, but you must
#use an ANSI standard C compiler (NOT the old SunOS 4.1.3 cc
@@ -36,7 +36,7 @@
#on the right order, either.
-LIBS=-lgd -lpng -lz -lm
-+LIBS=-lgd -lpng -lz -ljpeg -lfreetype -lm
++LIBS=-lgd -lpng -lz -ljpeg `${FREETYPE_CONFIG} --libs` -lm
#If you do have FreeType, JPEG and/or Xpm fully installed, uncomment a
#variation of this and comment out the line above. Note that
@@ -54,7 +54,7 @@
#older release in your directory tree somewhere.
-INCLUDEDIRS=-I. -I/usr/include/freetype2 -I/usr/include/X11 -I/usr/X11R6/include/X11 -I/usr/local/include
-+INCLUDEDIRS=-I. -I${LOCALBASE}/include/freetype2 -I${LOCALBASE}/include
++INCLUDEDIRS=-I. `${FREETYPE_CONFIG} --cflags` -I${LOCALBASE}/include
+.if defined(WITH_X11)
+INCLUDEDIRS+=-I${X11BASE}/include/X11 -I${X11BASE}/include
+.endif
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200103261457.f2QEviB03708>