[Lunar-commits] CVS: moonbase/utils/apmd BUILD, 1.2, 1.3 DETAILS, 1.1.1.1, 1.2 apmdNoX.patch, 1.1.1.1, NONE apmsleep-2.4.19.patch, 1.1.1.1, NONE

[Terry Chan]

Update of /var/cvs/lunar/moonbase/utils/apmd
In directory dbguin.lunar-linux.org:/tmp/cvs-serv20122

Modified Files:
	BUILD DETAILS 
Removed Files:
	apmdNoX.patch apmsleep-2.4.19.patch 
Log Message:
Updated this to apmd-3.2.1-4 from debian.  Supposedly this now compiles under
kernel 2.6.  Compiled and tested under gcc-3.3.3, kernel headers 2.4.x.


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/utils/apmd/BUILD,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- BUILD	14 Feb 2004 04:51:57 -0000	1.2
+++ BUILD	18 Mar 2004 05:08:06 -0000	1.3
@@ -1,19 +1,14 @@
 (
 
-if !module_installed xserver
-then
-    message "xfree86 server is not installed, so xapm will not be built"
-    cat $SCRIPT_DIRECTORY/apmdNoX.patch | patch -p1
-fi
-
-patch -p0 < $SCRIPT_DIRECTORY/apmsleep-2.4.19.patch
+  patch_it $SOURCE_CACHE/$SOURCE2 1 &&
+  patch_it $SOURCE_CACHE/$SOURCE3 1 &&
 
-sedit "s/CFLAGS=-O -g/#\0/" Makefile
-sedit "s/LDLAGS=/#\0/" Makefile
-sedit "s/MANDIR=\${PREFIX}\/man/MANDIR=\${PREFIX}\/share\/man/" Makefile
+  if ! module_installed xserver ; then
+    message "xfree86 server is not installed, so xapm will not be built"
+    sedit "s/apmd xapm/apmd/" Makefile
+    sedit "/  xapm/d" Makefile
+  fi &&
 
-    make      &&
-    prepare_install   &&
-    make install 
+  default_make
 
 ) > $C_FIFO 2>&1

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/utils/apmd/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:21 -0000	1.1.1.1
+++ DETAILS	18 Mar 2004 05:08:06 -0000	1.2
@@ -1,14 +1,24 @@
-           MODULE=apmd
-         VERSION=3.0.2
-          SOURCE=$MODULE-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
-   SOURCE_URL[0]=http://www.worldvisions.ca/~apenwarr/apmd/$SOURCE
+          MODULE=apmd
+         VERSION=3.2.1
+        #VERSION=3.0.2
+          SOURCE=${MODULE}_${VERSION}.orig.tar.gz
+         SOURCE2=${MODULE}_${VERSION}-4.diff.gz
+         SOURCE3=$MODULE-$VERSION-Makefile.patch
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION.orig
+   SOURCE_URL[0]=ftp://ftp.debian.org/debian/pool/main/a/apmd/$SOURCE
+      SOURCE_VFY=md5:99523e709f5033d3d64ad38d3954f7fc
+#  SOURCE_URL[0]=http://www.worldvisions.ca/~apenwarr/apmd/$SOURCE
+  SOURCE2_URL[0]=ftp://ftp.debian.org/debian/pool/main/a/apmd/$SOURCE2
+     SOURCE2_VFY=md5:3bec6042cc90c730209046fdc0b99ec1
+     SOURCE3_URL=$PATCH_URL/$SOURCE3
+     SOURCE3_VFY=md5:5c6a3d9d8db1c9d01da4c438b7bfdbb0
         WEB_SITE=http://www.worldvisions.ca/~apenwarr/apmd/
          ENTERED=20020203
-         UPDATED=20020203
+         UPDATED=20040317
 	   SHORT="Linux apmd for laptop battery and power status"
 
-
 cat << EOF
-The apmd package is a set of user-level programs to control the Advanced Power Management system found in all modern laptop computers and most modern desktops.
+The apmd package is a set of user-level programs to control the Advanced
+Power Management system found in all modern laptop computers and most modern
+desktops.
 EOF

--- apmdNoX.patch DELETED ---

--- apmsleep-2.4.19.patch DELETED ---