gpm: 1.20.1 -> 1.20.3

10 files changed, 113 insertions, 70 deletions

diff --git a/gpm/.footprint b/gpm/.footprint
index 762d4ea52..13cb192f4 100644
--- a/gpm/.footprint
+++ b/gpm/.footprint
@@ -4,6 +4,8 @@ drwxr-xr-x	root/root	etc/rc.d/
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/disable-paste
+-rwxr-xr-x	root/root	usr/bin/display-buttons
+-rwxr-xr-x	root/root	usr/bin/display-coords
 -rwxr-xr-x	root/root	usr/bin/gpm-root
 -rwxr-xr-x	root/root	usr/bin/hltest
 -rwxr-xr-x	root/root	usr/bin/mev
@@ -12,8 +14,8 @@ drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/gpm.h
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libgpm.a
-lrwxrwxrwx	root/root	usr/lib/libgpm.so -> libgpm.so.1.19.0
--rwxr-xr-x	root/root	usr/lib/libgpm.so.1.19.0
+lrwxrwxrwx	root/root	usr/lib/libgpm.so -> libgpm.so.1.20.0
+-rw-r--r--	root/root	usr/lib/libgpm.so.1.20.0
 drwxr-xr-x	root/root	usr/man/
 drwxr-xr-x	root/root	usr/man/man1/
 -rw-r--r--	root/root	usr/man/man1/gpm-root.1.gz
diff --git a/gpm/.md5sum b/gpm/.md5sum
index bfbaea30f..664ab8ce0 100644
--- a/gpm/.md5sum
+++ b/gpm/.md5sum
@@ -1,5 +1,6 @@
-503d4925b891ce0133f0acd3e925bcbe  gpm-1.20.1-liblow-segv.patch
-68fcdfbcca069516ea181c8b8946bc9f  gpm-1.20.1-no-dumb-error-messages.patch
-0b999233f10c0ee52a71cee27b1a057b  gpm-1.20.1-nodebug.patch
-2c63e827d755527950d9d13fe3d87692  gpm-1.20.1.tar.bz2
+35b2982a699fde759f77c0d96bd93036  gpm-1.20.3-make-install-fixes.patch
+d755c8a2f5a96c7380dbb5322c99322b  gpm-1.20.3-no-dumb-error-messages.patch
+fde77ebb9594d9b1b66811850705214a  gpm-1.20.3-no-emacs-dir.patch
+6dd8a9e02b59dc2721f694e2c72e028e  gpm-1.20.3-nodebug.patch
+dd6054c488fc36fec327acc5b1f3e7d6  gpm-1.20.3.tar.bz2
 e8160a72365d3c79064ff76fbb7bfc70  gpm.rc
diff --git a/gpm/Pkgfile b/gpm/Pkgfile
index 748bb569b..423edacdd 100644
--- a/gpm/Pkgfile
+++ b/gpm/Pkgfile
@@ -4,38 +4,33 @@
 # Packager: Han Boetes, han at mijncomputer dot nl
 
 name=gpm
-version=1.20.1
+version=1.20.3
 release=1
 source=(http://unix.schottelius.org/gpm/archives/gpm-$version.tar.bz2 \
+	gpm-$version-no-emacs-dir.patch \
 	gpm-$version-nodebug.patch \
 	gpm-$version-no-dumb-error-messages.patch \
-	gpm-$version-liblow-segv.patch \
+	gpm-$version-make-install-fixes.patch \
 	gpm.rc)
 
 build() {
 	cd gpm-$version
 
-	sed -i \
-		-e 's/^MAKEINFO.*/MAKEINFO = no/' \
-		-e '/^EMACS.*/d' Makefile.include.in
-
-	# emacs gpm support is included in emacs. xterm-mouse-mode
-	sed -i \
-		-e 's/EMACS=.*/EMACS=:/' \
-		-e 's/ELISP=.*/ELISP=/' configure
-
+	patch -p 1 -i ../gpm-$version-no-emacs-dir.patch
 	patch -p 1 -i ../gpm-$version-nodebug.patch
 	patch -p 1 -i ../gpm-$version-no-dumb-error-messages.patch
-	patch -p 1 -i ../gpm-$version-liblow-segv.patch
+	patch -p 1 -i ../gpm-$version-make-install-fixes.patch
 
-	./configure --prefix=/usr
+	./configure \
+		--prefix=/usr \
+		--mandir=/usr/man
 
-	make -j 1 LDFLAGS='-lm'
+	make -j 1
 	make ROOT=$PKG install
 
-	install -D -m 0755 ../gpm.rc $PKG/etc/rc.d/gpm
-	chmod 0755 $PKG/usr/lib/libgpm.so.*.*.*
-	rm -r $PKG/usr/etc
-	rm -r $PKG/usr/info
+	install -m 0755 -D ../gpm.rc $PKG/etc/rc.d/gpm
+	rm -r $PKG/usr/share/info
+	rmdir $PKG/usr/etc
+	rmdir $PKG/usr/share
 }
 
diff --git a/gpm/gpm-1.20.1-liblow-segv.patch b/gpm/gpm-1.20.1-liblow-segv.patch
deleted file mode 100644
index 8d2fe0d10..000000000
--- a/gpm/gpm-1.20.1-liblow-segv.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- gpm-1.20.1/src/lib/liblow.c.orig	2002-12-24 23:57:16.000000000 +0100
-+++ gpm-1.20.1/src/lib/liblow.c	2004-08-19 04:02:13.834170632 +0200
-@@ -199,7 +199,8 @@
-    Gpm_Stst *new = NULL;
-    char* sock_name = 0;
- 
--   option.consolename = NULL;
-+   if(!checked_con)
-+      option.consolename = NULL;
- 
-    gpm_report(GPM_PR_DEBUG,"VC: %d",flag);
- 
diff --git a/gpm/gpm-1.20.1-no-dumb-error-messages.patch b/gpm/gpm-1.20.1-no-dumb-error-messages.patch
deleted file mode 100644
index 8b5f137c0..000000000
--- a/gpm/gpm-1.20.1-no-dumb-error-messages.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- gpm-1.20.1/src/lib/liblow.c.no-dumb-error-messages	2003-07-07 15:42:18.000000000 +0200
-+++ gpm-1.20.1/src/lib/liblow.c	2003-07-07 16:33:33.000000000 +0200
-@@ -259,7 +259,7 @@ int Gpm_Open(Gpm_Connect *conn, int flag
-          /* do we really need this check ? */
-          if(strncmp(tty,option.consolename,strlen(option.consolename)-1)
-             || !isdigit(tty[strlen(option.consolename)-1])) {
--            gpm_report(GPM_PR_ERR,"strncmp/isdigit/option.consolename failed");
-+             /* gpm_report(GPM_PR_ERR,"strncmp/isdigit/option.consolename failed"); */
-             goto err;
-          }
-           
-@@ -368,7 +368,7 @@ int Gpm_Open(Gpm_Connect *conn, int flag
- 
-   /*....................................... Error: free all memory */
-    err:
--   gpm_report(GPM_PR_ERR,"Oh, oh, it's an error! possibly I die! ");
-+  /* gpm_report(GPM_PR_ERR,"Oh, oh, it's an error! possibly I die! "); */
-    do {
-       new=gpm_stack->next;
-       free(gpm_stack);
diff --git a/gpm/gpm-1.20.1-nodebug.patch b/gpm/gpm-1.20.1-nodebug.patch
deleted file mode 100644
index 5a2dcd2c3..000000000
--- a/gpm/gpm-1.20.1-nodebug.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- gpm-1.20.0/src/lib/report-lib.c.foo	Wed Mar 27 17:13:24 2002
-+++ gpm-1.20.0/src/lib/report-lib.c	Wed Mar 27 17:14:08 2002
-@@ -27,6 +27,11 @@
- {
-    char *string = NULL;
-    va_list ap;
-+#ifndef DEBUG_VERBOSE
-+   if(stat==GPM_STAT_DEBUG)
-+	   return;
-+#endif
-+
-    va_start(ap,text);
- 
-    switch(stat) {
diff --git a/gpm/gpm-1.20.3-make-install-fixes.patch b/gpm/gpm-1.20.3-make-install-fixes.patch
new file mode 100644
index 000000000..803c6622f
--- /dev/null
+++ b/gpm/gpm-1.20.3-make-install-fixes.patch
@@ -0,0 +1,53 @@
+diff -pruN gpm-1.20.3.orig/Makefile.include.in gpm-1.20.3/Makefile.include.in
+--- gpm-1.20.3.orig/Makefile.include.in	2008-05-08 09:44:49.000000000 +0000
++++ gpm-1.20.3/Makefile.include.in	2008-05-08 09:51:23.000000000 +0000
+@@ -40,7 +40,6 @@ INSTALL           = @INSTALL@
+ INSTALL_PROGRAM   = @INSTALL_PROGRAM@
+ INSTALL_DATA      = @INSTALL_DATA@
+ LN_S              = @LN_S@
+-EMACS             = @EMACS@
+ ELISP             = @ELISP@
+ SHLIB             = @SHLIB@
+ SED               = @SED@
+@@ -48,7 +47,7 @@ DIFF              = @DIFF@
+ TEX               = @TEX@
+ TEXINDEX          = @TEXINDEX@
+ DVIPS             = @DVIPS@
+-MAKEINFO          = @MAKEINFO@
++MAKEINFO          = no
+ TEXI2HTML         = texi2html
+ STRIP             = -s
+ 
+diff -pruN gpm-1.20.3.orig/configure gpm-1.20.3/configure
+--- gpm-1.20.3.orig/configure	2008-05-08 09:44:49.000000000 +0000
++++ gpm-1.20.3/configure	2008-05-08 09:53:55.000000000 +0000
+@@ -3248,15 +3248,8 @@ else
+ echo "${ECHO_T}no" >&6; }
+ fi
+ 
+-
+-
+-if test ${ac_cv_path_emacs} = no ; then
+-        EMACS=:
+-        ELISP=
+-else
+-        EMACS=${ac_cv_path_emacs}
+-        ELISP="emacs/t-mouse.el emacs/t-mouse.elc"
+-fi
++EMACS=:
++ELISP=
+ 
+ if test $EMACS != : ; then
+         { echo "$as_me:$LINENO: checking where to install Emacs Lisp files" >&5
+diff -pruN gpm-1.20.3.orig/doc/Makefile.in gpm-1.20.3/doc/Makefile.in
+--- gpm-1.20.3.orig/doc/Makefile.in	2008-05-08 09:44:49.000000000 +0000
++++ gpm-1.20.3/doc/Makefile.in	2008-05-08 09:57:34.000000000 +0000
+@@ -32,7 +32,7 @@ include $(top_builddir)/Makefile.include
+ 
+ MANPAGES = gpm.8 mev.1 gpm-root.1 gpm-types.7 mouse-test.1
+ 
+-all: $(srcdir)/gpm.info gpm.man
++all: gpm.man
+ 
+ # HTML (texi2html)
+ %.html: %.texinfo
diff --git a/gpm/gpm-1.20.3-no-dumb-error-messages.patch b/gpm/gpm-1.20.3-no-dumb-error-messages.patch
new file mode 100644
index 000000000..8b85a273d
--- /dev/null
+++ b/gpm/gpm-1.20.3-no-dumb-error-messages.patch
@@ -0,0 +1,12 @@
+diff -pruN gpm-1.20.3.orig/src/lib/liblow.c gpm-1.20.3/src/lib/liblow.c
+--- gpm-1.20.3.orig/src/lib/liblow.c	2008-05-08 09:34:10.000000000 +0000
++++ gpm-1.20.3/src/lib/liblow.c	2008-05-08 09:40:47.000000000 +0000
+@@ -362,7 +362,7 @@ int Gpm_Open(Gpm_Connect *conn, int flag
+ 
+   /*....................................... Error: free all memory */
+    err:
+-   gpm_report(GPM_PR_ERR,"Oh, oh, it's an error! possibly I die! ");
++   /* gpm_report(GPM_PR_ERR,"Oh, oh, it's an error! possibly I die! "); */
+    while(gpm_stack) {
+       new=gpm_stack->next;
+       free(gpm_stack);
diff --git a/gpm/gpm-1.20.3-no-emacs-dir.patch b/gpm/gpm-1.20.3-no-emacs-dir.patch
new file mode 100644
index 000000000..d3edf560d
--- /dev/null
+++ b/gpm/gpm-1.20.3-no-emacs-dir.patch
@@ -0,0 +1,11 @@
+--- gpm-1.20.3-orig/Makefile.in	2008-04-15 16:34:13.000000000 +0200
++++ gpm-1.20.3/Makefile.in	2008-04-20 23:30:30.000000000 +0200
+@@ -51,7 +51,7 @@
+ 
+ installdirs:
+ 	$(MKDIR) $(libdir) $(bindir) $(sbindir) $(includedir) $(sysconfdir); \
+-	if test "x@ELISP@" != "x" ; then \
++	if test "x$(ELISP)" != "x" ; then \
+ 		$(MKDIR) $(lispdir) ; \
+ 	fi
+ 
diff --git a/gpm/gpm-1.20.3-nodebug.patch b/gpm/gpm-1.20.3-nodebug.patch
new file mode 100644
index 000000000..282651925
--- /dev/null
+++ b/gpm/gpm-1.20.3-nodebug.patch
@@ -0,0 +1,15 @@
+diff -pruN gpm-1.20.3.orig/src/lib/report-lib.c gpm-1.20.3/src/lib/report-lib.c
+--- gpm-1.20.3.orig/src/lib/report-lib.c	2008-05-08 09:34:10.000000000 +0000
++++ gpm-1.20.3/src/lib/report-lib.c	2008-05-08 09:37:27.000000000 +0000
+@@ -29,6 +29,11 @@ void gpm_report(int line, char *file, in
+    char *string = NULL;
+    int log_level;
+    va_list ap;
++#ifndef DEBUG_VERBOSE
++   if(stat==GPM_STAT_DEBUG)
++   return;
++#endif
++
+    va_start(ap,text);
+ 
+    switch(stat) {