From 87aa7523634f6fb28fcf6af37ce1dc81c58ca9f6 Mon Sep 17 00:00:00 2001 From: chuckr Date: Thu, 28 Aug 1997 04:38:45 +0000 Subject: Change libIm major version & add origin ftp site. PR: 4393 Submitted by: Vanill I. Shu --- graphics/imlib/Makefile | 5 +++-- graphics/imlib/files/patch-aa | 33 +++++++++++++++++++++++++-------- graphics/imlib/pkg-plist | 2 +- graphics/imlib2-tmp/Makefile | 5 +++-- graphics/imlib2-tmp/files/patch-aa | 33 +++++++++++++++++++++++++-------- graphics/imlib2-tmp/pkg-plist | 2 +- graphics/imlib2/Makefile | 5 +++-- graphics/imlib2/files/patch-aa | 33 +++++++++++++++++++++++++-------- graphics/imlib2/pkg-plist | 2 +- 9 files changed, 87 insertions(+), 33 deletions(-) diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile index fec4d8e2ad0..420286b73db 100644 --- a/graphics/imlib/Makefile +++ b/graphics/imlib/Makefile @@ -3,13 +3,14 @@ # Date created: 18 August 1997 # Whom: Vanill I. Shu # -# $Id: Makefile,v 1.1.1.1 1997/06/03 23:39:10 asami Exp $ +# $Id: Makefile,v 1.2 1997/08/18 17:45:11 chuckr Exp $ # DISTNAME= imlib_DR-0.4 PKGNAME= imlib-0.4 CATEGORIES= graphics -MASTER_SITES= ftp://cthulhu.mandrake.net/pub/enlightenment/ +MASTER_SITES= http://www.rasterman.com/ftp/ \ + ftp://cthulhu.mandrake.net/pub/enlightenment/ MAINTAINER= Vanill I. Shu diff --git a/graphics/imlib/files/patch-aa b/graphics/imlib/files/patch-aa index de4d8f543fd..5eeaab253e4 100644 --- a/graphics/imlib/files/patch-aa +++ b/graphics/imlib/files/patch-aa @@ -1,7 +1,24 @@ -*** Imakefile.orig Fri Aug 15 16:15:58 1997 ---- Imakefile Fri Aug 15 16:16:29 1997 -*************** LIBREV=1.0 -*** 11,17 **** +*** Imakefile.orig Sun Aug 17 13:45:11 1997 +--- Imakefile Mon Aug 25 21:25:31 1997 +*************** +*** 6,12 **** + /* ---------------------------------------------------------------- */ + + LIBNAME=Im +! LIBREV=1.0 + + CONVERT_DIR=/usr/local/bin + NETPBM_DIR=/usr/local/bin +--- 6,12 ---- + /* ---------------------------------------------------------------- */ + + LIBNAME=Im +! LIBREV=2.0 + + CONVERT_DIR=/usr/local/bin + NETPBM_DIR=/usr/local/bin +*************** NETPBM_DIR=/usr/local/bin +*** 14,20 **** #ifdef UseEtcX11 ETCDIR=/etc/X11/$(LIBNAME) #else @@ -9,16 +26,16 @@ #endif /* def UseEtcX11 */ CNFDIR = $(ETCDIR) ---- 11,17 ---- +--- 14,20 ---- #ifdef UseEtcX11 ETCDIR=/etc/X11/$(LIBNAME) #else -! ETCDIR=X11BASE/lib/X11/enlightenment +! ETCDIR=/usr/X11R6/lib/X11/enlightenment #endif /* def UseEtcX11 */ CNFDIR = $(ETCDIR) *************** InstallMultiple($(HDRS),$(INCROOT)/X11) -*** 59,65 **** +*** 64,70 **** CNFSRC = ./sys_conf CNFS = $(CNFSRC)/imrc PALS = $(CNFSRC)/im_palette.pal @@ -26,7 +43,7 @@ InstallMultipleFlags($(CNFS) $(PALS),$(CNFDIR),$(CNFFLAGS)) DependTarget() ---- 59,65 ---- +--- 64,70 ---- CNFSRC = ./sys_conf CNFS = $(CNFSRC)/imrc PALS = $(CNFSRC)/im_palette.pal diff --git a/graphics/imlib/pkg-plist b/graphics/imlib/pkg-plist index 7346125e563..97e852dfa46 100644 --- a/graphics/imlib/pkg-plist +++ b/graphics/imlib/pkg-plist @@ -1,6 +1,6 @@ include/X11/imlib.h lib/libIm.a -lib/libIm.so.1.0 +lib/libIm.so.2.0 @exec ldconfig -m %B lib/X11/enlightenment/im_palette.pal lib/X11/enlightenment/imrc diff --git a/graphics/imlib2-tmp/Makefile b/graphics/imlib2-tmp/Makefile index fec4d8e2ad0..420286b73db 100644 --- a/graphics/imlib2-tmp/Makefile +++ b/graphics/imlib2-tmp/Makefile @@ -3,13 +3,14 @@ # Date created: 18 August 1997 # Whom: Vanill I. Shu # -# $Id: Makefile,v 1.1.1.1 1997/06/03 23:39:10 asami Exp $ +# $Id: Makefile,v 1.2 1997/08/18 17:45:11 chuckr Exp $ # DISTNAME= imlib_DR-0.4 PKGNAME= imlib-0.4 CATEGORIES= graphics -MASTER_SITES= ftp://cthulhu.mandrake.net/pub/enlightenment/ +MASTER_SITES= http://www.rasterman.com/ftp/ \ + ftp://cthulhu.mandrake.net/pub/enlightenment/ MAINTAINER= Vanill I. Shu diff --git a/graphics/imlib2-tmp/files/patch-aa b/graphics/imlib2-tmp/files/patch-aa index de4d8f543fd..5eeaab253e4 100644 --- a/graphics/imlib2-tmp/files/patch-aa +++ b/graphics/imlib2-tmp/files/patch-aa @@ -1,7 +1,24 @@ -*** Imakefile.orig Fri Aug 15 16:15:58 1997 ---- Imakefile Fri Aug 15 16:16:29 1997 -*************** LIBREV=1.0 -*** 11,17 **** +*** Imakefile.orig Sun Aug 17 13:45:11 1997 +--- Imakefile Mon Aug 25 21:25:31 1997 +*************** +*** 6,12 **** + /* ---------------------------------------------------------------- */ + + LIBNAME=Im +! LIBREV=1.0 + + CONVERT_DIR=/usr/local/bin + NETPBM_DIR=/usr/local/bin +--- 6,12 ---- + /* ---------------------------------------------------------------- */ + + LIBNAME=Im +! LIBREV=2.0 + + CONVERT_DIR=/usr/local/bin + NETPBM_DIR=/usr/local/bin +*************** NETPBM_DIR=/usr/local/bin +*** 14,20 **** #ifdef UseEtcX11 ETCDIR=/etc/X11/$(LIBNAME) #else @@ -9,16 +26,16 @@ #endif /* def UseEtcX11 */ CNFDIR = $(ETCDIR) ---- 11,17 ---- +--- 14,20 ---- #ifdef UseEtcX11 ETCDIR=/etc/X11/$(LIBNAME) #else -! ETCDIR=X11BASE/lib/X11/enlightenment +! ETCDIR=/usr/X11R6/lib/X11/enlightenment #endif /* def UseEtcX11 */ CNFDIR = $(ETCDIR) *************** InstallMultiple($(HDRS),$(INCROOT)/X11) -*** 59,65 **** +*** 64,70 **** CNFSRC = ./sys_conf CNFS = $(CNFSRC)/imrc PALS = $(CNFSRC)/im_palette.pal @@ -26,7 +43,7 @@ InstallMultipleFlags($(CNFS) $(PALS),$(CNFDIR),$(CNFFLAGS)) DependTarget() ---- 59,65 ---- +--- 64,70 ---- CNFSRC = ./sys_conf CNFS = $(CNFSRC)/imrc PALS = $(CNFSRC)/im_palette.pal diff --git a/graphics/imlib2-tmp/pkg-plist b/graphics/imlib2-tmp/pkg-plist index 7346125e563..97e852dfa46 100644 --- a/graphics/imlib2-tmp/pkg-plist +++ b/graphics/imlib2-tmp/pkg-plist @@ -1,6 +1,6 @@ include/X11/imlib.h lib/libIm.a -lib/libIm.so.1.0 +lib/libIm.so.2.0 @exec ldconfig -m %B lib/X11/enlightenment/im_palette.pal lib/X11/enlightenment/imrc diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile index fec4d8e2ad0..420286b73db 100644 --- a/graphics/imlib2/Makefile +++ b/graphics/imlib2/Makefile @@ -3,13 +3,14 @@ # Date created: 18 August 1997 # Whom: Vanill I. Shu # -# $Id: Makefile,v 1.1.1.1 1997/06/03 23:39:10 asami Exp $ +# $Id: Makefile,v 1.2 1997/08/18 17:45:11 chuckr Exp $ # DISTNAME= imlib_DR-0.4 PKGNAME= imlib-0.4 CATEGORIES= graphics -MASTER_SITES= ftp://cthulhu.mandrake.net/pub/enlightenment/ +MASTER_SITES= http://www.rasterman.com/ftp/ \ + ftp://cthulhu.mandrake.net/pub/enlightenment/ MAINTAINER= Vanill I. Shu diff --git a/graphics/imlib2/files/patch-aa b/graphics/imlib2/files/patch-aa index de4d8f543fd..5eeaab253e4 100644 --- a/graphics/imlib2/files/patch-aa +++ b/graphics/imlib2/files/patch-aa @@ -1,7 +1,24 @@ -*** Imakefile.orig Fri Aug 15 16:15:58 1997 ---- Imakefile Fri Aug 15 16:16:29 1997 -*************** LIBREV=1.0 -*** 11,17 **** +*** Imakefile.orig Sun Aug 17 13:45:11 1997 +--- Imakefile Mon Aug 25 21:25:31 1997 +*************** +*** 6,12 **** + /* ---------------------------------------------------------------- */ + + LIBNAME=Im +! LIBREV=1.0 + + CONVERT_DIR=/usr/local/bin + NETPBM_DIR=/usr/local/bin +--- 6,12 ---- + /* ---------------------------------------------------------------- */ + + LIBNAME=Im +! LIBREV=2.0 + + CONVERT_DIR=/usr/local/bin + NETPBM_DIR=/usr/local/bin +*************** NETPBM_DIR=/usr/local/bin +*** 14,20 **** #ifdef UseEtcX11 ETCDIR=/etc/X11/$(LIBNAME) #else @@ -9,16 +26,16 @@ #endif /* def UseEtcX11 */ CNFDIR = $(ETCDIR) ---- 11,17 ---- +--- 14,20 ---- #ifdef UseEtcX11 ETCDIR=/etc/X11/$(LIBNAME) #else -! ETCDIR=X11BASE/lib/X11/enlightenment +! ETCDIR=/usr/X11R6/lib/X11/enlightenment #endif /* def UseEtcX11 */ CNFDIR = $(ETCDIR) *************** InstallMultiple($(HDRS),$(INCROOT)/X11) -*** 59,65 **** +*** 64,70 **** CNFSRC = ./sys_conf CNFS = $(CNFSRC)/imrc PALS = $(CNFSRC)/im_palette.pal @@ -26,7 +43,7 @@ InstallMultipleFlags($(CNFS) $(PALS),$(CNFDIR),$(CNFFLAGS)) DependTarget() ---- 59,65 ---- +--- 64,70 ---- CNFSRC = ./sys_conf CNFS = $(CNFSRC)/imrc PALS = $(CNFSRC)/im_palette.pal diff --git a/graphics/imlib2/pkg-plist b/graphics/imlib2/pkg-plist index 7346125e563..97e852dfa46 100644 --- a/graphics/imlib2/pkg-plist +++ b/graphics/imlib2/pkg-plist @@ -1,6 +1,6 @@ include/X11/imlib.h lib/libIm.a -lib/libIm.so.1.0 +lib/libIm.so.2.0 @exec ldconfig -m %B lib/X11/enlightenment/im_palette.pal lib/X11/enlightenment/imrc -- cgit