[Lunar-commits] CVS: moonbase/graphics/jpeg BUILD, 1.2, 1.3 DETAILS, 1.1.1.1, 1.2 jpeg-c++.patch, 1.1.1.1, NONE libjpeg-6b-arm.patch, 1.1.1.1, NONE

[Auke Kok]

Update of /var/cvs/lunar/moonbase/graphics/jpeg
In directory dbguin.lunar-linux.org:/tmp/cvs-serv14267

Modified Files:
	BUILD DETAILS 
Removed Files:
	jpeg-c++.patch libjpeg-6b-arm.patch 
Log Message:
Major cleanup. This was a mess!!!!


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/graphics/jpeg/BUILD,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- BUILD	10 Jan 2003 20:57:31 -0000	1.2
+++ BUILD	12 May 2004 08:09:54 -0000	1.3
@@ -1,28 +1,22 @@
-bad_flags -malign-double
 (
 
-  export CC="gcc"
-  patch -p1 <$SCRIPT_DIRECTORY/jpeg-c++.patch                    && 
-  patch -p1 <$SCRIPT_DIRECTORY/libjpeg-6b-arm.patch              &&
-  cp /usr/share/libtool/config.{guess,sub} .                     &&
+  bad_flags -malign-double
+  
+  patch_it $SOURCE_CACHE/$SOURCE2 1 &&
+  patch_it $SOURCE_CACHE/$SOURCE3 1 &&
 
   ./configure  --build=$BUILD               \
                --prefix=/usr                \
-               --bindir=/usr/bin            \
-               --sbindir=/usr/sbin          \
-               --datadir=/usr/share         \
-               --localstatedir=/var         \
-               --libdir=/usr/lib            \
-               --includedir=/usr/include    \
-               --infodir=/usr/share/info    \
-               --mandir=/usr/share/man      \
-               --enable-shared              \
-               --enable-static              &&
+	       --bindir=/usr/bin            \
+	       --datadir=/usr/share         \
+	       --mandir=/usr/share/man      \
+	       --enable-shared              \
+	       --enable-static              &&
 
-  sedit "s/\$(prefix)\/man\/man\$(manext)/\/usr\/share\/man\/man\$(manext)/" Makefile &&
-  make                                                                                &&
-  LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD make test                                     &&
-  prepare_install                                                                     &&
+  default_config &&
+  make &&
+  LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD make test &&
+  prepare_install &&
   make install
 
 ) > $C_FIFO 2>&1

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/graphics/jpeg/DETAILS,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- DETAILS	21 Aug 2002 00:55:16 -0000	1.1.1.1
+++ DETAILS	12 May 2004 08:09:54 -0000	1.2
@@ -2,7 +2,14 @@
          VERSION=6b
           SOURCE=${MODULE}src.v$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION
-   SOURCE_URL[0]=ftp://ftp.uu.net/graphics/$MODULE/$SOURCE
+      SOURCE_URL=ftp://ftp.uu.net/graphics/$MODULE/$SOURCE
+      SOURCE_VFY=md5:dbd5f3b47ed13132f04c685d608a7547
+         SOURCE2=jpeg-c++.patch
+     SOURCE2_URL=$PATCH_URL/$SOURCE2
+     SOURCE2_VFY=md5:d07052b18147db81a9b1455966670f8b
+         SOURCE3=libjpeg-6b-arm.patch
+     SOURCE3_URL=$PATCH_URL/$SOURCE3
+     SOURCE3_VFY=md5:406591446d2b596c6d6725bc968c01f5
         WEB_SITE=http://www.ijg.org
          ENTERED=20010922
          UPDATED=20020724

--- jpeg-c++.patch DELETED ---

--- libjpeg-6b-arm.patch DELETED ---