Attachment 76866 Details for Bug 110743 – file.diff

[patch] file.diff

file.diff (text/plain), 3.57 KB, created by fullermd on 2007-03-24 02:10:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: fullermd

Created: 2007-03-24 02:10:04 UTC

Size: 3.57 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /usr/cvs/ports/x11-wm/ctwm/Makefile,v
>retrieving revision 1.42
>diff -u -r1.42 Makefile
>--- Makefile	6 Mar 2007 00:24:51 -0000	1.42
>+++ Makefile	24 Mar 2007 02:01:44 -0000
>@@ -14,16 +14,24 @@
> 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>
>Index: files/gm4-patch
>===================================================================
>RCS file: files/gm4-patch
>diff -N files/gm4-patch
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/gm4-patch	24 Mar 2007 01:57:53 -0000
>@@ -0,0 +1,29 @@
>+$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
>Index: files/patch-aa
>===================================================================
>RCS file: files/patch-aa
>diff -N files/patch-aa
>--- files/patch-aa	20 Jul 2005 08:39:52 -0000	1.10
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,18 +0,0 @@
>-$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 = 
>Index: files/patch-ab
>===================================================================
>RCS file: files/patch-ab
>diff -N files/patch-ab
>--- files/patch-ab	6 Mar 2007 00:24:51 -0000	1.3
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,13 +0,0 @@
>-$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

Actions: View | Diff

Attachments on bug 110743: 76866