summaryrefslogtreecommitdiffstats
path: root/x11-wm
diff options
context:
space:
mode:
authortorstenb <torstenb@FreeBSD.org>2000-02-13 19:29:15 +0000
committertorstenb <torstenb@FreeBSD.org>2000-02-13 19:29:15 +0000
commitf839b1fb359379301a8c3d354a33ba7a332fffc5 (patch)
tree9574205c1c658ea8696622e9c52c0e7a9e165ae8 /x11-wm
parent3d3a90ac310bbca0efac1aec842394cc06ec06cb (diff)
downloadFreeBSD-ports-f839b1fb359379301a8c3d354a33ba7a332fffc5.zip
FreeBSD-ports-f839b1fb359379301a8c3d354a33ba7a332fffc5.tar.gz
Upgrade to ctwm 3.5.2b (aka 3.5.3 - but the distfiles is still called 3.5.2b
for unknown reasons). Since the author of CTWM decided to depend on a feature of GNU's m4 this port now has a dependency on ports/devel/m4.
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/ctwm/Makefile15
-rw-r--r--x11-wm/ctwm/distinfo5
-rw-r--r--x11-wm/ctwm/files/patch-aa26
-rw-r--r--x11-wm/ctwm/files/patch-ab19
-rw-r--r--x11-wm/ctwm/pkg-plist112
5 files changed, 110 insertions, 67 deletions
diff --git a/x11-wm/ctwm/Makefile b/x11-wm/ctwm/Makefile
index 132e5fb..b605ad1 100644
--- a/x11-wm/ctwm/Makefile
+++ b/x11-wm/ctwm/Makefile
@@ -6,20 +6,23 @@
# $FreeBSD$
#
-DISTNAME= ctwm-3.5
-PKGNAME= ctwm-3.5.2
+DISTNAME= ctwm-3.5.2b
CATEGORIES= x11-wm
MASTER_SITES= ftp://slhp1.epfl.ch/pub/
-
-PATCH_SITES= ${MASTER_SITES}
-PATCHFILES= ctwm-3.5-3.5.1.diffs.gz ctwm-3.5.1-3.5.2.diffs.gz
-PATCH_DIST_STRIP= -p1
+DISTFILES+= ctwm-3.5.2b.tar.gz ctwm-images.tar.gz
MAINTAINER= torstenb@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
+BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
+RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4
+
+MAKE_ENV+= LOCALBASE=${LOCALBASE}
USE_IMAKE= yes
MAN1= ctwm.1
+post-extract:
+ @(cd ${WRKSRC} && ${LN} -s ../xpm xpm)
+
.include <bsd.port.mk>
diff --git a/x11-wm/ctwm/distinfo b/x11-wm/ctwm/distinfo
index 5fd6608..7a29697 100644
--- a/x11-wm/ctwm/distinfo
+++ b/x11-wm/ctwm/distinfo
@@ -1,3 +1,2 @@
-MD5 (ctwm-3.5.tar.gz) = e1ca78d934702e5c013da90476703301
-MD5 (ctwm-3.5-3.5.1.diffs.gz) = f34b7edfd4738703e730e11b5a9164f6
-MD5 (ctwm-3.5.1-3.5.2.diffs.gz) = fe693594699c8bfff877192b20daf104
+MD5 (ctwm-3.5.2b.tar.gz) = 7a77c6669ade274631d65d25537c9bd1
+MD5 (ctwm-images.tar.gz) = 4b0c784213af4afa2d736773863e53b4
diff --git a/x11-wm/ctwm/files/patch-aa b/x11-wm/ctwm/files/patch-aa
index 38f54d1..430b53e 100644
--- a/x11-wm/ctwm/files/patch-aa
+++ b/x11-wm/ctwm/files/patch-aa
@@ -1,5 +1,5 @@
-*** Imakefile.orig Sat Nov 15 16:09:18 1997
---- Imakefile Sat Nov 15 16:09:09 1997
+*** Imakefile.orig Mon Oct 4 15:51:08 1999
+--- Imakefile Sun Feb 13 19:01:33 2000
***************
*** 11,17 ****
#undef USE_SOUND
@@ -36,3 +36,25 @@
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 =
diff --git a/x11-wm/ctwm/files/patch-ab b/x11-wm/ctwm/files/patch-ab
new file mode 100644
index 0000000..e1d571d
--- /dev/null
+++ b/x11-wm/ctwm/files/patch-ab
@@ -0,0 +1,19 @@
+*** 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);
diff --git a/x11-wm/ctwm/pkg-plist b/x11-wm/ctwm/pkg-plist
index d8106fa..d7fb445 100644
--- a/x11-wm/ctwm/pkg-plist
+++ b/x11-wm/ctwm/pkg-plist
@@ -1,11 +1,39 @@
bin/ctwm
lib/X11/twm/system.ctwmrc
-lib/X11/twm/images/3D_Expand15.xpm
-lib/X11/twm/images/3D_Iconify15.xpm
-lib/X11/twm/images/3D_Lightning15.xpm
-lib/X11/twm/images/3D_Menu15.xpm
-lib/X11/twm/images/3D_Resize15.xpm
-lib/X11/twm/images/3D_Zoom15.xpm
+lib/X11/twm/images/arthur.xpm
+lib/X11/twm/images/claude.xpm
+lib/X11/twm/images/datebook.xpm
+lib/X11/twm/images/emacs.xpm
+lib/X11/twm/images/hpterm.xpm
+lib/X11/twm/images/mail0.xpm
+lib/X11/twm/images/mail1.xpm
+lib/X11/twm/images/pixmap.xpm
+lib/X11/twm/images/postit.xpm
+lib/X11/twm/images/unknown.xpm
+lib/X11/twm/images/xarchie.xpm
+lib/X11/twm/images/xedit.xpm
+lib/X11/twm/images/xgopher.xpm
+lib/X11/twm/images/xman.xpm
+lib/X11/twm/images/xrn.xpm
+lib/X11/twm/images/xterm.xpm
+lib/X11/twm/images/IslandD.xpm
+lib/X11/twm/images/IslandW.xpm
+lib/X11/twm/images/LRom.xpm
+lib/X11/twm/images/LRom1.xpm
+lib/X11/twm/images/cdrom1.xpm
+lib/X11/twm/images/nothing.xpm
+lib/X11/twm/images/term.xpm
+lib/X11/twm/images/unread.xpm
+lib/X11/twm/images/xcalc.xpm
+lib/X11/twm/images/xcalc2.xpm
+lib/X11/twm/images/xgrab.xpm
+lib/X11/twm/images/xhpcalc.xpm
+lib/X11/twm/images/xmail.xpm
+lib/X11/twm/images/xnomail.xpm
+lib/X11/twm/images/xrn.goodnews.xpm
+lib/X11/twm/images/xrn.nonews.xpm
+lib/X11/twm/images/welcome.xpm
+lib/X11/twm/images/xftp.xpm
lib/X11/twm/images/3dcircle.xpm
lib/X11/twm/images/3ddimple.xpm
lib/X11/twm/images/3ddot.xpm
@@ -13,15 +41,15 @@ lib/X11/twm/images/3dfeet.xpm
lib/X11/twm/images/3dleopard.xpm
lib/X11/twm/images/3dpie.xpm
lib/X11/twm/images/3dpyramid.xpm
-lib/X11/twm/images/3dslant.xpm
-lib/X11/twm/images/IslandD.xpm
-lib/X11/twm/images/IslandW.xpm
-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/background8.xpm
+lib/X11/twm/images/3dslant.xpm
+lib/X11/twm/images/3D_Expand15.xpm
+lib/X11/twm/images/3D_Iconify15.xpm
+lib/X11/twm/images/3D_Lightning15.xpm
lib/X11/twm/images/ball1.xpm
+lib/X11/twm/images/3D_Menu15.xpm
+lib/X11/twm/images/3D_Resize15.xpm
+lib/X11/twm/images/3D_Zoom15.xpm
lib/X11/twm/images/ball10.xpm
lib/X11/twm/images/ball11.xpm
lib/X11/twm/images/ball12.xpm
@@ -33,29 +61,6 @@ lib/X11/twm/images/ball6.xpm
lib/X11/twm/images/ball7.xpm
lib/X11/twm/images/ball8.xpm
lib/X11/twm/images/ball9.xpm
-lib/X11/twm/images/cdrom1.xpm
-lib/X11/twm/images/claude.xpm
-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
-lib/X11/twm/images/nothing.xpm
-lib/X11/twm/images/nt1.xpm
-lib/X11/twm/images/nt2.xpm
-lib/X11/twm/images/pixmap.xpm
-lib/X11/twm/images/postit.xpm
-lib/X11/twm/images/skull.xpm
-lib/X11/twm/images/spider.xpm
lib/X11/twm/images/supman1.xbm
lib/X11/twm/images/supman2.xbm
lib/X11/twm/images/supman3.xbm
@@ -65,29 +70,24 @@ lib/X11/twm/images/supman6.xbm
lib/X11/twm/images/supman7.xbm
lib/X11/twm/images/supman8.xbm
lib/X11/twm/images/supman9.xbm
-lib/X11/twm/images/term.xpm
-lib/X11/twm/images/unknown.xpm
+lib/X11/twm/images/skull.xpm
+lib/X11/twm/images/spider.xpm
+lib/X11/twm/images/nt1.xpm
+lib/X11/twm/images/nt2.xpm
+lib/X11/twm/images/audio_editor.xpm
+lib/X11/twm/images/clipboard.xpm
+lib/X11/twm/images/ghostview.xpm
lib/X11/twm/images/unknown1.xpm
-lib/X11/twm/images/unread.xpm
-lib/X11/twm/images/welcome.xpm
-lib/X11/twm/images/welcome.xwd
-lib/X11/twm/images/xarchie.xpm
-lib/X11/twm/images/xcalc.xpm
-lib/X11/twm/images/xcalc2.xpm
-lib/X11/twm/images/xedit.xpm
-lib/X11/twm/images/xftp.xpm
-lib/X11/twm/images/xgopher.xpm
-lib/X11/twm/images/xgrab.xpm
-lib/X11/twm/images/xhpcalc.xpm
lib/X11/twm/images/xirc.xpm
-lib/X11/twm/images/xmail.xpm
-lib/X11/twm/images/xman.xpm
lib/X11/twm/images/xmosaic.xpm
-lib/X11/twm/images/xnomail.xpm
lib/X11/twm/images/xrn-compose.xpm
-lib/X11/twm/images/xrn.goodnews.xpm
-lib/X11/twm/images/xrn.nonews.xpm
-lib/X11/twm/images/xrn.xpm
-lib/X11/twm/images/xterm.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/welcome.xwd
@dirrm lib/X11/twm/images
@unexec rmdir %D/lib/X11/twm 2>/dev/null || true
OpenPOWER on IntegriCloud