From c5fe5a07530626f820c56093bcb8d8c8d3d2ae33 Mon Sep 17 00:00:00 2001 From: Pav Lucistnik Date: Wed, 20 Jul 2005 08:39:52 +0000 Subject: - Update to 3.7 - Take maintainership PR: ports/83762 Submitted by: Matthew D. Fuller --- x11-wm/ctwm/Makefile | 14 +++--- x11-wm/ctwm/distinfo | 6 +-- x11-wm/ctwm/files/Imakefile.local-additional | 9 ++++ x11-wm/ctwm/files/patch-aa | 75 ++++++---------------------- x11-wm/ctwm/files/patch-ab | 32 +++++------- x11-wm/ctwm/files/patch-ac | 13 ----- x11-wm/ctwm/pkg-plist | 15 +++--- 7 files changed, 55 insertions(+), 109 deletions(-) create mode 100644 x11-wm/ctwm/files/Imakefile.local-additional delete mode 100644 x11-wm/ctwm/files/patch-ac (limited to 'x11-wm') diff --git a/x11-wm/ctwm/Makefile b/x11-wm/ctwm/Makefile index 57c1f2c64da1..8c12dab4e3fa 100644 --- a/x11-wm/ctwm/Makefile +++ b/x11-wm/ctwm/Makefile @@ -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@FreeBSD.org +MAINTAINER= fullermd@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 diff --git a/x11-wm/ctwm/distinfo b/x11-wm/ctwm/distinfo index 190ba801d5a1..f168df8f57b5 100644 --- a/x11-wm/ctwm/distinfo +++ b/x11-wm/ctwm/distinfo @@ -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 diff --git a/x11-wm/ctwm/files/Imakefile.local-additional b/x11-wm/ctwm/files/Imakefile.local-additional new file mode 100644 index 000000000000..7a6ba937b9cc --- /dev/null +++ b/x11-wm/ctwm/files/Imakefile.local-additional @@ -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 diff --git a/x11-wm/ctwm/files/patch-aa b/x11-wm/ctwm/files/patch-aa index 61e80d9984cb..6aaca9b8a2a0 100644 --- a/x11-wm/ctwm/files/patch-aa +++ b/x11-wm/ctwm/files/patch-aa @@ -1,61 +1,18 @@ $FreeBSD$ -*** 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 = diff --git a/x11-wm/ctwm/files/patch-ab b/x11-wm/ctwm/files/patch-ab index e1d571d10e4e..0c79f05a759e 100644 --- a/x11-wm/ctwm/files/patch-ab +++ b/x11-wm/ctwm/files/patch-ab @@ -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); diff --git a/x11-wm/ctwm/files/patch-ac b/x11-wm/ctwm/files/patch-ac deleted file mode 100644 index 75c519283b4f..000000000000 --- a/x11-wm/ctwm/files/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$FreeBSD$ - ---- 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); } - - - diff --git a/x11-wm/ctwm/pkg-plist b/x11-wm/ctwm/pkg-plist index 86ea2c6eaa5e..f62dc85b4772 100644 --- a/x11-wm/ctwm/pkg-plist +++ b/x11-wm/ctwm/pkg-plist @@ -19,7 +19,15 @@ lib/X11/twm/images/LRom.xpm 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/clipboard.xpm 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 -- cgit v1.2.3