From owner-freebsd-ports Thu Sep 18 13:20:06 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.7/8.8.7) id NAA03331 for ports-outgoing; Thu, 18 Sep 1997 13:20:06 -0700 (PDT) Received: (from gnats@localhost) by hub.freebsd.org (8.8.7/8.8.7) id NAA03290; Thu, 18 Sep 1997 13:20:02 -0700 (PDT) Resent-Date: Thu, 18 Sep 1997 13:20:02 -0700 (PDT) Resent-Message-Id: <199709182020.NAA03290@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 NAA03096 for ; Thu, 18 Sep 1997 13:15:20 -0700 (PDT) Received: (qmail 13933 invoked by uid 900); 18 Sep 1997 20:09:43 -0000 Message-Id: <19970918200943.13932.qmail@MinJe.com.TW> Date: 18 Sep 1997 20:09:43 -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/4573: update imlib Sender: owner-freebsd-ports@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk >Number: 4573 >Category: ports >Synopsis: patch some "runtime" problem >Confidential: yes >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Sep 18 13:20:01 PDT 1997 >Last-Modified: >Originator: Vanill I. Shu >Organization: Cray running FreeBSD >Release: FreeBSD 3.0-CURRENT i386 >Environment: >Description: add JPEG_DIR in Imakefile, because netpbm and jpeg are not om same directory, and Add RUN_DEPENDS... (i miss it sometime ago) >How-To-Repeat: >Fix: diff -ruN imlib.orig/Makefile imlib/Makefile --- imlib.orig/Makefile Mon Sep 15 12:42:35 1997 +++ imlib/Makefile Fri Sep 19 03:31:35 1997 @@ -14,6 +14,10 @@ MAINTAINER= vanilla@MinJe.com.TW +RUN_DEPENDS= djpeg:${PORTSDIR}/graphics/jpeg \ + tgatoppm:${PORTSDIR}/graphics/netpbm \ + convert:${PORTSDIR}/graphics/ImageMagick + USE_GMAKE= yes USE_IMAKE= yes WRKSRC= ${WRKDIR}/imlib diff -ruN imlib.orig/patches/patch-aa imlib/patches/patch-aa --- imlib.orig/patches/patch-aa Mon Sep 15 12:42:36 1997 +++ imlib/patches/patch-aa Fri Sep 19 03:29:29 1997 @@ -1,7 +1,7 @@ -*** Imakefile.orig Thu Aug 28 21:36:09 1997 ---- Imakefile Mon Sep 15 04:31:02 1997 +*** Imakefile.orig Thu Aug 28 20:36:09 1997 +--- Imakefile Fri Sep 19 03:29:21 1997 *************** -*** 6,20 **** +*** 6,27 **** /* ---------------------------------------------------------------- */ LIBNAME=Im @@ -17,7 +17,14 @@ #endif /* def UseEtcX11 */ CNFDIR = $(ETCDIR) ---- 6,20 ---- + + 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 @@ -25,6 +32,7 @@ ! CONVERT_DIR=/usr/X11R6/bin ! NETPBM_DIR=/usr/X11R6/bin +! JPEG_DIR=/usr/local/bin #ifdef UseEtcX11 ETCDIR=/etc/X11/$(LIBNAME) @@ -33,7 +41,15 @@ #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 @@ -42,7 +58,7 @@ InstallMultipleFlags($(CNFS) $(PALS),$(CNFDIR),$(CNFFLAGS)) DependTarget() ---- 64,70 ---- +--- 66,72 ---- CNFSRC = ./sys_conf CNFS = $(CNFSRC)/imrc PALS = $(CNFSRC)/im_palette.pal diff -ruN imlib.orig/patches/patch-ab imlib/patches/patch-ab --- imlib.orig/patches/patch-ab Thu Jan 1 08:00:00 1970 +++ imlib/patches/patch-ab Fri Sep 19 03:25:36 1997 @@ -0,0 +1,21 @@ +*** 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); >Audit-Trail: >Unformatted: