diff options
| author | pav <pav@FreeBSD.org> | 2007-03-24 22:52:52 +0800 |
|---|---|---|
| committer | pav <pav@FreeBSD.org> | 2007-03-24 22:52:52 +0800 |
| commit | 6e93aead7c3efa48277526dd2500b216eac9b258 (patch) | |
| tree | 02aa16a6d77e6fef800f210028807c9120661d66 /x11-wm/ctwm | |
| parent | 67e009f636f7c2eaf6d2c23462c37e0343e386c8 (diff) | |
| download | freebsd-ports-gnome-6e93aead7c3efa48277526dd2500b216eac9b258.tar.gz freebsd-ports-gnome-6e93aead7c3efa48277526dd2500b216eac9b258.tar.zst freebsd-ports-gnome-6e93aead7c3efa48277526dd2500b216eac9b258.zip | |
- Drop GNU m4 dependency, unless running on really old FreeBSD version
PR: ports/110743
Submitted by: Matthew D. Fuller <fullermd@over-yonder.net> (maintainer)
Diffstat (limited to 'x11-wm/ctwm')
| -rw-r--r-- | x11-wm/ctwm/Makefile | 15 | ||||
| -rw-r--r-- | x11-wm/ctwm/files/gm4-patch (renamed from x11-wm/ctwm/files/patch-ab) | 16 | ||||
| -rw-r--r-- | x11-wm/ctwm/files/patch-aa | 18 |
3 files changed, 28 insertions, 21 deletions
diff --git a/x11-wm/ctwm/Makefile b/x11-wm/ctwm/Makefile index b5a10ffefc24..f39b9a777b1f 100644 --- a/x11-wm/ctwm/Makefile +++ b/x11-wm/ctwm/Makefile @@ -7,6 +7,7 @@ PORTNAME= ctwm PORTVERSION= 3.8a +PORTREVISION= 1 CATEGORIES= x11-wm MASTER_SITES= http://ctwm.free.lp.se/dist/ \ http://www.centralmiss.com/~matt/distfiles/ @@ -14,16 +15,24 @@ MASTER_SITES= http://ctwm.free.lp.se/dist/ \ 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 +.include <bsd.port.pre.mk> + +# Very old versions need GNU m4 +.if ( ${OSVERSION} < 450005 || \ + ( ${OSVERSION} >= 500000 && ${OSVERSION} < 500034 ) ) +EXTRA_PATCHES+= ${FILESDIR}/gm4-patch +BUILD_DEPENDS+= gm4:${PORTSDIR}/devel/m4 +RUN_DEPENDS+= gm4:${PORTSDIR}/devel/m4 +.endif + pre-configure: ${CP} ${WRKSRC}/Imakefile.local-template ${WRKSRC}/Imakefile.local ${CAT} ${FILESDIR}/Imakefile.local-additional >> ${WRKSRC}/Imakefile.local -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/x11-wm/ctwm/files/patch-ab b/x11-wm/ctwm/files/gm4-patch index b593bc6f77a9..183637ca2a6e 100644 --- a/x11-wm/ctwm/files/patch-ab +++ b/x11-wm/ctwm/files/gm4-patch @@ -1,5 +1,21 @@ $FreeBSD$ +--- 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 = --- parse.c.orig Fri Feb 16 03:24:27 2007 +++ parse.c Sun Mar 4 18:36:18 2007 @@ -2128,7 +2128,7 @@ diff --git a/x11-wm/ctwm/files/patch-aa b/x11-wm/ctwm/files/patch-aa deleted file mode 100644 index 6aaca9b8a2a0..000000000000 --- a/x11-wm/ctwm/files/patch-aa +++ /dev/null @@ -1,18 +0,0 @@ -$FreeBSD$ - ---- 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 = |