From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Jun 4 06:20:17 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3744F37B404 for ; Wed, 4 Jun 2003 06:20:17 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D7F8643FD7 for ; Wed, 4 Jun 2003 06:20:14 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h54DKEUp091866 for ; Wed, 4 Jun 2003 06:20:14 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h54DKEYD091865; Wed, 4 Jun 2003 06:20:14 -0700 (PDT) Resent-Date: Wed, 4 Jun 2003 06:20:14 -0700 (PDT) Resent-Message-Id: <200306041320.h54DKEYD091865@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D511F37B401 for ; Wed, 4 Jun 2003 06:19:54 -0700 (PDT) Received: from hfep04.dion.ne.jp (hfep04.dion.ne.jp [203.181.105.70]) by mx1.FreeBSD.org (Postfix) with ESMTP id 03EA243FAF for ; Wed, 4 Jun 2003 06:19:54 -0700 (PDT) (envelope-from tkato@prontomail.com) Received: from localhost ([61.198.221.201]) by hfep04.dion.ne.jp with SMTP id <20030604131947145.FRBR@hfep04.dion.ne.jp> for ; Wed, 4 Jun 2003 22:19:47 +0900 Message-Id: <20030604221855.000af758.tkato@prontomail.com> Date: Wed, 4 Jun 2003 22:18:55 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/52932: Update port: math/ploticus X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Jun 2003 13:20:17 -0000 >Number: 52932 >Category: ports >Synopsis: Update port: math/ploticus >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Jun 04 06:20:14 PDT 2003 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.8-RELEASE i386 >Organization: >Environment: >Description: - Add graphics/ming to LIB_DEPENDS New file: files/patch-src::swf.c Remove file: files/patch-src::Makefile >How-To-Repeat: >Fix: diff -urN /usr/ports/math/ploticus/Makefile math/ploticus/Makefile --- /usr/ports/math/ploticus/Makefile Tue Jun 3 07:54:29 2003 +++ math/ploticus/Makefile Wed Jun 4 10:09:46 2003 @@ -8,6 +8,7 @@ PORTNAME= ploticus PORTVERSION= 2.11 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= http://ploticus.sourceforge.net/download/ DISTNAME= plsrc${PORTVERSION:S/.//} @@ -15,15 +16,27 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Generates plots and graphs from data -LIB_DEPENDS= gd.2:${PORTSDIR}/graphics/gd \ +LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd2 \ jpeg.9:${PORTSDIR}/graphics/jpeg \ + ming.3:${PORTSDIR}/graphics/ming \ png.5:${PORTSDIR}/graphics/png \ freetype.9:${PORTSDIR}/print/freetype2 WRKSRC= ${WRKDIR}/${DISTNAME}/src -USE_XLIB= yes -ALL_TARGET= ${PORTNAME} +FREETYPE_CONFIG?= ${LOCALBASE}/bin/freetype-config + +USE_XPM= yes +MAKE_ARGS= CC="${CC}" FLAGS="${CFLAGS}" \ + LOCALEOBJ="localef.o" LOCALE_FLAG="-DLOCALE" \ + MING="-L${LOCALBASE}/lib -lming" \ + MINGH="-I${LOCALBASE}/include/ming" NOSWFFLAG="" \ + GD18LIBS="`${FREETYPE_CONFIG} --libs` \ + -L${LOCALBASE}/lib -lgd -lpng -lz -ljpeg" \ + GD18H="`${FREETYPE_CONFIG} --cflags` \ + -L${LOCALBASE}/include" \ + GDFREETYPE="-DGDFREETYPE" PREFABS_DIR="${DATADIR}" +ALL_TARGET= plgd18 MAN1= pl.1 diff -urN /usr/ports/math/ploticus/files/patch-src::Makefile math/ploticus/files/patch-src::Makefile --- /usr/ports/math/ploticus/files/patch-src::Makefile Tue Jun 3 02:26:26 2003 +++ math/ploticus/files/patch-src::Makefile Thu Jan 1 09:00:00 1970 @@ -1,88 +0,0 @@ ---- Makefile.orig Sat May 24 15:00:02 2003 -+++ Makefile Sat May 24 15:06:19 2003 -@@ -23,7 +23,7 @@ - ######## Covered by GPL; see the file ./Copyright for details. - - # defaults.. --CC = gcc -+CC ?= gcc - PLATFORM = UNIX - RMCOM = rm -f - XOBJ = x11.o interact.o -@@ -41,7 +41,8 @@ - XLIBS = -L/usr/X11R6/lib -lX11 - XINCLUDEDIR = -I/usr/X11R6/include - #### For FreeBSD uncomment the following and find GD16H or GD18H below and set to -I/usr/local/include --# ADDLIBS = -L/usr/local/lib -+ADDLIBS = -L${LOCALBASE}/lib -+FLAGS = -I${LOCALBASE}/include - - #### For Solaris 2.x uncomment the following.. - # XLIBS = -L/usr/openwin/lib -lX11 -@@ -105,11 +106,11 @@ - # ploticus: pl - - #### For PNG (only) uncomment the following.. (you must have libpng and zlib) --ploticus: plpng --PLPNG = pl --GD16LIBS = -lpng -lz --GD16H = --ZFLAG = -DWZ -+#ploticus: plpng -+#PLPNG = pl -+#GD16LIBS = -lpng -lz -+#GD16H = -+#ZFLAG = -DWZ - - #### For both pseudo-GIF & PNG uncomment the following.. (you must have libpng and zlib) - # ploticus: pl plpng -@@ -121,18 +122,18 @@ - #### (you must have gd 1.84+, libpng, zlib, libjpeg) - # ploticus: plgd18 - # GD18LIBS = -lgd -lpng -lz -ljpeg --# GD18H = --# GDFREETYPE = -+# GD18H = -I${LOCALBASE}/include/gd -+# GDFREETYPE = -DGDFREETYPE - # ZFLAG = -DWZ - - #### For JPEG, WBMP, PNG, and FreeType2, using your copy of GD 1.84+, uncomment the following.. - #### (you must have gd 1.84+, libpng, zlib, libjpeg, libfreetype) - #### Before using set environment var GDFONTPATH to directory containing .ttf files --# ploticus: plgd18 --# GD18LIBS = -lgd -lpng -lz -ljpeg -lfreetype --# GD18H = --# GDFREETYPE = -DGDFREETYPE --# ZFLAG = -DWZ -+ploticus: plgd18 -+GD18LIBS = -lgd -lpng -lz -ljpeg -lfreetype -+GD18H = -I${LOCALBASE}/include/gd -+GDFREETYPE = -DGDFREETYPE -+ZFLAG = -DWZ - - #### To disable all GD image support (no PNG, JPEG, GIF, etc) uncomment the following.. - # ploticus: plnogd -@@ -149,11 +150,11 @@ - #### To set a hard-coded directory for prefabs files, uncomment & edit the following.. - #### If done, users won't be required to have PLOTICUS_PREFABS environment variable defined. - #### This option not available for win32 --# PREFABS_DIR = "/usr/lib/ploticus" -+PREFABS_DIR = "${PREFIX}/share/ploticus" - - #### For LOCALE support (non-roman alphabets & collation), uncomment the following.. --# LOCALEOBJ = localef.o --# LOCALE_FLAG = -DLOCALE -+LOCALEOBJ = localef.o -+LOCALE_FLAG = -DLOCALE - - #### SVG output is always available by default. - #### If you want compressed SVG (.svgz), and you selected "GIF only", "GIF & PNG", or "disable GD" above, -@@ -197,7 +198,7 @@ - - LIBS = $(XLIBS) -lm $(ADDLIBS) - --CFLAGS = -DPLOTICUS -D$(PLATFORM) -DTDH_NOREC $(ZFLAG) $(FLAGS) $(LOCALE_FLAG) \ -+CFLAGS += -DPLOTICUS -D$(PLATFORM) -DTDH_NOREC $(ZFLAG) $(FLAGS) $(LOCALE_FLAG) \ - $(NOGDFLAG) $(NOXFLAG) $(NOPSFLAG) $(NOSVGFLAG) $(NOSWFFLAG) $(XINCLUDEDIR) \ - $(MINGH) $(NORLIMFLAG) -DPREFABS_DIR=\"$(PREFABS_DIR)\" - diff -urN /usr/ports/math/ploticus/files/patch-src::swf.c math/ploticus/files/patch-src::swf.c --- /usr/ports/math/ploticus/files/patch-src::swf.c Thu Jan 1 09:00:00 1970 +++ math/ploticus/files/patch-src::swf.c Wed Jun 4 09:42:36 2003 @@ -0,0 +1,11 @@ +--- swf.c.orig Tue May 20 02:55:58 2003 ++++ swf.c Wed Jun 4 09:41:53 2003 +@@ -80,7 +80,7 @@ + static void swf_TX(char *s); + static void swf_LS(char *s); + static void swf_PO(char *s); +-static void swf_FT(char *s); ++/* static void swf_FT(char *s); */ + static void swf_TR(char *s); + + /* ============================= */ >Release-Note: >Audit-Trail: >Unformatted: