From owner-freebsd-ports Thu Mar 16 20:40:12 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 0EEBA37BCB7 for ; Thu, 16 Mar 2000 20:40:04 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id UAA32316; Thu, 16 Mar 2000 20:40:03 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from Astrovan.cstone.net (mailstop.cstone.net [205.197.102.13]) by hub.freebsd.org (Postfix) with ESMTP id 05C7237BC6B for ; Thu, 16 Mar 2000 20:34:36 -0800 (PST) (envelope-from root@cstone.net) Received: from newbie.cho.cstone.net ([209.145.64.15]) by Astrovan.cstone.net (Post.Office MTA v3.5.3 release 223 ID# 0-59789U13500L1350S0V35) with ESMTP id net for ; Thu, 16 Mar 2000 23:29:38 -0500 Received: (from root@localhost) by newbie.cho.cstone.net (8.9.3/8.9.3) id XAA60721; Thu, 16 Mar 2000 23:34:33 -0500 (EST) (envelope-from root@mail.cstone.net) Message-Id: <200003170434.XAA60721@newbie.cho.cstone.net> Date: Thu, 16 Mar 2000 23:34:33 -0500 (EST) From: adrian@ubergeeks.com Reply-To: adrian@ubergeeks.com To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/17424: gd port broken because of "in place" update of the distribution. Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 17424 >Category: ports >Synopsis: graphics/gd port is broken because the tarfile is really 1.8.1. >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Thu Mar 16 20:40:02 PST 2000 >Closed-Date: >Last-Modified: >Originator: Adrian Filipi-Martin >Release: FreeBSD 3.4-RELEASE i386 >Organization: Ubergeeks Consulting >Environment: 3.4-RELEASE with the ports area cvsup'd on 3/16/00. >Description: The gd-1.8 distribution has transmutated into gd-1.8.1 without changing the distfile name. This breaks the MD5 checksum and the patches no longer apply cleanly. This problem is significant in that gd is a dependency for several other packages, e.g. gnuplot. >How-To-Repeat: cd /usr/ports/graphics/gd make >Fix: Apply the following patch to the graphics/gd directory. It adjusts the patches and the MD5 checksum. diff -ru gd.orig/Makefile gd/Makefile --- gd.orig/Makefile Wed Mar 15 22:19:20 2000 +++ gd/Makefile Thu Mar 16 23:06:07 2000 @@ -7,6 +7,9 @@ # DISTNAME= gd-1.8 +PKGNAME= gd-1.8.1 +WRKSRC= ${WRKDIR}/${PKGNAME} + CATEGORIES= graphics MASTER_SITES= http://www.boutell.com/gd/http/ \ ftp://ftp.boutell.com/pub/boutell/gd/ diff -ru gd.orig/files/md5 gd/files/md5 --- gd.orig/files/md5 Wed Mar 15 22:19:20 2000 +++ gd/files/md5 Thu Mar 16 23:02:26 2000 @@ -1 +1 @@ -MD5 (gd-1.8.tar.gz) = 81eba35290c2d38beb3aa93ce845e9fb +MD5 (gd-1.8.tar.gz) = 7d3890e728ee5bbde165ef75448d5a3f diff -ru gd.orig/patches/patch-ac gd/patches/patch-ac --- gd.orig/patches/patch-ac Wed Mar 15 22:19:23 2000 +++ gd/patches/patch-ac Thu Mar 16 23:19:20 2000 @@ -1,5 +1,5 @@ ---- Makefile.orig Wed Mar 8 14:54:37 2000 -+++ Makefile Fri Mar 10 21:09:49 2000 +--- Makefile.orig Mon Mar 13 13:25:57 2000 ++++ Makefile Thu Mar 16 23:17:59 2000 @@ -3,35 +3,45 @@ #If you do not have gcc, change the setting for COMPILER, but you must #use an ANSI standard C compiler (NOT the old SunOS 4.1.3 cc @@ -19,27 +19,28 @@ #If you don't have FreeType, libjpeg and/or Xpm installed, including the #header files, uncomment this (default). - #CFLAGS=-O +-CFLAGS=-O ++#CFLAGS=-O #If you do have FreeType, libjpeg and/or Xpm fully installed, uncomment a #variation of this and comment out the line above. See also LIBS below. --CFLAGS=-O -DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF -- +-#CFLAGS=-O -DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF +.if defined(WANT_X11) +CFLAGS+=-DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF +.else +CFLAGS+=-DHAVE_JPEG +.endif -+ + #If you don't have FreeType and/or Xpm fully installed, uncomment this #(default). --#LIBS=-lm -lgd -lpng -lz +-LIBS=-lm -lgd -lpng -lz +LIBS=-lm -lgd -lpng -lz -ljpeg #If you do have FreeType, JPEG and/or Xpm fully installed, uncomment a #variation of this and comment out the line above. Note that #Xpm requires X11. See also CFLAGS above. +-#LIBS=-lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11 +.if defined(WANT_X11) - LIBS=-lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11 ++LIBS=-lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11 +.endif #Typical install locations for freetype, zlib, xpm, libjpeg and libpng header files. diff -ru gd.orig/patches/patch-ad gd/patches/patch-ad --- gd.orig/patches/patch-ad Fri Mar 10 21:30:44 2000 +++ gd/patches/patch-ad Thu Mar 16 23:21:58 2000 @@ -1,18 +1,11 @@ ---- gd_jpeg.c.orig Fri Mar 10 21:15:15 2000 -+++ gd_jpeg.c Fri Mar 10 21:19:40 2000 -@@ -20,12 +20,14 @@ - #include - #include - #include --#include "jinclude.h" -+/* #include "jinclude.h" */ - #include "jpeglib.h" +--- gd_jpeg.c.orig Mon Mar 13 13:25:57 2000 ++++ gd_jpeg.c Thu Mar 16 23:21:34 2000 +@@ -25,6 +25,8 @@ #include "jerror.h" #include "gd.h" - static const char * const GD_JPEG_VERSION = "1.0"; -+ +#define SIZEOF(object) ((size_t) sizeof(object)) ++ + static const char * const GD_JPEG_VERSION = "1.0"; typedef struct _jmpbuf_wrapper { - jmp_buf jmpbuf; >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message