aboutsummaryrefslogtreecommitdiffstats
path: root/graphics/gd2
diff options
context:
space:
mode:
authorade <ade@FreeBSD.org>2001-05-05 05:41:30 +0800
committerade <ade@FreeBSD.org>2001-05-05 05:41:30 +0800
commit6855df27735fc5f10d442e902a0e3b24e5c8f96d (patch)
treea06401f746a2c66d7519e13e47116450d2e2857d /graphics/gd2
parent6bb45ee02a63914be3ecd530070d92541da9614b (diff)
downloadfreebsd-ports-gnome-6855df27735fc5f10d442e902a0e3b24e5c8f96d.tar.gz
freebsd-ports-gnome-6855df27735fc5f10d442e902a0e3b24e5c8f96d.tar.zst
freebsd-ports-gnome-6855df27735fc5f10d442e902a0e3b24e5c8f96d.zip
Various patches (mainly shared library revision changes) for those
ports that depend on GNOME and need to change for 1.4
Diffstat (limited to 'graphics/gd2')
-rw-r--r--graphics/gd2/Makefile2
-rw-r--r--graphics/gd2/files/patch-ac10
2 files changed, 4 insertions, 8 deletions
diff --git a/graphics/gd2/Makefile b/graphics/gd2/Makefile
index d12b052efb68..09ac3b3b5531 100644
--- a/graphics/gd2/Makefile
+++ b/graphics/gd2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gd
PORTVERSION= 1.8.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES+= graphics
MASTER_SITES= http://www.boutell.com/gd/http/ \
ftp://ftp.boutell.com/pub/boutell/gd/ \
diff --git a/graphics/gd2/files/patch-ac b/graphics/gd2/files/patch-ac
index 89e342477f1b..415662373e4c 100644
--- a/graphics/gd2/files/patch-ac
+++ b/graphics/gd2/files/patch-ac
@@ -49,27 +49,23 @@
#Note: for Freetype 1.x, use DHAVE_LIBTTF and -lttf instead.
-@@ -45,7 +53,10 @@
+@@ -45,7 +53,8 @@
#ensure that the version of gd you are installing is used, and not an
#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
-+.if defined(WITH_X11)
-+INCLUDEDIRS+=-I${X11BASE}/include/X11 -I${X11BASE}/include
-+.endif
++INCLUDEDIRS+=-I${X11BASE}/include/X11 -I${X11BASE}/include/freetype2 -I${X11BASE}/include
#Typical install locations for freetype, zlib, xpm and libpng libraries.
#If yours are somewhere else, other than a standard location
-@@ -55,16 +66,19 @@
+@@ -55,16 +66,17 @@
#on your system can't cause conflicts while building a new one.
#This line shouldn't hurt if you don't actually have some of the
#optional libraries and directories.
-LIBDIRS=-L. -L/usr/local/lib -L/usr/lib/X11 -L/usr/X11R6/lib
+LIBDIRS=-L. -L${LOCALBASE}/lib -Wl,--rpath,${LOCALBASE}/lib
-+.if defined(WITH_X11)
+LIBDIRS+=-L${X11BASE}/lib -Wl,--rpath,${X11BASE}/lib
-+.endif
#Location where libgd.a should be installed by "make install".
-INSTALL_LIB=/usr/local/lib