From efb928619b234d49b326a13f59a6e2ee354bf902 Mon Sep 17 00:00:00 2001
From: Norikatsu Shigemura <nork@FreeBSD.org>
Date: Mon, 18 Aug 2003 16:15:10 +0000
Subject: 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]
---
 graphics/gd1/Makefile | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

(limited to 'graphics/gd1/Makefile')

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
 
-- 
cgit v1.2.3