ports/83762: [PATCH] Update x11-wm/ctwm and take maintainership
Matthew D. Fuller
fullermd at over-yonder.net
Wed Jul 20 02:10:26 UTC 2005
>Number: 83762
>Category: ports
>Synopsis: [PATCH] Update x11-wm/ctwm and take maintainership
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Jul 20 02:10:15 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Matthew D. Fuller
>Release: FreeBSD 6.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD mortis.sighup.org 6.0-CURRENT FreeBSD 6.0-CURRENT #0: Sat Jul 2 11:30:13 CDT 2005 fullermd at mortis:/usr/obj/usr/src/sys/MORTIS i386
>Description:
Update x11/ctwm to new release.
Take maintainership while nobody's looking.
>How-To-Repeat:
>Fix:
Note:
files/patch-ac is defunct and needs to be cvs rm'd.
files/Imakefile.local-additional is a new file and needs to be
cvs add'd.
Index: Makefile
===================================================================
RCS file: /usr/cvs/ports/x11-wm/ctwm/Makefile,v
retrieving revision 1.37
diff -u -r1.37 Makefile
--- Makefile 15 Jun 2005 02:42:13 -0000 1.37
+++ Makefile 20 Jul 2005 01:42:46 -0000
@@ -6,23 +6,23 @@
#
PORTNAME= ctwm
-PORTVERSION= 3.6
-PORTREVISION= 1
+PORTVERSION= 3.7
CATEGORIES= x11-wm
-MASTER_SITES= http://slpc1.epfl.ch/public/software/ctwm/
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ctwm-images${EXTRACT_SUFX}
+MASTER_SITES= http://ctwm.free.lp.se/dist/
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER= fullermd at over-yonder.net
COMMENT= An extension to twm, with support for multiple virtual screens, etc
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4
+LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg
USE_IMAKE= yes
USE_XPM= yes
MAN1= ctwm.1
-post-extract:
- @(cd ${WRKSRC} && ${LN} -s ../xpm xpm)
+pre-configure:
+ ${CP} ${WRKSRC}/Imakefile.local-template ${WRKSRC}/Imakefile.local
+ ${CAT} ${FILESDIR}/Imakefile.local-additional >> ${WRKSRC}/Imakefile.local
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /usr/cvs/ports/x11-wm/ctwm/distinfo,v
retrieving revision 1.11
diff -u -r1.11 distinfo
--- distinfo 29 Jan 2004 16:12:50 -0000 1.11
+++ distinfo 20 Jul 2005 01:31:46 -0000
@@ -1,4 +1,2 @@
-MD5 (ctwm-3.6.tar.gz) = c9e9e161e07e3d1c7e27684436f01e2b
-SIZE (ctwm-3.6.tar.gz) = 370563
-MD5 (ctwm-images.tar.gz) = 4b0c784213af4afa2d736773863e53b4
-SIZE (ctwm-images.tar.gz) = 244749
+MD5 (ctwm-3.7.tar.gz) = 7276cb0a7d44df98de8e620ba5ae39fa
+SIZE (ctwm-3.7.tar.gz) = 1139461
Index: pkg-plist
===================================================================
RCS file: /usr/cvs/ports/x11-wm/ctwm/pkg-plist,v
retrieving revision 1.12
diff -u -r1.12 pkg-plist
--- pkg-plist 15 Jun 2005 02:42:13 -0000 1.12
+++ pkg-plist 20 Jul 2005 01:39:57 -0000
@@ -19,7 +19,15 @@
lib/X11/twm/images/LRom1.xpm
lib/X11/twm/images/arthur.xpm
lib/X11/twm/images/audio_editor.xpm
+lib/X11/twm/images/background1.xpm
+lib/X11/twm/images/background2.xpm
+lib/X11/twm/images/background3.xpm
+lib/X11/twm/images/background4.xpm
+lib/X11/twm/images/background5.xpm
+lib/X11/twm/images/background6.xpm
+lib/X11/twm/images/background7.xpm
lib/X11/twm/images/background8.xpm
+lib/X11/twm/images/background9.xpm
lib/X11/twm/images/ball1.xpm
lib/X11/twm/images/ball10.xpm
lib/X11/twm/images/ball11.xpm
@@ -38,13 +46,6 @@
lib/X11/twm/images/datebook.xpm
lib/X11/twm/images/emacs.xpm
lib/X11/twm/images/ghostview.xpm
-lib/X11/twm/images/gnu-emacs1.xpm
-lib/X11/twm/images/gnu-emacs2.xpm
-lib/X11/twm/images/gnu-emacs3.xpm
-lib/X11/twm/images/gnu-emacs4.xpm
-lib/X11/twm/images/gnu-emacs5.xpm
-lib/X11/twm/images/gnu-emacs6.xpm
-lib/X11/twm/images/gnu-emacs7.xpm
lib/X11/twm/images/hpterm.xpm
lib/X11/twm/images/mail0.xpm
lib/X11/twm/images/mail1.xpm
Index: files/Imakefile.local-additional
===================================================================
RCS file: files/Imakefile.local-additional
diff -N files/Imakefile.local-additional
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/Imakefile.local-additional 20 Jul 2005 01:32:32 -0000
@@ -0,0 +1,9 @@
+
+XCOMM We might actually prefer using something from X11BASE here instead,
+XCOMM since that's where we technically install XPM stuff (though it's
+XCOMM the same thing as USRLIBDIR)
+USER_XPMLIBDIR = -L$(USRLIBDIR)
+USER_XPMINCDIR = -I$(INCROOT)
+
+USER_JPEGLIBDIR = -L$(LOCALBASE)/lib
+USER_JPEGINCDIR = -I$(LOCALBASE)/include
Index: files/patch-aa
===================================================================
RCS file: /usr/cvs/ports/x11-wm/ctwm/files/patch-aa,v
retrieving revision 1.9
diff -u -r1.9 patch-aa
--- files/patch-aa 10 Aug 2002 04:46:36 -0000 1.9
+++ files/patch-aa 10 May 2005 00:30:59 -0000
@@ -1,61 +1,18 @@
$FreeBSD: ports/x11-wm/ctwm/files/patch-aa,v 1.9 2002/08/10 04:46:36 glewis Exp $
-*** Imakefile.orig Wed Dec 12 00:38:52 2001
---- Imakefile Fri Aug 9 23:45:46 2002
-***************
-*** 11,26 ****
- #undef USE_SOUND
- #define XPM
- #define USEM4
-! #undef X11R6
-! #undef I18N
-
- YFLAGS = -d
- DEPLIBS = $(DEPXMULIB) $(DEPEXTENSIONLIB) $(DEPXLIB)
- LINTLIBS = $(LINTXMU) $(LINTEXTENSIONLIB) $(LINTXLIB)
-
- #ifdef XPM
-! XPMLIBDIR =
-! XPMINCDIR =
-
- XPMDEFINES = -DXPM
- XPMLIB = $(XPMLIBDIR) -lXpm
---- 11,26 ----
- #undef USE_SOUND
- #define XPM
- #define USEM4
-! #define X11R6
-! #define I18N
-
- YFLAGS = -d
- DEPLIBS = $(DEPXMULIB) $(DEPEXTENSIONLIB) $(DEPXLIB)
- LINTLIBS = $(LINTXMU) $(LINTEXTENSIONLIB) $(LINTXLIB)
-
- #ifdef XPM
-! XPMLIBDIR = -L$(USRLIBDIR)
-! XPMINCDIR = -I$(INCROOT)
-
- XPMDEFINES = -DXPM
- XPMLIB = $(XPMLIBDIR) -lXpm
-***************
-*** 44,52 ****
- #endif
-
- #ifdef USEM4
- M4LIBDIR =
- M4INCDIR =
-! M4DEFINES = -DUSEM4
- M4LIB = $(M4LIBDIR)
- #else
- M4LIBDIR =
---- 44,53 ----
- #endif
-
- #ifdef USEM4
-+ M4PROG = ${LOCALBASE}/bin/gm4
- M4LIBDIR =
- M4INCDIR =
-! M4DEFINES = -DUSEM4 -DM4PROG=\"${M4PROG}\"
- M4LIB = $(M4LIBDIR)
- #else
- M4LIBDIR =
+--- Imakefile.orig Thu May 5 08:22:40 2005
++++ Imakefile Mon May 9 19:30:45 2005
+@@ -67,10 +67,12 @@
+ #endif
+
+ #if defined USE_M4 || defined USEM4
++ M4PROGNAME = gm4
++ M4PROG = $(LOCALBASE)/bin/$(M4PROGNAME)
+ M4LIBDIR =
+ M4INCDIR =
+
+- M4DEFINES = -DUSEM4
++ M4DEFINES = -DUSEM4 -DM4PROG=\"$(M4PROG)\" -DM4PROGNAME=\"$(M4PROGNAME)\"
+ M4LIB = $(M4LIBDIR)
+ #else
+ M4LIBDIR =
Index: files/patch-ab
===================================================================
RCS file: /usr/cvs/ports/x11-wm/ctwm/files/patch-ab,v
retrieving revision 1.1
diff -u -r1.1 patch-ab
--- files/patch-ab 13 Feb 2000 19:29:15 -0000 1.1
+++ files/patch-ab 10 May 2005 00:34:34 -0000
@@ -1,19 +1,13 @@
-*** parse.c.orig Sun Feb 13 19:00:24 2000
---- parse.c Sun Feb 13 19:02:13 2000
-***************
-*** 2070,2076 ****
- dup2(fids[1], 1); /* stdout = pipe to parent */
- /* get_defs("m4", dpy, display_name) */
- tmp_file = m4_defs(dpy, display_name);
-! execlp("m4", "m4", "-s", tmp_file, "-", NULL);
- /* If we get here we are screwed... */
- perror("Can't execlp() m4");
- exit(124);
---- 2070,2076 ----
- dup2(fids[1], 1); /* stdout = pipe to parent */
- /* get_defs("m4", dpy, display_name) */
- tmp_file = m4_defs(dpy, display_name);
-! execlp(M4PROG, "-s", tmp_file, "-", NULL);
- /* If we get here we are screwed... */
- perror("Can't execlp() m4");
- exit(124);
+$FreeBSD$
+
+--- parse.c.orig Thu May 5 08:24:55 2005
++++ parse.c Mon May 9 19:26:43 2005
+@@ -2126,7 +2126,7 @@
+ dup2(fids[1], 1); /* stdout = pipe to parent */
+ /* get_defs("m4", dpy, display_name) */
+ tmp_file = m4_defs(dpy, display_name);
+- execlp("m4", "m4", "-s", tmp_file, "-", NULL);
++ execl(M4PROG, M4PROGNAME, "-s", tmp_file, "-", NULL);
+ /* If we get here we are screwed... */
+ perror("Can't execlp() m4");
+ exit(124);
Index: files/patch-ac
===================================================================
RCS file: files/patch-ac
diff -N files/patch-ac
--- files/patch-ac 8 Aug 2002 06:23:55 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$FreeBSD: ports/x11-wm/ctwm/files/patch-ac,v 1.1 2002/08/08 06:23:55 glewis Exp $
-
---- gram.y.orig Thu Aug 8 15:45:21 2002
-+++ gram.y Thu Aug 8 15:45:31 2002
-@@ -683,7 +683,7 @@
- | wingeom_entries wingeom_entry
- ;
-
--wingeom_entry : string string { AddToList (&Scr->WindowGeometries, $1, $2) }
-+wingeom_entry : string string { AddToList (&Scr->WindowGeometries, $1, $2); }
-
-
-
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list