Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 11 Mar 2003 00:39:23 GMT
From:      "Philip M. Gollucci" <philip@p6m7g8.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/49094: Update: graphics/gd2 2.0.1_3 -> 2.0.11_4
Message-ID:  <200303110039.h2B0dNQO031698@p6m7g8.com>

next in thread | raw e-mail | index | archive | help

>Number:         49094
>Category:       ports
>Synopsis:       Update: graphics/gd2 2.0.1_3 -> 2.0.11_4
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 10 21:40:02 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Philip M. Gollucci
>Release:        FreeBSD 5.0-RELEASE i386
>Organization:
P6M7G8 Consulting
>Environment:
System: FreeBSD p6m7g8.com 5.0-RELEASE FreeBSD 5.0-RELEASE #0: Thu Jan 16 22:16:53 GMT 2003 root@hollin.btc.adaptec.com:/usr/obj/usr/src/sys/GENERIC i386

>Description:
  I've included:
   1) a shar of the whole thing.  
   2) a cvs diff -u
   3) patch-configure.pl (a new file)

   This is the first step in getting p5-GD2 to install and build.  Which I will work on next.
>How-To-Repeat:
>Fix:

--- gd2.shar begins here ---
# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	gd2
#	gd2/CVS
#	gd2/CVS/Root
#	gd2/CVS/Repository
#	gd2/CVS/Entries
#	gd2/CVS/Template
#	gd2/files
#	gd2/files/CVS
#	gd2/files/CVS/Root
#	gd2/files/CVS/Repository
#	gd2/files/CVS/Entries
#	gd2/files/CVS/Template
#	gd2/files/patch-configure.pl
#	gd2/Makefile
#	gd2/distinfo
#	gd2/pkg-descr
#	gd2/pkg-plist
#	gd2/scripts
#	gd2/scripts/CVS
#	gd2/scripts/CVS/Root
#	gd2/scripts/CVS/Repository
#	gd2/scripts/CVS/Entries
#	gd2/scripts/CVS/Template
#	gd2/scripts/configure
#
echo c - gd2
mkdir -p gd2 > /dev/null 2>&1
echo c - gd2/CVS
mkdir -p gd2/CVS > /dev/null 2>&1
echo x - gd2/CVS/Root
sed 's/^X//' >gd2/CVS/Root << 'END-of-gd2/CVS/Root'
X:pserver:anoncvs@anoncvs.FreeBSD.org:/home/ncvs
END-of-gd2/CVS/Root
echo x - gd2/CVS/Repository
sed 's/^X//' >gd2/CVS/Repository << 'END-of-gd2/CVS/Repository'
Xports/graphics/gd2
END-of-gd2/CVS/Repository
echo x - gd2/CVS/Entries
sed 's/^X//' >gd2/CVS/Entries << 'END-of-gd2/CVS/Entries'
X/Makefile/1.59/Thu Feb 20 18:14:33 2003//
X/distinfo/1.17/Tue May 21 07:41:54 2002//
X/pkg-descr/1.6/Tue May 21 07:41:54 2002//
X/pkg-plist/1.13/Tue May 21 07:41:54 2002//
XD/files////
XD/scripts////
END-of-gd2/CVS/Entries
echo x - gd2/CVS/Template
sed 's/^X//' >gd2/CVS/Template << 'END-of-gd2/CVS/Template'
X
XPR:		
XSubmitted by:	
XReviewed by:	
XApproved by:	
XObtained from:	
XMFC after:	
XCVS: ----------------------------------------------------------------------
XCVS: PR:              Fill this in if a GNATS PR is affected by the change.
XCVS: Submitted by:    Fill this in if someone else sent in the change.
XCVS: Reviewed by:     Fill this in if someone else reviewed your modification.
XCVS: Approved by:     Fill this in if you needed approval for this commit.
XCVS: Obtained from:   Fill this in if the change is from third party software.
XCVS: MFC after:       N [day[s]|week[s]|month[s]]
XCVS:	Fill in to get MFC notification later. (days assumed unless specified)
END-of-gd2/CVS/Template
echo c - gd2/files
mkdir -p gd2/files > /dev/null 2>&1
echo c - gd2/files/CVS
mkdir -p gd2/files/CVS > /dev/null 2>&1
echo x - gd2/files/CVS/Root
sed 's/^X//' >gd2/files/CVS/Root << 'END-of-gd2/files/CVS/Root'
X:pserver:anoncvs@anoncvs.FreeBSD.org:/home/ncvs
END-of-gd2/files/CVS/Root
echo x - gd2/files/CVS/Repository
sed 's/^X//' >gd2/files/CVS/Repository << 'END-of-gd2/files/CVS/Repository'
Xports/graphics/gd2/files
END-of-gd2/files/CVS/Repository
echo x - gd2/files/CVS/Entries
sed 's/^X//' >gd2/files/CVS/Entries << 'END-of-gd2/files/CVS/Entries'
X/Makefile.bsd/1.7/Tue Jul 16 18:19:27 2002//
X/gd2togif.c/1.1/Tue May 21 07:41:54 2002//
X/gd_biggif_out.c/1.1/Tue May 21 07:41:54 2002//
X/gd_gif_in.c/1.1/Tue May 21 07:41:54 2002//
X/gd_gif_out.c/1.1/Tue May 21 07:41:54 2002//
X/gd_lzw_out.c/1.1/Tue May 21 07:41:54 2002//
X/gdcmpgif.c/1.1/Tue May 21 07:41:54 2002//
X/giftogd2.c/1.1/Tue May 21 07:41:54 2002//
X/patch-Makefile/1.1/Tue May 21 07:41:54 2002//
X/patch-gd.c/1.1/Tue May 21 07:41:54 2002//
X/patch-gd.h/1.1/Tue May 21 07:41:54 2002//
X/patch-gd_png.c/1.1/Tue May 21 07:41:54 2002//
X/patch-gdcache.h/1.1/Tue May 21 07:41:54 2002//
X/patch-gdft.c/1.1/Tue May 21 07:41:54 2002//
X/patch-gdtest.c/1.1/Tue May 21 07:41:54 2002//
X/patch-gdtestft.c/1.1/Tue May 21 07:41:54 2002//
X/patch-index.html/1.1/Tue May 21 07:41:54 2002//
X/patch-webpng.c/1.1/Tue May 21 07:41:54 2002//
XD
END-of-gd2/files/CVS/Entries
echo x - gd2/files/CVS/Template
sed 's/^X//' >gd2/files/CVS/Template << 'END-of-gd2/files/CVS/Template'
X
XPR:		
XSubmitted by:	
XReviewed by:	
XApproved by:	
XObtained from:	
XMFC after:	
XCVS: ----------------------------------------------------------------------
XCVS: PR:              Fill this in if a GNATS PR is affected by the change.
XCVS: Submitted by:    Fill this in if someone else sent in the change.
XCVS: Reviewed by:     Fill this in if someone else reviewed your modification.
XCVS: Approved by:     Fill this in if you needed approval for this commit.
XCVS: Obtained from:   Fill this in if the change is from third party software.
XCVS: MFC after:       N [day[s]|week[s]|month[s]]
XCVS:	Fill in to get MFC notification later. (days assumed unless specified)
END-of-gd2/files/CVS/Template
echo x - gd2/files/patch-configure.pl
sed 's/^X//' >gd2/files/patch-configure.pl << 'END-of-gd2/files/patch-configure.pl'
X--- configure.pl.orig	Wed Oct 23 14:25:31 2002
X+++ configure.pl	Mon Mar 10 22:34:41 2003
X@@ -7,14 +7,13 @@
X #directories that don't happen to exist on your system shouldn't
X #cause an error (if they do, let me know).
X 
X-$includeDirs = "-I/usr/include/freetype2 -I/usr/local/include/freetype2 " .
X-	"-I/usr/include/X11 -I/usr/X11R6/include/X11 -I/usr/local/include";
X+$includeDirs = "-I/usr/local/include/ -I/usr/X11R6/include -I/usr/local/include/freetype2";
X 
X #Typical install locations for freetype, zlib, Xpm and libpng libraries.
X #If yours are somewhere else, other than a standard location
X #such as /lib or /usr/lib, then change this. This line shouldn't hurt 
X #if you don't actually have some of the optional libraries and directories.
X-$libDirs = "-L/usr/lib/X11 -L/usr/X11R6/lib -L/usr/local/lib";
X+$libDirs = "-L/usr/local/lib -L/usr/X11R6/lib -L.";
X 
X #If you don't have gcc, get it. If you really must, you can change this; 
X #but if you do, you must specify not only your compiler but options 
X@@ -22,7 +21,7 @@
X $compiler = "gcc -fPIC";
X 
X #Default installation prefix if --prefix is not used.
X-$installPrefix = "/usr";
X+$installPrefix = "/usr/local";
X 
X #End Of Frequently Changed Settings
X #
X@@ -202,7 +201,7 @@
X # Update these with each release!
X 
X MAJOR_VERSION=2
X-VERSION=2.0.4
X+VERSION=2.0.11
X 
X COMPILER=$compiler
X 
X@@ -236,8 +235,11 @@
X 
X test: \$(TEST_PROGRAMS)
X 
X-install: libgd.so.\${VERSION} $safePrograms
X-$installCommands	sh ./install-item 755 bdftogd \$(INSTALL_BIN)/bdftogd
X+install: libgd.so.\${VERSION} 
X+
X+install-progs:	$safePrograms
X+	$installCommands
X+	sh ./install-item 755 bdftogd \$(INSTALL_BIN)/bdftogd
X 	sh ./install-item 644 gd.h \$(INSTALL_INCLUDE)/gd.h
X 	sh ./install-item 644 gdcache.h \$(INSTALL_INCLUDE)/gdcache.h
X 	sh ./install-item 644 gd_io.h \$(INSTALL_INCLUDE)/gd_io.h
X@@ -304,16 +306,7 @@
X #actually find it.
X 
X libgd.so.\${VERSION}: \${LIBOBJS}
X-	-rm -f libgd.so.\${VERSION} 2>/dev/null
X 	\${LINK_SHARED_HEAD} -o libgd.so.\${VERSION} \${LIBOBJS} ${LINK_SHARED_TAIL}
X-	sh ./install-item 644 libgd.so.\${VERSION} \\
X-		\$(INSTALL_LIB)/libgd.so.\${VERSION}
X-	-rm \$(INSTALL_LIB)/libgd.so.\${MAJOR_VERSION} 2>/dev/null
X-	ln -s \$(INSTALL_LIB)/libgd.so.\${VERSION} \\
X-		\$(INSTALL_LIB)/libgd.so.\${MAJOR_VERSION}	
X-	-rm \$(INSTALL_LIB)/libgd.so 2>/dev/null
X-	ln -s \$(INSTALL_LIB)/libgd.so.\${VERSION} \\
X-		\$(INSTALL_LIB)/libgd.so	
X 
X #Static library, if you really need one for some reason.
X libgd.a: \${LIBOBJS}
END-of-gd2/files/patch-configure.pl
echo x - gd2/Makefile
sed 's/^X//' >gd2/Makefile << 'END-of-gd2/Makefile'
X# New ports collection makefile for:	gd2
X# Date created:         27 Mar 1998
X# Whom:                 jeff@cetlink.net
X#
X# $FreeBSD: ports/graphics/gd2/Makefile,v 1.59 2003/02/20 18:14:33 knu Exp $
X#
X
XPORTNAME=	gd
XPORTVERSION=	2.0.11
XPORTREVISION=	4
XCATEGORIES+=	graphics
XMASTER_SITES=	http://www.boutell.com/gd/http/ \
X		ftp://ftp.boutell.com/pub/boutell/gd/ \
X		${MASTER_SITE_RINGSERVER}
XMASTER_SITE_SUBDIR=	graphics/gd
X
XMAINTAINER?=	ports@FreeBSD.org
XCOMMENT=	A graphics library for fast creation of images
X
XLIB_DEPENDS=	png:${PORTSDIR}/graphics/png \
X		jpeg:${PORTSDIR}/graphics/jpeg \
X		freetype:${PORTSDIR}/print/freetype2
X
XLATEST_LINK=	gd2
X
X.ifndef WITHOUT_XPM
X# Temporary hack, until X-less XPM building is added to USE_XPM:
X.ifndef WITHOUT_X11
XUSE_XPM=	yes
X.else
XLIB_DEPENDS+=	Xpm:${PORTSDIR}/graphics/xpm
X.endif
X.else
XMAKE_ARGS+=	-DWITHOUT_XPM
X.endif
X
XINSTALLS_SHLIB=	yes
XMAKE_ARGS+=	-j2
X
X.if defined(GD_FONTS)
XUSE_PERL5_BUILD=yes
XSCRIPTS_ENV+=	GD_FONTS="${GD_FONTS}"
X.endif
X
Xdo-configure:
X	@cd ${WRKSRC} ; \
X	${PERL} configure.pl
X
Xdo-build:
X	@cd ${WRKSRC} ; \
X	${MAKE} install libgd.a
X
Xpre-install:
X	@cd ${WRKSRC} ; \
X	${INSTALL_DATA} lib${PORTNAME}.so.${PORTVERSION} ${LOCALBASE}/lib
X	@${LN} -fs ${LOCALBASE}/lib/libgd.so.${PORTVERSION} ${LOCALBASE}/lib/libgd.so.2
X	@${LN} -fs ${LOCALBASE}/lib/libgd.so.${PORTVERSION} ${LOCALBASE}/lib/libgd.so
X	@${LN} -fs ${LOCALBASE}/lib/libgd.a ${LOCALBASE}/lib/libgd.a
X
Xdo-install:
X	@cd ${WRKSRC} ; \
X	${MAKE} install-progs
X
Xpost-install:
X.if !defined(NOPORTDOCS)
X	@${MKDIR} ${DOCSDIR}
X	${INSTALL_DATA} ${WRKSRC}/index.html ${DOCSDIR}
X.endif
X
X.include <bsd.port.mk>
END-of-gd2/Makefile
echo x - gd2/distinfo
sed 's/^X//' >gd2/distinfo << 'END-of-gd2/distinfo'
XMD5 (gd-2.0.11.tar.gz) = e2b6a14e7ac9781789e5d9f189af8475
END-of-gd2/distinfo
echo x - gd2/pkg-descr
sed 's/^X//' >gd2/pkg-descr << 'END-of-gd2/pkg-descr'
Xgd is a graphics library. It allows your code to quickly draw images
Xcomplete with lines, arcs, text, multiple colors, cut and paste from
Xother images, and flood fills, and write out the result as a PNG, GIF
Xor JPEG file. This is particularly useful in World Wide Web applications,
Xwhere PNG, GIF and JPEG are three of the formats accepted for inline
Ximages by most browsers.
X
Xgd does  not provide for every possible desirable graphics operation,
Xbut version 2.0 does include most frequently requested features,
Xincluding both truecolor and palette images, resampling (smooth
Xresizing of truecolor images) and so forth.
X
XWWW: http://www.boutell.com/gd/
X
X- Alex Dupre
Xsysadmin@alexdupre.com
END-of-gd2/pkg-descr
echo x - gd2/pkg-plist
sed 's/^X//' >gd2/pkg-plist << 'END-of-gd2/pkg-plist'
Xbin/bdftogd
Xbin/gd2copypal
Xbin/gd2topng
Xbin/gdparttopng
Xbin/gdtopng
Xbin/pngtogd
Xbin/pngtogd2
Xbin/webpng
Xinclude/gd.h
Xinclude/gd_io.h
Xinclude/gdcache.h
Xinclude/gdfontg.h
Xinclude/gdfontl.h
Xinclude/gdfontmb.h
Xinclude/gdfonts.h
Xinclude/gdfontt.h
Xlib/libgd.a
Xlib/libgd.so
Xlib/libgd.so.2
Xlib/libgd.so.2.0.11
X%%PORTDOCS%%share/doc/gd/index.html
X%%PORTDOCS%%@dirrm share/doc/gd
X
END-of-gd2/pkg-plist
echo c - gd2/scripts
mkdir -p gd2/scripts > /dev/null 2>&1
echo c - gd2/scripts/CVS
mkdir -p gd2/scripts/CVS > /dev/null 2>&1
echo x - gd2/scripts/CVS/Root
sed 's/^X//' >gd2/scripts/CVS/Root << 'END-of-gd2/scripts/CVS/Root'
X:pserver:anoncvs@anoncvs.FreeBSD.org:/home/ncvs
END-of-gd2/scripts/CVS/Root
echo x - gd2/scripts/CVS/Repository
sed 's/^X//' >gd2/scripts/CVS/Repository << 'END-of-gd2/scripts/CVS/Repository'
Xports/graphics/gd2/scripts
END-of-gd2/scripts/CVS/Repository
echo x - gd2/scripts/CVS/Entries
sed 's/^X//' >gd2/scripts/CVS/Entries << 'END-of-gd2/scripts/CVS/Entries'
X/configure/1.2/Sat Jan 12 07:56:11 2002//
XD
END-of-gd2/scripts/CVS/Entries
echo x - gd2/scripts/CVS/Template
sed 's/^X//' >gd2/scripts/CVS/Template << 'END-of-gd2/scripts/CVS/Template'
X
XPR:		
XSubmitted by:	
XReviewed by:	
XApproved by:	
XObtained from:	
XMFC after:	
XCVS: ----------------------------------------------------------------------
XCVS: PR:              Fill this in if a GNATS PR is affected by the change.
XCVS: Submitted by:    Fill this in if someone else sent in the change.
XCVS: Reviewed by:     Fill this in if someone else reviewed your modification.
XCVS: Approved by:     Fill this in if you needed approval for this commit.
XCVS: Obtained from:   Fill this in if the change is from third party software.
XCVS: MFC after:       N [day[s]|week[s]|month[s]]
XCVS:	Fill in to get MFC notification later. (days assumed unless specified)
END-of-gd2/scripts/CVS/Template
echo x - gd2/scripts/configure
sed 's/^X//' >gd2/scripts/configure << 'END-of-gd2/scripts/configure'
X#!/bin/sh
X# $FreeBSD: ports/graphics/gd2/scripts/configure,v 1.2 2002/01/12 07:56:11 mi Exp $
X
X# The GD_FONTS environment variable can be set to specify the gzipped
X# tar-ball containing the fonts in bdf format and the bdf file names.
X#
X# For example:
X# GD_FONTS="/usr/ports/distfiles/x-koi8u.tgz koi6x10.bdf koi8x13.bdf \
X#	koi9x15.bdf koi12x24.bdf koi10x20.bdf"
X#
X# This can be usefull for slave ports, like ukrainian/gd, which may
X# now provide alternative fonts easily.
X
X#	TODO: . handle multiple archiving formats: tgz, tar.bz2, zip
X#	      . allow for passing already extracted font-files
X
Xif [ -z "$GD_FONTS" ]
Xthen
X	echo "GD_FONTS can be set to specify an alternative list of .bdf files"
X	echo "See $0 for details..."
X	exit 0
Xfi
X
Xset $GD_FONTS
X#
X# The  tarball is  the  first argument,  the  tiny, small,  medium-bold,
X# large, and giant fonts follow.
X#
X
Xtarball=$1
Xshift
Xtar -xvzpf $tarball -C $WRKSRC $@
X
Xrm -f $WRKSRC/Makefile.fonts
X
Xfor font in Tiny Small MediumBold Large Giant
Xdo
X	f=`echo $font | tr -d [[:lower:]] | tr [[:upper:]] [[:lower:]]`
X	rm -f $WRKSRC/gdfont$f.[ch]
X	printf 'gdfont%s.c gdfont%s.h: %s\
X		perl ${.CURDIR}/bdftogd gdFont%s font%s < %s\n' \
X		$f $f $1 $font $f $1 >> $WRKSRC/Makefile.fonts
X	shift
Xdone
END-of-gd2/scripts/configure
exit
--- gd2.shar ends here ---

--- diff-2.0.1_3-2.0.11_4.diff begins here ---
? files/patch-configure.pl
cvs server: Diffing .
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/graphics/gd2/Makefile,v
retrieving revision 1.59
diff -u -r1.59 Makefile
--- Makefile	2003/02/20 18:14:33	1.59
+++ Makefile	2003/03/11 05:33:41
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	gd
+# New ports collection makefile for:	gd2
 # Date created:         27 Mar 1998
 # Whom:                 jeff@cetlink.net
 #
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	gd
-PORTVERSION=	2.0.1
-PORTREVISION=	3
+PORTVERSION=	2.0.11
+PORTREVISION=	4
 CATEGORIES+=	graphics
 MASTER_SITES=	http://www.boutell.com/gd/http/ \
 		ftp://ftp.boutell.com/pub/boutell/gd/ \
@@ -15,7 +15,7 @@
 MASTER_SITE_SUBDIR=	graphics/gd
 
 MAINTAINER?=	ports@FreeBSD.org
-COMMENT?=	A graphics library for fast creation of images
+COMMENT=	A graphics library for fast creation of images
 
 LIB_DEPENDS=	png:${PORTSDIR}/graphics/png \
 		jpeg:${PORTSDIR}/graphics/jpeg \
@@ -35,40 +35,36 @@
 .endif
 
 INSTALLS_SHLIB=	yes
-MAKEFILE=	${FILESDIR}/Makefile.bsd
 MAKE_ARGS+=	-j2
-.for v in WRKSRC INSTALL_PROGRAM INSTALL_DATA INSTALL_SCRIPT
-MAKE_ARGS+=	$v="${$v}"
-.endfor
-
-pre-fetch:
-.if !defined(WITH_LZW)
-	@${ECHO_CMD} "************************************************************"
-	@${ECHO_CMD} "*      If you live outside US and Canada, you can define   *"
-	@${ECHO_CMD} "*      WITH_LZW to enable GIF compression support.         *"
-	@${ECHO_CMD} "************************************************************"
-.endif
-
-post-extract:
-	@${CP} ${FILESDIR}/g* ${WRKSRC}
 
-post-patch:
-.if !defined(WITH_LZW)
-	${MV} ${WRKSRC}/gd_gif_out.c ${WRKSRC}/gd_gif_out.c.nogif && \
-		${SED} -e "s|#define LZW_LICENCED||g" \
-			< ${WRKSRC}/gd_gif_out.c.nogif \
-			> ${WRKSRC}/gd_gif_out.c
+.if defined(GD_FONTS)
+USE_PERL5_BUILD=yes
+SCRIPTS_ENV+=	GD_FONTS="${GD_FONTS}"
 .endif
 
+do-configure:
+	@cd ${WRKSRC} ; \
+	${PERL} configure.pl
+
+do-build:
+	@cd ${WRKSRC} ; \
+	${MAKE} install libgd.a
+
+pre-install:
+	@cd ${WRKSRC} ; \
+	${INSTALL_DATA} lib${PORTNAME}.so.${PORTVERSION} ${LOCALBASE}/lib
+	@${LN} -fs ${LOCALBASE}/lib/libgd.so.${PORTVERSION} ${LOCALBASE}/lib/libgd.so.2
+	@${LN} -fs ${LOCALBASE}/lib/libgd.so.${PORTVERSION} ${LOCALBASE}/lib/libgd.so
+	@${LN} -fs ${LOCALBASE}/lib/libgd.a ${LOCALBASE}/lib/libgd.a
+
+do-install:
+	@cd ${WRKSRC} ; \
+	${MAKE} install-progs
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/index.html ${DOCSDIR}
-.endif
-
-.if defined(GD_FONTS)
-USE_PERL5_BUILD=yes
-SCRIPTS_ENV+=	GD_FONTS="${GD_FONTS}"
+	${INSTALL_DATA} ${WRKSRC}/index.html ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/graphics/gd2/distinfo,v
retrieving revision 1.17
diff -u -r1.17 distinfo
--- distinfo	2002/05/21 07:41:54	1.17
+++ distinfo	2003/03/11 05:33:41
@@ -1 +1 @@
-MD5 (gd-2.0.1.tar.gz) = 43af994a97f3300a1165ca4888176ece
+MD5 (gd-2.0.11.tar.gz) = e2b6a14e7ac9781789e5d9f189af8475
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/graphics/gd2/pkg-plist,v
retrieving revision 1.13
diff -u -r1.13 pkg-plist
--- pkg-plist	2002/05/21 07:41:54	1.13
+++ pkg-plist	2003/03/11 05:33:41
@@ -1,11 +1,8 @@
 bin/bdftogd
 bin/gd2copypal
-bin/gd2togif
 bin/gd2topng
-bin/gdcmpgif
 bin/gdparttopng
 bin/gdtopng
-bin/giftogd2
 bin/pngtogd
 bin/pngtogd2
 bin/webpng
@@ -19,6 +16,8 @@
 include/gdfontt.h
 lib/libgd.a
 lib/libgd.so
-lib/libgd.so.4
+lib/libgd.so.2
+lib/libgd.so.2.0.11
 %%PORTDOCS%%share/doc/gd/index.html
 %%PORTDOCS%%@dirrm share/doc/gd
+
cvs server: Diffing files
cvs server: cannot find files/Makefile.bsd
cvs server: cannot find files/gd2togif.c
cvs server: cannot find files/gd_biggif_out.c
cvs server: cannot find files/gd_gif_in.c
cvs server: cannot find files/gd_gif_out.c
cvs server: cannot find files/gd_lzw_out.c
cvs server: cannot find files/gdcmpgif.c
cvs server: cannot find files/giftogd2.c
cvs server: cannot find files/patch-Makefile
cvs server: cannot find files/patch-gd.c
cvs server: cannot find files/patch-gd.h
cvs server: cannot find files/patch-gd_png.c
cvs server: cannot find files/patch-gdcache.h
cvs server: cannot find files/patch-gdft.c
cvs server: cannot find files/patch-gdtest.c
cvs server: cannot find files/patch-gdtestft.c
cvs server: cannot find files/patch-index.html
cvs server: cannot find files/patch-webpng.c
cvs server: Diffing scripts
--- diff-2.0.1_3-2.0.11_4.diff ends here ---

--- patch-configure.pl begins here ---
--- configure.pl.orig	Wed Oct 23 14:25:31 2002
+++ configure.pl	Mon Mar 10 22:34:41 2003
@@ -7,14 +7,13 @@
 #directories that don't happen to exist on your system shouldn't
 #cause an error (if they do, let me know).
 
-$includeDirs = "-I/usr/include/freetype2 -I/usr/local/include/freetype2 " .
-	"-I/usr/include/X11 -I/usr/X11R6/include/X11 -I/usr/local/include";
+$includeDirs = "-I/usr/local/include/ -I/usr/X11R6/include -I/usr/local/include/freetype2";
 
 #Typical install locations for freetype, zlib, Xpm and libpng libraries.
 #If yours are somewhere else, other than a standard location
 #such as /lib or /usr/lib, then change this. This line shouldn't hurt 
 #if you don't actually have some of the optional libraries and directories.
-$libDirs = "-L/usr/lib/X11 -L/usr/X11R6/lib -L/usr/local/lib";
+$libDirs = "-L/usr/local/lib -L/usr/X11R6/lib -L.";
 
 #If you don't have gcc, get it. If you really must, you can change this; 
 #but if you do, you must specify not only your compiler but options 
@@ -22,7 +21,7 @@
 $compiler = "gcc -fPIC";
 
 #Default installation prefix if --prefix is not used.
-$installPrefix = "/usr";
+$installPrefix = "/usr/local";
 
 #End Of Frequently Changed Settings
 #
@@ -202,7 +201,7 @@
 # Update these with each release!
 
 MAJOR_VERSION=2
-VERSION=2.0.4
+VERSION=2.0.11
 
 COMPILER=$compiler
 
@@ -236,8 +235,11 @@
 
 test: \$(TEST_PROGRAMS)
 
-install: libgd.so.\${VERSION} $safePrograms
-$installCommands	sh ./install-item 755 bdftogd \$(INSTALL_BIN)/bdftogd
+install: libgd.so.\${VERSION} 
+
+install-progs:	$safePrograms
+	$installCommands
+	sh ./install-item 755 bdftogd \$(INSTALL_BIN)/bdftogd
 	sh ./install-item 644 gd.h \$(INSTALL_INCLUDE)/gd.h
 	sh ./install-item 644 gdcache.h \$(INSTALL_INCLUDE)/gdcache.h
 	sh ./install-item 644 gd_io.h \$(INSTALL_INCLUDE)/gd_io.h
@@ -304,16 +306,7 @@
 #actually find it.
 
 libgd.so.\${VERSION}: \${LIBOBJS}
-	-rm -f libgd.so.\${VERSION} 2>/dev/null
 	\${LINK_SHARED_HEAD} -o libgd.so.\${VERSION} \${LIBOBJS} ${LINK_SHARED_TAIL}
-	sh ./install-item 644 libgd.so.\${VERSION} \\
-		\$(INSTALL_LIB)/libgd.so.\${VERSION}
-	-rm \$(INSTALL_LIB)/libgd.so.\${MAJOR_VERSION} 2>/dev/null
-	ln -s \$(INSTALL_LIB)/libgd.so.\${VERSION} \\
-		\$(INSTALL_LIB)/libgd.so.\${MAJOR_VERSION}	
-	-rm \$(INSTALL_LIB)/libgd.so 2>/dev/null
-	ln -s \$(INSTALL_LIB)/libgd.so.\${VERSION} \\
-		\$(INSTALL_LIB)/libgd.so	
 
 #Static library, if you really need one for some reason.
 libgd.a: \${LIBOBJS}
--- patch-configure.pl ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports-bugs" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200303110039.h2B0dNQO031698>