diff options
| author | Norikatsu Shigemura <nork@FreeBSD.org> | 2003-08-18 16:15:10 +0000 |
|---|---|---|
| committer | Norikatsu Shigemura <nork@FreeBSD.org> | 2003-08-18 16:15:10 +0000 |
| commit | efb928619b234d49b326a13f59a6e2ee354bf902 (patch) | |
| tree | c62bd82140831e81442480b9cefc699e0c08f08d /graphics/gd1 | |
| parent | Update to 5.0.8. As reported by Paul Szabo in (diff) | |
o Main modification
graphics/gd(based on 1.8.4) -> graphics/gd1
graphics/gd2(based on 2.0.15) -> graphics/gd
graphics/p5-GD(based on 1.41) -> graphics/p5-GD1
graphics/p5-GD2(based on 2.07) -> graphics/p5-GD
japanese/gd -> japanese/gd1
japanese/gd2 -> japanese/gd
o Include some feature
WITH_XPM(w/, w/o WITHOUT_X11)
o Chase this modification
o Fix build error [1]
PR: ports/54540
Submitted by: Ports Fury
Approved by: maintainer (blanket)
Reported by: bento via kris [1]
Notes
Notes:
svn path=/head/; revision=87214
Diffstat (limited to 'graphics/gd1')
| -rw-r--r-- | graphics/gd1/Makefile | 32 | ||||
| -rw-r--r-- | graphics/gd1/files/Makefile.lib | 10 |
2 files changed, 24 insertions, 18 deletions
diff --git a/graphics/gd1/Makefile b/graphics/gd1/Makefile index afc96e0f11ee..e82e8f1bfe4b 100644 --- a/graphics/gd1/Makefile +++ b/graphics/gd1/Makefile @@ -1,14 +1,13 @@ -# New ports collection makefile for: gd -# Date created: 27 Mar 1998 -# Whom: jeff@cetlink.net +# New ports collection makefile for: gd1 +# Date created: 27 Mar 1998 +# Whom: jeff@cetlink.net # # $FreeBSD$ # PORTNAME= gd PORTVERSION= 1.8.4 -PORTREVISION= 7 -PORTEPOCH= 1 +PORTEPOCH= 2 CATEGORIES+= graphics MASTER_SITES= http://www.boutell.com/gd/http/ \ ftp://ftp.boutell.com/pub/boutell/gd/ \ @@ -21,19 +20,30 @@ COMMENT?= A graphics library for fast creation of images LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ freetype.9:${PORTSDIR}/print/freetype2 +.if defined(WITH_XPM) +.if defined(WITHOUT_X11) +LIB_DEPENDS+= Xpm:${PORTSDIR}/graphics/xpm +CPPFLAGS+= -I${X11BASE}/include/X11 -I${X11BASE}/include -DHAVE_LIBXPM +LDFLAGS+= -L${X11BASE}/lib -lXpm +.else +USE_XPM= yes +CPPFLAGS+= -I${X11BASE}/include/X11 -I${X11BASE}/include -DHAVE_LIBXPM +LDFLAGS+= -L${X11BASE}/lib -lXpm -lX11 +.endif +.endif + +MAKE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" + +LATEST_LINK= gd1 MAKEFILE= ${FILESDIR}/Makefile.lib INSTALLS_SHLIB= yes -.if defined(WITH_X11) -USE_XPM= yes -.endif - pre-everything:: -.if !defined(WITH_X11) +.if !defined(WITH_XPM) @${ECHO_MSG} @${ECHO_MSG} "If you want to compile with Xpm support," - @${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_X11=yes\"" + @${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_XPM=yes\"" @${ECHO_MSG} .endif diff --git a/graphics/gd1/files/Makefile.lib b/graphics/gd1/files/Makefile.lib index 8306444eb839..78c024d321f3 100644 --- a/graphics/gd1/files/Makefile.lib +++ b/graphics/gd1/files/Makefile.lib @@ -22,13 +22,9 @@ SRCS= gd.c gd_gd.c gd_gd2.c gd_io.c gd_io_dp.c gd_io_file.c gd_ss.c \ CFLAGS+= -I${.CURDIR} -I${LOCALBASE}/include/freetype2/freetype \ -I${LOCALBASE}/include/freetype2 -I${LOCALBASE}/include \ - -DHAVE_LIBPNG -DHAVE_LIBJPEG -DHAVE_LIBFREETYPE -DHAVE_LIBZ -LDADD= -L${LOCALBASE}/lib -lfreetype -ljpeg -lpng -lz - -.ifdef WITH_X11 -CFLAGS+= -I${X11BASE}/include/X11 -I${X11BASE}/include -DHAVE_LIBXPM -LDADD+= -L${X11BASE}/lib -lXpm -lX11 -.endif + -DHAVE_LIBPNG -DHAVE_LIBJPEG -DHAVE_LIBFREETYPE -DHAVE_LIBZ \ + ${CPPFLAGS} +LDADD= -L${LOCALBASE}/lib -lfreetype -ljpeg -lpng -lz ${LDFLAGS} beforeinstall: mkdir -p ${INCSDIR} |