Attachment #76866 for bug #110743

View | Details | Raw Unified | Return to bug 110743
Collapse All | Expand All




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.post.mk>




$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 @@
                 dup2(fids[1], 1);       /* stdout = pipe to parent */
                 /* get_defs("m4", dpy, display_name) */
                 tmp_file = m4_defs(dpy, display_name);
-                execlp("m4", "m4",
+                execlp(M4PROG, M4PROGNAME,
 #if !defined(__NetBSD__)
 			"-s",
 #endif




$FreeBSD: ports/x11-wm/ctwm/files/patch-aa,v 1.10 2005/07/20 08:39:52 pav Exp $

--- 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 = 




$FreeBSD: ports/x11-wm/ctwm/files/patch-ab,v 1.3 2007/03/06 00:24:51 clsung Exp $

--- parse.c.orig	Fri Feb 16 03:24:27 2007
+++ parse.c	Sun Mar  4 18:36:18 2007
@@ -2128,7 +2128,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",
+                execlp(M4PROG, M4PROGNAME,
 #if !defined(__NetBSD__)
 			"-s",
 #endif

Return to bug 110743

Lines 14-29 Link Here

(-)Makefile (-3 / +11 lines)
14	MAINTAINER= fullermd@over-yonder.net	14	MAINTAINER= fullermd@over-yonder.net
15	COMMENT= An extension to twm, with support for multiple virtual screens, etc	15	COMMENT= An extension to twm, with support for multiple virtual screens, etc
16		16
17	BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
18	RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4
19	LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg	17	LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg
20		18
21	USE_IMAKE= yes	19	USE_IMAKE= yes
22	USE_XPM= yes	20	USE_XPM= yes
23	MAN1= ctwm.1	21	MAN1= ctwm.1
24		22
		23	.include <bsd.port.pre.mk>
		24
		25	# Very old versions need GNU m4
		26	.if ( ${OSVERSION} < 450005 \|\| \
		27	( ${OSVERSION} >= 500000 && ${OSVERSION} < 500034 ) )
		28	EXTRA_PATCHES+= ${FILESDIR}/gm4-patch
		29	BUILD_DEPENDS+= gm4:${PORTSDIR}/devel/m4
		30	RUN_DEPENDS+= gm4:${PORTSDIR}/devel/m4
		31	.endif
		32
25	pre-configure:	33	pre-configure:
26	${CP} ${WRKSRC}/Imakefile.local-template ${WRKSRC}/Imakefile.local	34	${CP} ${WRKSRC}/Imakefile.local-template ${WRKSRC}/Imakefile.local
27	${CAT} ${FILESDIR}/Imakefile.local-additional >> ${WRKSRC}/Imakefile.local	35	${CAT} ${FILESDIR}/Imakefile.local-additional >> ${WRKSRC}/Imakefile.local
28		36
29	.include <bsd.port.mk>	37	.include <bsd.port.post.mk>

Added Link Here

(-)files/gm4-patch (+29 lines)
1	$FreeBSD$
2
3	--- Imakefile.orig Thu May 5 08:22:40 2005
4	+++ Imakefile Mon May 9 19:30:45 2005
5	@@ -67,10 +67,12 @@
6	#endif
7
8	#if defined USE_M4 \|\| defined USEM4
9	+ M4PROGNAME = gm4
10	+ M4PROG = $(LOCALBASE)/bin/$(M4PROGNAME)
11	M4LIBDIR =
12	M4INCDIR =
13
14	- M4DEFINES = -DUSEM4
15	+ M4DEFINES = -DUSEM4 -DM4PROG=\"$(M4PROG)\" -DM4PROGNAME=\"$(M4PROGNAME)\"
16	M4LIB = $(M4LIBDIR)
17	#else
18	M4LIBDIR =
19	--- parse.c.orig Fri Feb 16 03:24:27 2007
20	+++ parse.c Sun Mar 4 18:36:18 2007
21	@@ -2128,7 +2128,7 @@
22	dup2(fids[1], 1); /* stdout = pipe to parent */
23	/* get_defs("m4", dpy, display_name) */
24	tmp_file = m4_defs(dpy, display_name);
25	- execlp("m4", "m4",
26	+ execlp(M4PROG, M4PROGNAME,
27	#if !defined(__NetBSD__)
28	"-s",
29	#endif

Removed Link Here

(-)files/patch-aa (-18 lines)
1	$FreeBSD: ports/x11-wm/ctwm/files/patch-aa,v 1.10 2005/07/20 08:39:52 pav Exp $
2
3	--- Imakefile.orig Thu May 5 08:22:40 2005
4	+++ Imakefile Mon May 9 19:30:45 2005
5	@@ -67,10 +67,12 @@
6	#endif
7
8	#if defined USE_M4 \|\| defined USEM4
9	+ M4PROGNAME = gm4
10	+ M4PROG = $(LOCALBASE)/bin/$(M4PROGNAME)
11	M4LIBDIR =
12	M4INCDIR =
13
14	- M4DEFINES = -DUSEM4
15	+ M4DEFINES = -DUSEM4 -DM4PROG=\"$(M4PROG)\" -DM4PROGNAME=\"$(M4PROGNAME)\"
16	M4LIB = $(M4LIBDIR)
17	#else
18	M4LIBDIR =

Removed Link Here

(-)files/patch-ab (-13 lines)
1	$FreeBSD: ports/x11-wm/ctwm/files/patch-ab,v 1.3 2007/03/06 00:24:51 clsung Exp $
2
3	--- parse.c.orig Fri Feb 16 03:24:27 2007
4	+++ parse.c Sun Mar 4 18:36:18 2007
5	@@ -2128,7 +2128,7 @@
6	dup2(fids[1], 1); /* stdout = pipe to parent */
7	/* get_defs("m4", dpy, display_name) */
8	tmp_file = m4_defs(dpy, display_name);
9	- execlp("m4", "m4",
10	+ execlp(M4PROG, M4PROGNAME,
11	#if !defined(__NetBSD__)
12	"-s",
13	#endif