Skip site navigation (1)Skip section navigation (2)
Date:      13 Nov 1997 05:48:12 -0000
From:      vanilla@MinJe.com.TW
To:        FreeBSD-gnats-submit@FreeBSD.ORG
Subject:   ports/5030: Update imlib to 0.7
Message-ID:  <19971113054812.5053.qmail@MinJe.com.TW>
Resent-Message-ID: <199711130600.WAA17325@hub.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         5030
>Category:       ports
>Synopsis:       Update imlib to 0.7
>Confidential:   yes
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports
>State:          open
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Nov 12 22:00:01 PST 1997
>Last-Modified:
>Originator:     Vanill I. Shu
>Organization:
Cray running FreeBSD
>Release:        FreeBSD 3.0-CURRENT i386
>Environment:

>Description:

	Update to 0.7,
	i'm sorry about this,
	but author release 2 version on one day,
	i change sharedlib version to 3.7,
	

>How-To-Repeat:

>Fix:
	
diff -ruN imlib.orig/Makefile imlib/Makefile
--- imlib.orig/Makefile	Wed Nov  5 05:29:22 1997
+++ imlib/Makefile	Thu Nov 13 13:33:18 1997
@@ -1,14 +1,16 @@
 # New ports collection makefile for:   imlib
-# Version required:    0.5.1
+# Version required:    0.7
 # Date created:        10 June 1997
 # Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
 # $Id: Makefile,v 1.8 1997/11/04 03:57:54 asami Exp $
 #
 
-DISTNAME=	imlib_DR-0.5.1
+DISTNAME=	imlib_DR-0.7
+PKGNAME=	imlib-0.7
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://cthulhu.mandrake.net/pub/imlib/
+MASTER_SITES=	ftp://cthulhu.mandrake.net/pub/imlib/ \
+		http://www.rasterman.com/ftp/
 
 MAINTAINER=	vanilla@MinJe.com.TW
 
@@ -18,7 +20,9 @@
 
 USE_GMAKE=	yes
 USE_IMAKE=	yes
-WRKSRC=		${WRKDIR}/imlib-0.5.1
+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	Wed Nov  5 05:29:22 1997
+++ imlib/files/md5	Thu Nov 13 13:33:29 1997
@@ -1 +1 @@
-MD5 (imlib_DR-0.5.1.tar.gz) = 26484e1cbf5c431aa46ea4eb2e34b590
+MD5 (imlib_DR-0.7.tar.gz) = dac6e7501fd668704155b37c43484bed
diff -ruN imlib.orig/patches/patch-aa imlib/patches/patch-aa
--- imlib.orig/patches/patch-aa	Fri Sep 19 22:33:59 1997
+++ imlib/patches/patch-aa	Thu Nov 13 13:47:24 1997
@@ -1,68 +1,50 @@
-*** 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	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/
+ 
+ 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))
+ 
+ DependTarget()
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	Wed Nov 12 18:00:28 1997
@@ -0,0 +1,13 @@
+--- 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	Fri Sep 19 11:47:36 1997
+++ imlib/patches/patch-ac	Thu Nov 13 13:05:53 1997
@@ -1,21 +1,11 @@
-*** 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);
+--- 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 Sep 15 12:42:36 1997
+++ imlib/pkg/PLIST	Thu Nov 13 13:47:14 1997
@@ -1,7 +1,8 @@
 include/X11/imlib.h
 lib/libIm.a
-lib/libIm.so.3.0
+lib/libIm.so.3.7
 @exec ldconfig -m %B
 lib/X11/enlightenment/im_palette.pal
 lib/X11/enlightenment/imrc
+man/man3/imlib.3x.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?19971113054812.5053.qmail>