From owner-freebsd-ports Tue Sep 23 22:30:04 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.7/8.8.7) id WAA02143 for ports-outgoing; Tue, 23 Sep 1997 22:30:04 -0700 (PDT) Received: (from gnats@localhost) by hub.freebsd.org (8.8.7/8.8.7) id WAA02135; Tue, 23 Sep 1997 22:30:02 -0700 (PDT) Resent-Date: Tue, 23 Sep 1997 22:30:02 -0700 (PDT) Resent-Message-Id: <199709240530.WAA02135@hub.freebsd.org> Resent-From: gnats (GNATS Management) Resent-To: freebsd-ports Resent-Reply-To: FreeBSD-gnats@FreeBSD.ORG, vanilla@MinJe.com.TW Received: from MinJe.com.TW (qmailr@ns.MinJe.com.TW [210.66.86.1]) by hub.freebsd.org (8.8.7/8.8.7) with SMTP id WAA01675 for ; Tue, 23 Sep 1997 22:23:55 -0700 (PDT) Received: (qmail 7577 invoked by uid 900); 24 Sep 1997 05:18:04 -0000 Message-Id: <19970924051804.7576.qmail@MinJe.com.TW> Date: 24 Sep 1997 05:18:04 -0000 From: vanilla@MinJe.com.TW Reply-To: vanilla@MinJe.com.TW To: FreeBSD-gnats-submit@FreeBSD.ORG X-Send-Pr-Version: 3.2 Subject: ports/4618: Update giflib to 3.0 Sender: owner-freebsd-ports@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk >Number: 4618 >Category: ports >Synopsis: Update giflib to 3.0 >Confidential: yes >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Sep 23 22:30:01 PDT 1997 >Last-Modified: >Originator: Vanill I. Shu >Organization: Cray running FreeBSD >Release: FreeBSD 3.0-CURRENT i386 >Environment: >Description: update giflib to current version (3.0) >How-To-Repeat: >Fix: diff -ruN giflib.orig/Makefile giflib/Makefile --- giflib.orig/Makefile Mon May 5 20:33:44 1997 +++ giflib/Makefile Wed Sep 24 13:08:45 1997 @@ -1,19 +1,16 @@ # New ports collection makefile for: giflib -# Version required: 2.3 +# Version required: 3.0 # Date created: 03 May 1997 # Whom: Thomas Gellekum # # $Id: Makefile,v 1.1.1.1 1997/05/05 12:33:44 tg Exp $ # -DISTNAME= giflib-2.3 +DISTNAME= giflib-3.0 CATEGORIES= graphics -MASTER_SITES= http://www.ccil.org/~esr/ +MASTER_SITES= http://www.ccil.org/~esr/giflib/ MAINTAINER= tg@FreeBSD.ORG - -post-extract: - @${CP} ${FILESDIR}/Makefile ${WRKSRC}/lib post-install: .if !defined(NOPORTDOCS) diff -ruN giflib.orig/files/Makefile giflib/files/Makefile --- giflib.orig/files/Makefile Mon May 5 20:33:44 1997 +++ giflib/files/Makefile Thu Jan 1 08:00:00 1970 @@ -1,24 +0,0 @@ -# giflib - -LIBDIR= ${PREFIX}/lib -INCDIR= ${PREFIX}/include/giflib - -NOPROFILE= no -CFLAGS+= -D__X11__ -I. -I${X11BASE}/include - -SHLIB_MAJOR= 2 -SHLIB_MINOR= 3 - -LIB=gif - -INCS = getarg.h gif_hash.h gif_lib.h - -SRCS = dev2gif.c egif_lib.c dgif_lib.c gifalloc.c gif_font.c gif_hash.c \ - gif_err.c quantize.c qprintf.c getarg.c - -beforeinstall: - @mkdir -p ${INCDIR} - ${INSTALL} -C -m 444 -o $(BINOWN) -g $(BINGRP) ${INCS} ${INCDIR} - -.include - diff -ruN giflib.orig/files/md5 giflib/files/md5 --- giflib.orig/files/md5 Mon May 5 20:33:44 1997 +++ giflib/files/md5 Wed Sep 24 04:57:22 1997 @@ -1 +1 @@ -MD5 (giflib-2.3.tar.gz) = 7197d8419d49f9639386a846651a944c +MD5 (giflib-3.0.tar.gz) = d8fb92324901ec8ae4d8da223875669b diff -ruN giflib.orig/patches/patch-aa giflib/patches/patch-aa --- giflib.orig/patches/patch-aa Mon May 5 20:33:44 1997 +++ giflib/patches/patch-aa Wed Sep 24 07:14:54 1997 @@ -1,16 +1,61 @@ ---- Makefile.orig Thu Dec 7 01:37:17 1995 -+++ Makefile Sat May 3 16:32:09 1997 -@@ -8,11 +8,11 @@ - V=2.3 - - all: -- cd lib; make libgif.a -+ cd lib; make all - cd util; make all - - install: -- cd lib; make install-lib -+ cd lib; make install - cd util; make install-all +--- lib/Makefile.orig Wed Sep 24 05:06:39 1997 ++++ lib/Makefile Wed Sep 24 07:14:42 1997 +@@ -11,9 +11,10 @@ - uninstall: + # + # Where all the include files are: +-INCS = -I. ++INCS = -I. -I${X11BASE}/include + +-LIBDIR = /usr/lib ++INCDIR = ${PREFIX}/include/giflib ++LIBDIR = ${PREFIX}/lib + + # + # What devices we should be able to grab into gif images. Note that if +@@ -63,14 +64,22 @@ + CC = gcc + # + #CFLAGS = -fno-builtin -O -c -W -Wreturn-type -Wcomment +-CFLAGS = -fno-builtin -g -c -W -Wreturn-type -Wcomment ++#CFLAGS = -fno-builtin -g -c -W -Wreturn-type -Wcomment + + + OBJS = dev2gif.o egif_lib.o dgif_lib.o gifalloc.o gif_font.o gif_hash.o \ + gif_err.o quantize.o qprintf.o getarg.o + ++SOBJS = dev2gif.so egif_lib.so dgif_lib.so gifalloc.so gif_font.so \ ++ gif_hash.so gif_err.so quantize.so qprintf.so getarg.so ++ ++.SUFFIXES: .o .so ++ + .c.o: +- $(CC) $(INCS) $(DEVS) $(CFLAGS) $< ++ $(CC) -c $(INCS) $(DEVS) $(CFLAGS) $< ++ ++.c.so: ++ $(CC) -c $(INCS) $(DEVS) $(CFLAGS) -fpic -DPIC -o $@ $< + + all: static shared + +@@ -82,9 +91,9 @@ + ar rcv libgif.a $(OBJS) + -ranlib libgif.a + +-$(SHLIB): $(OBJS) ++$(SHLIB): $(SOBJS) + rm -f libgif.so.$(V) +- gcc -shared -o $(SHLIB) $(OBJS) ++ ld -Bshareable -o $(SHLIB) $(SOBJS) + + dev2gif.o: gif_lib.h + egif_lib.o: gif_lib.h gif_hash.h +@@ -99,6 +108,8 @@ + + install-lib: libgif.a + cp libgif.a libgif.so.$(V) $(LIBDIR) ++ mkdir $(INCDIR) ++ cp *.h $(INCDIR) + + uninstall-lib: shared static + rm -f $(LIBDIR)/libgif.a $(LIBDIR)/$(SHLIB) diff -ruN giflib.orig/patches/patch-ab giflib/patches/patch-ab --- giflib.orig/patches/patch-ab Mon May 5 20:33:44 1997 +++ giflib/patches/patch-ab Wed Sep 24 05:14:58 1997 @@ -1,5 +1,5 @@ ---- util/Makefile.orig Fri May 31 19:34:00 1996 -+++ util/Makefile Mon May 5 14:08:35 1997 +--- util/Makefile.orig Wed Sep 24 05:11:17 1997 ++++ util/Makefile Wed Sep 24 05:13:59 1997 @@ -22,12 +22,13 @@ # X_INC_DIR = /server/sun4/usr/new/lib/X11R4 @@ -24,8 +24,8 @@ -CC = gcc +#CC = gcc #CFLAGS = $(INC) -fno-builtin -O -s -W -Wreturn-type -Wcomment --CFLAGS = $(INC) -fno-builtin -g -lg -W -Wreturn-type -Wcomment -+#CFLAGS = $(INC) -fno-builtin -g -lg -W -Wreturn-type -Wcomment +-CFLAGS = $(INC) -fno-builtin -g -W -Wreturn-type -Wcomment ++#CFLAGS = $(INC) -fno-builtin -g -W -Wreturn-type -Wcomment XLIBS = -lX11 -X_INC_DIR = /usr/X11/include -X_LIB_DIR = /usr/X11/lib diff -ruN giflib.orig/pkg/PLIST giflib/pkg/PLIST --- giflib.orig/pkg/PLIST Mon May 5 20:33:44 1997 +++ giflib/pkg/PLIST Wed Sep 24 05:59:02 1997 @@ -31,44 +31,45 @@ include/giflib/gif_hash.h include/giflib/gif_lib.h lib/libgif.a -lib/libgif.so.2.3 -@exec /sbin/ldconfig -m %B -share/doc/giflib/general.doc -share/doc/giflib/gif2bgi.doc -share/doc/giflib/gif2epsn.doc -share/doc/giflib/gif2herc.doc -share/doc/giflib/gif2iris.doc -share/doc/giflib/gif2ps.doc -share/doc/giflib/gif2rgb.doc -share/doc/giflib/gif2rle.doc -share/doc/giflib/gif2x11.doc -share/doc/giflib/gif89.doc -share/doc/giflib/gif_lib.doc -share/doc/giflib/gifasm.doc -share/doc/giflib/gifbg.doc -share/doc/giflib/gifburst.doc -share/doc/giflib/gifclip.doc -share/doc/giflib/gifclrmp.doc -share/doc/giflib/gifcolor.doc -share/doc/giflib/gifcomb.doc -share/doc/giflib/gifcompose.doc -share/doc/giflib/giffiltr.doc -share/doc/giflib/giffix.doc -share/doc/giflib/gifflip.doc -share/doc/giflib/gifhisto.doc -share/doc/giflib/gifinter.doc -share/doc/giflib/gifinto.doc -share/doc/giflib/gifovly.doc -share/doc/giflib/gifpos.doc -share/doc/giflib/gifrotat.doc -share/doc/giflib/gifrsize.doc -share/doc/giflib/gifspnge.doc -share/doc/giflib/giftext.doc -share/doc/giflib/gifwedge.doc -share/doc/giflib/icon2gif.doc -share/doc/giflib/liberror.doc -share/doc/giflib/lzgif.doc -share/doc/giflib/raw2gif.doc -share/doc/giflib/rgb2gif.doc -share/doc/giflib/rle2gif.doc -share/doc/giflib/text2gif.doc +lib/libgif.so.3.0 +share/doc/giflib/gif2bgi.html +share/doc/giflib/gif2epsn.html +share/doc/giflib/gif2herc.html +share/doc/giflib/gif2iris.html +share/doc/giflib/gif2ps.html +share/doc/giflib/gif2rgb.html +share/doc/giflib/gif2rle.html +share/doc/giflib/gif2x11.html +share/doc/giflib/gif89.txt +share/doc/giflib/gif_lib.html +share/doc/giflib/gifasm.html +share/doc/giflib/gifbg.html +share/doc/giflib/gifburst.html +share/doc/giflib/gifclip.html +share/doc/giflib/gifclrmp.html +share/doc/giflib/gifcolor.html +share/doc/giflib/gifcomb.html +share/doc/giflib/gifcompose.html +share/doc/giflib/giffiltr.html +share/doc/giflib/giffix.html +share/doc/giflib/gifflip.html +share/doc/giflib/gifhisto.html +share/doc/giflib/gifinter.html +share/doc/giflib/gifinto.html +share/doc/giflib/gifovly.html +share/doc/giflib/gifpos.html +share/doc/giflib/gifrotat.html +share/doc/giflib/gifrsize.html +share/doc/giflib/gifspnge.html +share/doc/giflib/giftext.html +share/doc/giflib/gifwedge.html +share/doc/giflib/icon2gif.html +share/doc/giflib/index.html +share/doc/giflib/liberror.html +share/doc/giflib/lzgif.txt +share/doc/giflib/raw2gif.html +share/doc/giflib/rgb2gif.html +share/doc/giflib/rle2gif.html +share/doc/giflib/text2gif.html +@dirrm include/giflib +@dirrm share/doc/giflib >Audit-Trail: >Unformatted: