Date: 20 Nov 1997 20:56:35 -0000 From: vanilla@MinJe.com.TW To: FreeBSD-gnats-submit@FreeBSD.ORG Subject: ports/5112: Update imlib to 0.10 Message-ID: <19971120205635.19849.qmail@MinJe.com.TW> Resent-Message-ID: <199711202110.NAA07583@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 5112 >Category: ports >Synopsis: Update imlib to 0.10 >Confidential: yes >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Nov 20 13:10:00 PST 1997 >Last-Modified: >Originator: Vanill I. Shu >Organization: Cray running FreeBSD >Release: FreeBSD 3.0-CURRENT i386 >Environment: >Description: Update imlib to 0.10 i change sharedlib version to 4.0, delete some patch >How-To-Repeat: >Fix: diff -ruN imlib.orig/Makefile imlib/Makefile --- imlib.orig/Makefile Mon Nov 17 12:08:45 1997 +++ imlib/Makefile Fri Nov 21 04:46:56 1997 @@ -1,19 +1,20 @@ # New ports collection makefile for: imlib -# Version required: 0.7 +# Version required: 0.10 # Date created: 10 June 1997 # Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp> # # $Id: Makefile,v 1.9 1997/11/16 09:59:11 fenner Exp $ # -DISTNAME= imlib_DR-0.7 -PKGNAME= imlib-0.7 +DISTNAME= imlib_DR-0.10 +PKGNAME= imlib-0.10 CATEGORIES= graphics MASTER_SITES= ftp://cthulhu.mandrake.net/pub/imlib/ \ http://www.rasterman.com/ftp/ MAINTAINER= vanilla@MinJe.com.TW +LIB_DEPENDS= png\\.0\\.:${PORTSDIR}/graphics/png RUN_DEPENDS= djpeg:${PORTSDIR}/graphics/jpeg \ tgatoppm:${PORTSDIR}/graphics/netpbm \ convert:${PORTSDIR}/graphics/ImageMagick @@ -21,8 +22,6 @@ USE_GMAKE= yes USE_IMAKE= yes WRKSRC= ${WRKDIR}/imlib - -MAN3= imlib.3x post-patch: $(CP) $(WRKSRC)/Imakefile $(WRKSRC)/Imakefile.pat diff -ruN imlib.orig/files/md5 imlib/files/md5 --- imlib.orig/files/md5 Mon Nov 17 12:08:45 1997 +++ imlib/files/md5 Fri Nov 21 04:32:55 1997 @@ -1 +1 @@ -MD5 (imlib_DR-0.7.tar.gz) = dac6e7501fd668704155b37c43484bed +MD5 (imlib_DR-0.10.tar.gz) = c64445d046f0fc26beebe6beb1b78c84 diff -ruN imlib.orig/patches/patch-aa imlib/patches/patch-aa --- imlib.orig/patches/patch-aa Mon Nov 17 12:08:45 1997 +++ imlib/patches/patch-aa Fri Nov 21 04:37:23 1997 @@ -1,50 +1,57 @@ ---- Imakefile.orig Thu Nov 13 08:41:48 1997 -+++ Imakefile Thu Nov 13 13:37:47 1997 -@@ -3,28 +3,30 @@ - /*#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/ +--- Imlib.tmpl.orig Thu Nov 20 16:33:58 1997 ++++ Imlib.tmpl Fri Nov 21 04:35:46 1997 +@@ -5,14 +5,14 @@ + XCOMM ---------------------------- + XCOMM The root directory of where the installation will put include and lib. + +-IMLROOT = /usr/X11 ++IMLROOT = ${X11BASE} + + XCOMM imlib custom configuration file + XCOMM -------------------------------- + XCOMM Change the following to where you would like imrc and imlib.pal + XCOMM to be loaded + +-CNFDIR = /etc ++CNFDIR = ${X11BASE}/lib/X11/enlightenment + + XCOMM Location of the NetPBM Utilities + XCOMM -------------------------------- +@@ -26,7 +26,7 @@ + NETPBM_DIR = /usr/openwin/bin + JPEG_DIR = /usr/openwin/bin + #else +-NETPBM_DIR = /usr/local/bin ++NETPBM_DIR = ${X11BASE}/bin + JPEG_DIR = /usr/local/bin + #endif + +@@ -35,7 +35,7 @@ + XCOMM imlib needs convert and djpeg from the IJG. This is the location + XCOMM of those files. + +-CONVERT_DIR = /usr/local/bin ++CONVERT_DIR = ${X11BASE}/bin + + XCOMM Shared Library Support + XCOMM ---------------------- +@@ -74,7 +74,7 @@ + + #if HasGcc2 /* GNU C */ + DEFINES = +-CDEBUGFLAGS = -Wall -pedantic ++CDEBUGFLAGS += -Wall -pedantic + #elif HasSunC /* Sun's DevPro v2.x and higher */ + DEFINES = -fast -native -D__EXTENSIONS__ + CDEBUGFLAGS = -v +--- Imakefile.orig Thu Nov 20 16:33:31 1997 ++++ Imakefile Fri Nov 21 04:36:59 1997 +@@ -28,7 +28,7 @@ + XCOMM Library we are building and the revision LIBNAME=Im --LIBREV=0.7 -+LIBREV=3.7 - - #ifdef UseEtcX11 - ETCDIR=/etc/X11/$(LIBNAME) - #else --ETCDIR=/etc -+ETCDIR=/usr/X11R6/lib/X11/enlightenment - #endif /* def UseEtcX11 */ - - 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 -@@ -72,7 +74,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)) +-LIBREV=0.10 ++LIBREV=4.0 - DependTarget() + XCOMM This is where we are putting stuff. + IMLLIBDIR=$(IMLROOT)/lib diff -ruN imlib.orig/patches/patch-ab imlib/patches/patch-ab --- imlib.orig/patches/patch-ab Sun Nov 16 17:59:17 1997 +++ imlib/patches/patch-ab Thu Jan 1 08:00:00 1970 @@ -1,13 +0,0 @@ ---- load.c.orig Wed Nov 5 20:10:50 1997 -+++ load.c Wed Nov 12 18:00:19 1997 -@@ -159,8 +159,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); diff -ruN imlib.orig/patches/patch-ac imlib/patches/patch-ac --- imlib.orig/patches/patch-ac Mon Nov 17 12:08:45 1997 +++ imlib/patches/patch-ac Thu Jan 1 08:00:00 1970 @@ -1,11 +0,0 @@ ---- sys_conf.dist/imrc.orig Tue Nov 4 12:11:30 1997 -+++ sys_conf.dist/imrc Thu Nov 13 13:05:34 1997 -@@ -55,7 +55,7 @@ - # these pixmaps themselves, because this will trample all over the cache - # and give very horrid effects, or even make the apps crash with segfaults or - # Xlib errors. --Pixmap_Cache on -+Pixmap_Cache off - # Pixmap cache is in **-> BITS <-**... the end result is APPROXIMATELY - # 10000000 bits of pixmap make your Xserver grow by 1Mb of RAM (VERY rough). - # As wiht any cache, the more, the better. The more you have, the less likely diff -ruN imlib.orig/pkg/PLIST imlib/pkg/PLIST --- imlib.orig/pkg/PLIST Mon Nov 17 12:08:45 1997 +++ imlib/pkg/PLIST Fri Nov 21 04:33:08 1997 @@ -1,8 +1,8 @@ include/X11/imlib.h lib/libIm.a -lib/libIm.so.3.7 +lib/libIm.so.4.0 @exec ldconfig -m %B lib/X11/enlightenment/im_palette.pal lib/X11/enlightenment/imrc -man/man3/imlib.3x.gz +man/man3/imlib.3.gz @dirrm lib/X11/enlightenment >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19971120205635.19849.qmail>