diff options
| author | Ade Lovett <ade@FreeBSD.org> | 2001-05-04 21:41:30 +0000 |
|---|---|---|
| committer | Ade Lovett <ade@FreeBSD.org> | 2001-05-04 21:41:30 +0000 |
| commit | bc47cccc84a1837da1919cf6c75785c9646d1761 (patch) | |
| tree | f7a9d348554d6994c70ad84089b6b749b7ac60fd /graphics/gd1 | |
| parent | Upgrade to INN 2.3.2. (diff) | |
Various patches (mainly shared library revision changes) for those
ports that depend on GNOME and need to change for 1.4
Notes
Notes:
svn path=/head/; revision=42259
Diffstat (limited to 'graphics/gd1')
| -rw-r--r-- | graphics/gd1/Makefile | 2 | ||||
| -rw-r--r-- | graphics/gd1/files/patch-ac | 10 |
2 files changed, 4 insertions, 8 deletions
diff --git a/graphics/gd1/Makefile b/graphics/gd1/Makefile index d12b052efb68..09ac3b3b5531 100644 --- a/graphics/gd1/Makefile +++ b/graphics/gd1/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/gd1/files/patch-ac b/graphics/gd1/files/patch-ac index 89e342477f1b..415662373e4c 100644 --- a/graphics/gd1/files/patch-ac +++ b/graphics/gd1/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 |