From owner-freebsd-ports Sat Nov 15 12:00:07 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.7/8.8.7) id MAA07482 for ports-outgoing; Sat, 15 Nov 1997 12:00:07 -0800 (PST) (envelope-from owner-freebsd-ports) Received: (from gnats@localhost) by hub.freebsd.org (8.8.7/8.8.7) id MAA07421; Sat, 15 Nov 1997 12:00:01 -0800 (PST) (envelope-from gnats) Resent-Date: Sat, 15 Nov 1997 12:00:01 -0800 (PST) Resent-Message-Id: <199711152000.MAA07421@hub.freebsd.org> Resent-From: gnats (GNATS Management) Resent-To: freebsd-ports Resent-Reply-To: FreeBSD-gnats@FreeBSD.ORG, pst@Shockwave.COM Received: from precipice.shockwave.com (precipice.shockwave.com [207.105.15.229]) by hub.freebsd.org (8.8.7/8.8.7) with ESMTP id LAA04875 for ; Sat, 15 Nov 1997 11:54:20 -0800 (PST) (envelope-from pst@Shockwave.COM) Received: (from pst@localhost) by precipice.shockwave.com (8.8.8/8.7.3) id LAA04908; Sat, 15 Nov 1997 11:53:21 -0800 (PST) Message-Id: <199711151953.LAA04908@precipice.shockwave.com> Date: Sat, 15 Nov 1997 11:53:21 -0800 (PST) From: Paul Traina Reply-To: pst@Shockwave.COM To: FreeBSD-gnats-submit@FreeBSD.ORG Cc: vanilla@MinJe.com.TW X-Send-Pr-Version: 3.2 Subject: ports/5055: imlib-DR-0.7 upgrade submission Sender: owner-freebsd-ports@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk >Number: 5055 >Category: ports >Synopsis: imlib-DR-0.7 upgrade submission >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Nov 15 12:00:00 PST 1997 >Last-Modified: >Originator: Paul Traina >Organization: >Release: FreeBSD 3.0-CURRENT i386 >Environment: >Description: Please upgrade the imlib port to DR-0.7. It fixes several problems in imlib. If you don't have time to do it, send me e-mail and I'll update it. >How-To-Repeat: >Fix: Index: Makefile =================================================================== RCS file: /cvs/freebsd/ports/graphics/imlib/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- Makefile 1997/11/04 03:57:54 1.8 +++ Makefile 1997/11/15 06:10:38 @@ -6,7 +6,7 @@ # $Id: Makefile,v 1.8 1997/11/04 03:57:54 asami Exp $ # -DISTNAME= imlib_DR-0.5.1 +DISTNAME= imlib_DR-0.7 CATEGORIES= graphics MASTER_SITES= ftp://cthulhu.mandrake.net/pub/imlib/ @@ -18,7 +18,7 @@ USE_GMAKE= yes USE_IMAKE= yes -WRKSRC= ${WRKDIR}/imlib-0.5.1 +WRKSRC= ${WRKDIR}/imlib post-patch: $(CP) $(WRKSRC)/Imakefile $(WRKSRC)/Imakefile.pat Index: files/md5 =================================================================== RCS file: /cvs/freebsd/ports/graphics/imlib/files/md5,v retrieving revision 1.5 diff -u -r1.5 md5 --- md5 1997/11/04 00:32:46 1.5 +++ md5 1997/11/15 06:10:08 @@ -1 +1 @@ -MD5 (imlib_DR-0.5.1.tar.gz) = 26484e1cbf5c431aa46ea4eb2e34b590 +MD5 (imlib_DR-0.7.tar.gz) = dac6e7501fd668704155b37c43484bed Index: patches/patch-aa =================================================================== RCS file: /cvs/freebsd/ports/graphics/imlib/patches/patch-aa,v retrieving revision 1.6 diff -u -r1.6 patch-aa --- patch-aa 1997/09/19 03:47:35 1.6 +++ patch-aa 1997/11/15 06:15:50 @@ -1,68 +1,70 @@ -*** Imakefile.orig Thu Aug 28 20:36:09 1997 ---- Imakefile Fri Sep 19 03:29:21 1997 -*************** -*** 6,27 **** - /* ---------------------------------------------------------------- */ - - LIBNAME=Im -! LIBREV=1.0 - -! CONVERT_DIR=/usr/bin -! NETPBM_DIR=/usr/bin - - #ifdef UseEtcX11 - ETCDIR=/etc/X11/$(LIBNAME) - #else -! ETCDIR=/etc - #endif /* def UseEtcX11 */ - - CNFDIR = $(ETCDIR) - - DEFINES = -DSYSTEM_IMRC=\"$(ETCDIR)/imrc\" \ - -DCONVERT_PATH=\"$(CONVERT_DIR)\" \ -! -DNETPBM_PATH=\"$(NETPBM_DIR)\" - - SRCS = load.c rend.c misc.c colors.c cache.c - OBJS = load.o rend.o misc.o colors.o cache.o ---- 6,29 ---- - /* ---------------------------------------------------------------- */ - - LIBNAME=Im -! LIBREV=3.0 - -! CONVERT_DIR=/usr/X11R6/bin -! NETPBM_DIR=/usr/X11R6/bin -! JPEG_DIR=/usr/local/bin - - #ifdef UseEtcX11 - ETCDIR=/etc/X11/$(LIBNAME) - #else -! ETCDIR=/usr/X11R6/lib/X11/enlightenment - #endif /* def UseEtcX11 */ - - CNFDIR = $(ETCDIR) - - DEFINES = -DSYSTEM_IMRC=\"$(ETCDIR)/imrc\" \ - -DCONVERT_PATH=\"$(CONVERT_DIR)\" \ -! -DNETPBM_PATH=\"$(NETPBM_DIR)\" \ -! -DJPEG_PATH=\"$(JPEG_DIR)\" - - SRCS = load.c rend.c misc.c colors.c cache.c - OBJS = load.o rend.o misc.o colors.o cache.o -*************** InstallMultiple($(HDRS),$(INCROOT)/X11) -*** 64,70 **** - CNFSRC = ./sys_conf - CNFS = $(CNFSRC)/imrc - PALS = $(CNFSRC)/im_palette.pal -! CNFFLAGS = -m 0644 -o root -g root - InstallMultipleFlags($(CNFS) $(PALS),$(CNFDIR),$(CNFFLAGS)) - - DependTarget() ---- 66,72 ---- - CNFSRC = ./sys_conf - CNFS = $(CNFSRC)/imrc - PALS = $(CNFSRC)/im_palette.pal -! CNFFLAGS = -m 0644 -o root -g wheel - InstallMultipleFlags($(CNFS) $(PALS),$(CNFDIR),$(CNFFLAGS)) - - DependTarget() +--- Imakefile.orig Wed Nov 12 16:41:48 1997 ++++ Imakefile Fri Nov 14 22:14:52 1997 +@@ -1,30 +1,24 @@ +-/* Comment this out if you want to install config files +- * under /etc/ instead of /etc/X11/Im/ */ +-/*#define UseEtcX11 /* */ +- + /* change this if the INSTALL script didn't get it right */ +-CONVERT_DIR=/usr/local/bin +-NETPBM_DIR=/usr/local/bin ++CONVERT_DIR=/usr/X11R6/bin ++NETPBM_DIR=/usr/X11R6/bin ++JPEG_DIR=/usr/local/bin + + /* change these if you don't like them */ +-INCDIR=/usr/X11/include/X11/ +-LIBDIR=/usr/X11/lib/ +-MANDIR=/usr/X11/man/man3/ ++INCDIR=/usr/X11R6/include/X11/ ++LIBDIR=/usr/X11R6/lib/ ++MANDIR=/usr/X11R6/man/man3/ + + LIBNAME=Im +-LIBREV=0.7 +- +-#ifdef UseEtcX11 +-ETCDIR=/etc/X11/$(LIBNAME) +-#else +-ETCDIR=/etc +-#endif /* def UseEtcX11 */ ++LIBREV=3.1 + ++ETCDIR = /usr/X11R6/lib/X11/enlightenment + CNFDIR = $(ETCDIR) + + DEFINES = -DSYSTEM_IMRC=\"$(ETCDIR)/imrc\" \ + -DCONVERT_PATH=\"$(CONVERT_DIR)\" \ +- -DNETPBM_PATH=\"$(NETPBM_DIR)\" ++ -DNETPBM_PATH=\"$(NETPBM_DIR)\" \ ++ -DJPEG_PATH=\"$(JPEG_DIR)\" ++ + + SRCS = load.c rend.c misc.c colors.c cache.c + OBJS = load.o rend.o misc.o colors.o cache.o +@@ -36,7 +30,6 @@ + INCLUDES = -I. + SYS_LIBRARIES = $(XLIB) + +-/*#ifdef LinuxArchitecture*/ + SHOBJDIR = ./shobj + SHOBJS = $(SHOBJDIR)/load.o $(SHOBJDIR)/rend.o $(SHOBJDIR)/misc.o \ + $(SHOBJDIR)/colors.o $(SHOBJDIR)/cache.o +@@ -59,8 +52,6 @@ + cp -f Imakefile.orig Imakefile + rm -f Imakefile.orig + if [ -d $(SHOBJDIR) ]; then rmdir $(SHOBJDIR); fi +-/*#endif */ +-/* LinuxArchitecture */ + + NormalLibraryTarget($(LIBNAME),$(OBJS)) + InstallLibrary($(LIBNAME),$(LIBDIR)) +@@ -72,7 +63,7 @@ + CNFSRC = ./sys_conf + CNFS = $(CNFSRC)/imrc + PALS = $(CNFSRC)/im_palette.pal +-CNFFLAGS = -m 0644 -o root -g root ++CNFFLAGS = -m 0644 -o root -g wheel + InstallMultipleFlags($(CNFS) $(PALS),$(CNFDIR),$(CNFFLAGS)) + + DependTarget() Index: patches/patch-ac =================================================================== RCS file: /cvs/freebsd/ports/graphics/imlib/patches/patch-ac,v retrieving revision 1.1 diff -u -r1.1 patch-ac --- patch-ac 1997/09/19 03:47:36 1.1 +++ patch-ac 1997/11/15 06:17:26 @@ -1,21 +1,13 @@ -*** load.c.orig Fri Sep 19 03:24:04 1997 ---- load.c Fri Sep 19 03:25:28 1997 -*************** Image *ImlibLoadImage(ImlibData *id, cha -*** 157,164 **** - if (needs_conv) pclose(p); - else fclose(p); - } -! if (!strcasecmp(s,"jpeg")) sprintf(cmd,"%s/djpeg %s", NETPBM_PATH, file); -! else if (!strcasecmp(s,"jpg")) sprintf(cmd,"%s/djpeg %s", NETPBM_PATH, file); - else if (!strcasecmp(s,"bmp")) sprintf(cmd,"%s/bmptoppm %s", NETPBM_PATH, file); - else if (!strcasecmp(s,"ilbm")) sprintf(cmd,"%s/ilbmtoppm %s", NETPBM_PATH, file); - else if (!strcasecmp(s,"ilb")) sprintf(cmd,"%s/ilbmtoppm %s", NETPBM_PATH, file); ---- 157,164 ---- - if (needs_conv) pclose(p); - else fclose(p); - } -! if (!strcasecmp(s,"jpeg")) sprintf(cmd,"%s/djpeg %s", JPEG_PATH, file); -! else if (!strcasecmp(s,"jpg")) sprintf(cmd,"%s/djpeg %s", JPEG_PATH, file); - else if (!strcasecmp(s,"bmp")) sprintf(cmd,"%s/bmptoppm %s", NETPBM_PATH, file); - else if (!strcasecmp(s,"ilbm")) sprintf(cmd,"%s/ilbmtoppm %s", NETPBM_PATH, file); - else if (!strcasecmp(s,"ilb")) sprintf(cmd,"%s/ilbmtoppm %s", NETPBM_PATH, file); +--- load.c.orig Wed Nov 12 16:04:26 1997 ++++ load.c Fri Nov 14 22:17:13 1997 +@@ -160,8 +160,8 @@ + if (needs_conv) pclose(p); + else fclose(p); + } +- if (!strcasecmp(s,"jpeg")) sprintf(cmd,"%s/djpeg %s", NETPBM_PATH, fil); +- else if (!strcasecmp(s,"jpg")) sprintf(cmd,"%s/djpeg %s", NETPBM_PATH, fil); ++ if (!strcasecmp(s,"jpeg")) sprintf(cmd,"%s/djpeg %s", JPEG_PATH, fil); ++ else if (!strcasecmp(s,"jpg")) sprintf(cmd,"%s/djpeg %s", JPEG_PATH, fil); + else if (!strcasecmp(s,"bmp")) sprintf(cmd,"%s/bmptoppm %s", NETPBM_PATH, fil); + else if (!strcasecmp(s,"ilbm")) sprintf(cmd,"%s/ilbmtoppm %s", NETPBM_PATH, fil); + else if (!strcasecmp(s,"ilb")) sprintf(cmd,"%s/ilbmtoppm %s", NETPBM_PATH, fil); Index: pkg/PLIST =================================================================== RCS file: /cvs/freebsd/ports/graphics/imlib/pkg/PLIST,v retrieving revision 1.4 diff -u -r1.4 PLIST --- PLIST 1997/09/14 19:36:43 1.4 +++ PLIST 1997/11/15 06:19:55 @@ -1,6 +1,6 @@ include/X11/imlib.h lib/libIm.a -lib/libIm.so.3.0 +lib/libIm.so.3.1 @exec ldconfig -m %B lib/X11/enlightenment/im_palette.pal lib/X11/enlightenment/imrc >Audit-Trail: >Unformatted: