ports/73644: [PATCH] x11/imwheel: update to 1.0.0.p12
Paul Murphy
paul.murphy at cogeco.ca
Sun Nov 7 16:20:15 UTC 2004
>Number: 73644
>Category: ports
>Synopsis: [PATCH] x11/imwheel: update to 1.0.0.p12
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sun Nov 07 16:20:12 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Paul Murphy
>Release: FreeBSD 6.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD earth.upton.net 6.0-CURRENT FreeBSD 6.0-CURRENT #0: Sun Oct 24 17:32:37 EDT 2004
>Description:
- Update to 1.0.0.p12
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
--- imwheel-1.0.0.p12_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/x11/imwheel/Makefile /usr/home/paul/temp/imwheel/Makefile
--- /usr/ports/x11/imwheel/Makefile Tue Oct 19 11:50:48 2004
+++ /usr/home/paul/temp/imwheel/Makefile Sun Nov 7 09:26:48 2004
@@ -6,15 +6,13 @@
#
PORTNAME= imwheel
-PORTVERSION= 0.9.9
+PORTVERSION= 1.0.0.p12
PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://jcatki.no-ip.org/pub/imwheel/ \
${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
-
-DEPRECATED= http://vuxml.freebsd.org/e31d44a2-21e3-11d9-9289-000c41e2cdad.html (vulnerabilty)
-EXPIRATION_DATE= November 20, 2004
+DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p12/pre12/}
MAINTAINER= ports at FreeBSD.org
COMMENT= Utility to translate mouse wheel actions into X keyboard events
diff -ruN --exclude=CVS /usr/ports/x11/imwheel/distinfo /usr/home/paul/temp/imwheel/distinfo
--- /usr/ports/x11/imwheel/distinfo Thu Jan 29 11:13:00 2004
+++ /usr/home/paul/temp/imwheel/distinfo Sun Nov 7 08:19:55 2004
@@ -1,2 +1,2 @@
-MD5 (imwheel-0.9.9.tar.gz) = 1010dadb54a38a20f7fec430e6e5d262
-SIZE (imwheel-0.9.9.tar.gz) = 411882
+MD5 (imwheel-1.0.0pre12.tar.gz) = 21d81db739ae95d96f9b650f7b826a14
+SIZE (imwheel-1.0.0pre12.tar.gz) = 186424
diff -ruN --exclude=CVS /usr/ports/x11/imwheel/files/patch-Makefile.in /usr/home/paul/temp/imwheel/files/patch-Makefile.in
--- /usr/ports/x11/imwheel/files/patch-Makefile.in Thu Jun 28 19:48:47 2001
+++ /usr/home/paul/temp/imwheel/files/patch-Makefile.in Sun Nov 7 10:14:05 2004
@@ -1,14 +1,11 @@
---- Makefile.in.orig Thu Feb 22 09:41:40 2001
-+++ Makefile.in Fri Jun 29 01:14:30 2001
-@@ -581,9 +581,9 @@
- @SUID_TRUE@ progname=$(DESTDIR)$(bindir)/`echo imwheel|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'` ; \
- @SUID_TRUE@ chown @suid@ $$progname ; \
- @SUID_TRUE@ chmod u+s $$progname
-- at SUID_TRUE@ install -m 644 imwheelrc /etc/imwheelrc
-+ at SUID_TRUE@ $(BSD_INSTALL_DATA) imwheelrc ${PREFIX}/etc/imwheelrc
- @SUID_FALSE at install-exec-hook:
-- at SUID_FALSE@ install -m 644 imwheelrc /etc/imwheelrc
-+ at SUID_FALSE@ $(BSD_INSTALL_DATA) imwheelrc ${PREFIX}/etc/imwheelrc
-
- extras: $(EXTRA_PROGRAMS)
+--- Makefile.in.orig Sun Aug 29 06:36:33 2004
++++ Makefile.in Sun Nov 7 08:30:31 2004
+@@ -215,7 +215,7 @@
+ imwheel_DEPENDENCIES = imwheel.o util.o cfg.o jax/libjax.a
+ man_MANS = imwheel.1
+ EXTRA_DIST = BUGS FREEBSD EMACS M-BA47 BUGS see imwheel.1.html imwheel.1 TODO imwheelrc @extras_dist@ @mdump_dist@ lefty.sh imwheel.spec slack.sh
+-ETCDIR = /etc/X11/imwheel
++ETCDIR = ${PREFIX}/etc
+ all: config.h
+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
diff -ruN --exclude=CVS /usr/ports/x11/imwheel/files/patch-ae /usr/home/paul/temp/imwheel/files/patch-ae
--- /usr/ports/x11/imwheel/files/patch-ae Thu Jun 28 19:48:48 2001
+++ /usr/home/paul/temp/imwheel/files/patch-ae Sun Nov 7 11:10:28 2004
@@ -1,20 +1,21 @@
---- imwheel.1.orig Tue Feb 22 08:53:56 2000
-+++ imwheel.1 Tue Feb 22 08:57:21 2000
-@@ -162,7 +162,7 @@
- buttons. This mode doesn't use any grabs to function.
- .LP
+--- imwheel.1.orig Sun Nov 7 08:47:14 2004
++++ imwheel.1 Sun Nov 7 08:49:03 2004
+@@ -329,7 +329,7 @@
+ .fi
+ .RE
.SH "IMWHEELRC"
--IMWheel uses, optionally, two configuration files. One called /etc/imwheelrc,
+-IMWheel uses, optionally, two configuration files. One called /etc/X11/imwheel/imwheelrc,
+IMWheel uses, optionally, two configuration files. One called %%PREFIX%%/etc/imwheelrc,
which is used for everybody. The other is $HOME/.imwheelrc, used only for one
- user. One is supplied and should have been installed automatically in /etc
+ user. One is supplied and should have been installed automatically in /etc/X11/imwheel/
if not also in the installing users $HOME as well. All whitespace is ignored
-@@ -397,7 +397,7 @@
+@@ -671,7 +671,7 @@
$HOME/.imwheelrc
- The users configuration file.
-
--/etc/.imwheelrc
+ The users configuration file.
+
+-/etc/X11/imwheel/imwheelrc
+%%PREFIX%%/etc/imwheelrc
- The global location for the configuration
- file, it is always loaded. Overided by
- the users configuration file.
+ The global location for the configuration
+ file, it is always loaded. Overided by
+ the users configuration file.
+
diff -ruN --exclude=CVS /usr/ports/x11/imwheel/files/patch-getopt::Makefile.in /usr/home/paul/temp/imwheel/files/patch-getopt::Makefile.in
--- /usr/ports/x11/imwheel/files/patch-getopt::Makefile.in Thu Jun 28 19:48:48 2001
+++ /usr/home/paul/temp/imwheel/files/patch-getopt::Makefile.in Sun Nov 7 09:01:31 2004
@@ -1,11 +1,12 @@
---- getopt/Makefile.in.orig Thu Feb 22 08:41:45 2001
-+++ getopt/Makefile.in
-@@ -79,7 +79,7 @@
- mdump_dist = @mdump_dist@
+--- getopt/Makefile.in.orig Sun Aug 29 06:33:21 2004
++++ getopt/Makefile.in Sun Nov 7 08:57:49 2004
+@@ -161,7 +161,7 @@
suid = @suid@
-
--CFLAGS = -O6 -s -Wall
-+#CFLAGS = -O6 -s -Wall
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -O6 -s -Wall
++#AM_CFLAGS = -O6 -s -Wall
noinst_LIBRARIES = libgetopt.a
libgetopt_a_SOURCES = getopt.c getopt1.c getopt.h
-
+ EXTRA_DIST = Makefile.unix
+
diff -ruN --exclude=CVS /usr/ports/x11/imwheel/files/patch-util.c /usr/home/paul/temp/imwheel/files/patch-util.c
--- /usr/ports/x11/imwheel/files/patch-util.c Sun Jul 20 08:25:30 2003
+++ /usr/home/paul/temp/imwheel/files/patch-util.c Sun Nov 7 09:12:42 2004
@@ -1,28 +1,12 @@
---- util.c.orig Tue Oct 31 13:06:05 2000
-+++ util.c Sat Jul 19 05:45:59 2003
-@@ -330,11 +330,11 @@
- fclose(f);
- if(pid>0 && useFifo)
- {
-- fprintf(stderr,"\
--ERROR: imwheel is already running or there is a stale pid file
-- check on processes listed below.
-- run with -k to kill running imwheels.
-- remove pid file %s.
-+ fprintf(stderr,"\n\
-+ERROR: imwheel is already running or there is a stale pid file\n\
-+ check on processes listed below.\n\
-+ run with -k to kill running imwheels.\n\
-+ remove pid file %s.\n\
- or run with -p to avoid the pid file altogether.\n",PIDFILE);
- if((f=fopen(PIDFILE,"r")))
- {
-@@ -710,7 +710,7 @@
-
+--- util.c.orig Sun Aug 29 06:21:46 2004
++++ util.c Sun Nov 7 09:10:33 2004
+@@ -735,7 +735,7 @@
+
struct WinAction *getRC()
{
-- char fname[2][1024]={"","/etc/imwheelrc"}, line[1024], *p, *q, winid[1024];
+- char fname[2][1024]={"","/etc/X11/imwheel/imwheelrc"}, line[1024], *p, *q, winid[1024];
+ char fname[2][1024]={"","/usr/X11R6/etc/imwheelrc"}, line[1024], *p, *q, winid[1024];
- int fi,i;
- struct WinAction *newwa=NULL;
- FILE *f=NULL;
+ int fi,i;
+ struct WinAction *newwa=NULL;
+ FILE *f=NULL;
+
--- imwheel-1.0.0.p12_1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list