Index: head/graphics/imlib/Makefile =================================================================== --- head/graphics/imlib/Makefile (revision 7711) +++ head/graphics/imlib/Makefile (revision 7712) @@ -1,27 +1,28 @@ # New ports collection makefile for: imlib # Version required: 0.4 # 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 USE_GMAKE= yes USE_IMAKE= yes WRKSRC= ${WRKDIR}/imlib post-patch: $(CP) $(WRKSRC)/Imakefile $(WRKSRC)/Imakefile.pat sed -e "s%X11BASE%$(X11BASE)%" <$(WRKSRC)/Imakefile.pat >$(WRKSRC)/Imakefile post-install: ${LDCONFIG} -m ${PREFIX}/lib .include Property changes on: head/graphics/imlib/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/graphics/imlib/files/patch-aa =================================================================== --- head/graphics/imlib/files/patch-aa (revision 7711) +++ head/graphics/imlib/files/patch-aa (revision 7712) @@ -1,36 +1,53 @@ -*** 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 ! ETCDIR=/etc #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 ! CNFFLAGS = -m 0644 -o root -g root InstallMultipleFlags($(CNFS) $(PALS),$(CNFDIR),$(CNFFLAGS)) DependTarget() ---- 59,65 ---- +--- 64,70 ---- CNFSRC = ./sys_conf CNFS = $(CNFSRC)/imrc PALS = $(CNFSRC)/im_palette.pal ! CNFFLAGS = -m 0644 -o root -g wheel InstallMultipleFlags($(CNFS) $(PALS),$(CNFDIR),$(CNFFLAGS)) DependTarget() Property changes on: head/graphics/imlib/files/patch-aa ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/graphics/imlib/pkg-plist =================================================================== --- head/graphics/imlib/pkg-plist (revision 7711) +++ head/graphics/imlib/pkg-plist (revision 7712) @@ -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 Property changes on: head/graphics/imlib/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/graphics/imlib2/Makefile =================================================================== --- head/graphics/imlib2/Makefile (revision 7711) +++ head/graphics/imlib2/Makefile (revision 7712) @@ -1,27 +1,28 @@ # New ports collection makefile for: imlib # Version required: 0.4 # 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 USE_GMAKE= yes USE_IMAKE= yes WRKSRC= ${WRKDIR}/imlib post-patch: $(CP) $(WRKSRC)/Imakefile $(WRKSRC)/Imakefile.pat sed -e "s%X11BASE%$(X11BASE)%" <$(WRKSRC)/Imakefile.pat >$(WRKSRC)/Imakefile post-install: ${LDCONFIG} -m ${PREFIX}/lib .include Property changes on: head/graphics/imlib2/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/graphics/imlib2/files/patch-aa =================================================================== --- head/graphics/imlib2/files/patch-aa (revision 7711) +++ head/graphics/imlib2/files/patch-aa (revision 7712) @@ -1,36 +1,53 @@ -*** 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 ! ETCDIR=/etc #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 ! CNFFLAGS = -m 0644 -o root -g root InstallMultipleFlags($(CNFS) $(PALS),$(CNFDIR),$(CNFFLAGS)) DependTarget() ---- 59,65 ---- +--- 64,70 ---- CNFSRC = ./sys_conf CNFS = $(CNFSRC)/imrc PALS = $(CNFSRC)/im_palette.pal ! CNFFLAGS = -m 0644 -o root -g wheel InstallMultipleFlags($(CNFS) $(PALS),$(CNFDIR),$(CNFFLAGS)) DependTarget() Property changes on: head/graphics/imlib2/files/patch-aa ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/graphics/imlib2/pkg-plist =================================================================== --- head/graphics/imlib2/pkg-plist (revision 7711) +++ head/graphics/imlib2/pkg-plist (revision 7712) @@ -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 Property changes on: head/graphics/imlib2/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/graphics/imlib2-tmp/Makefile =================================================================== --- head/graphics/imlib2-tmp/Makefile (revision 7711) +++ head/graphics/imlib2-tmp/Makefile (revision 7712) @@ -1,27 +1,28 @@ # New ports collection makefile for: imlib # Version required: 0.4 # 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 USE_GMAKE= yes USE_IMAKE= yes WRKSRC= ${WRKDIR}/imlib post-patch: $(CP) $(WRKSRC)/Imakefile $(WRKSRC)/Imakefile.pat sed -e "s%X11BASE%$(X11BASE)%" <$(WRKSRC)/Imakefile.pat >$(WRKSRC)/Imakefile post-install: ${LDCONFIG} -m ${PREFIX}/lib .include Property changes on: head/graphics/imlib2-tmp/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/graphics/imlib2-tmp/files/patch-aa =================================================================== --- head/graphics/imlib2-tmp/files/patch-aa (revision 7711) +++ head/graphics/imlib2-tmp/files/patch-aa (revision 7712) @@ -1,36 +1,53 @@ -*** 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 ! ETCDIR=/etc #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 ! CNFFLAGS = -m 0644 -o root -g root InstallMultipleFlags($(CNFS) $(PALS),$(CNFDIR),$(CNFFLAGS)) DependTarget() ---- 59,65 ---- +--- 64,70 ---- CNFSRC = ./sys_conf CNFS = $(CNFSRC)/imrc PALS = $(CNFSRC)/im_palette.pal ! CNFFLAGS = -m 0644 -o root -g wheel InstallMultipleFlags($(CNFS) $(PALS),$(CNFDIR),$(CNFFLAGS)) DependTarget() Property changes on: head/graphics/imlib2-tmp/files/patch-aa ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/graphics/imlib2-tmp/pkg-plist =================================================================== --- head/graphics/imlib2-tmp/pkg-plist (revision 7711) +++ head/graphics/imlib2-tmp/pkg-plist (revision 7712) @@ -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 Property changes on: head/graphics/imlib2-tmp/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property