Date: Tue, 6 Feb 2001 14:10:03 -0800 (PST) From: e-devil <e-devil@e-devil.org> To: freebsd-ports@FreeBSD.org Subject: Re: ports/24908: using m4 instead of gnu m4, and did not find gtk Message-ID: <200102062210.f16MA3h98566@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/24908; it has been noted by GNATS.
From: e-devil <e-devil@e-devil.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Re: ports/24908: using m4 instead of gnu m4, and did not find gtk
Date: Tue, 6 Feb 2001 23:02:50 +0100
I fixed the Makefile, and removed the patch for configure.
Added dependencies for GNU M4.
the new patch follows.
Oyvind Albrigtsen
diff -uNr fvwm2-beta.orig/Makefile fvwm2-beta/Makefile
--- fvwm2-beta.orig/Makefile Tue Feb 6 22:34:19 2001
+++ fvwm2-beta/Makefile Tue Feb 6 22:48:35 2001
@@ -15,8 +15,12 @@
MAINTAINER= Cy.Schubert@uumail.gov.bc.ca
+BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
+RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4
+
USE_X_PREFIX= yes
USE_XPM= yes
+WANT_GTK= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
PLIST_SUB= VER=${PORTVERSION}
@@ -32,6 +36,12 @@
fvwm-menu-headlines.1 fvwm2.1 fvwm24_convert.1 fvwmbug.1 \
fvwmrc_convert.1 xpmroot.1
+.include <bsd.port.pre.mk>
+
+.if defined(HAVE_GTK)
+USE_GTK= yes
+.endif
+
post-extract:
@if ! (cd ${WRKDIR}/${DISTNAME} && ${MKDIR} icons && cd icons && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/fvwm_icons.tgz ${EXTRACT_AFTER_ARGS}); then \
exit 1; \
@@ -42,4 +52,4 @@
${INSTALL_DATA} ${WRKSRC}/icons/*.xpm \
${PREFIX}/lib/X11/fvwm2/pixmaps
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -uNr fvwm2-beta.orig/files/patch-fvwmm4.c fvwm2-beta/files/patch-fvwmm4.c
--- fvwm2-beta.orig/files/patch-fvwmm4.c Thu Jan 1 01:00:00 1970
+++ fvwm2-beta/files/patch-fvwmm4.c Sun Feb 4 16:19:14 2001
@@ -0,0 +1,11 @@
+--- modules/FvwmM4/FvwmM4.c.orig Fri Feb 2 16:04:52 2001
++++ modules/FvwmM4/FvwmM4.c Fri Feb 2 16:05:02 2001
+@@ -69,7 +69,7 @@
+ int m4_prefix; /* Do GNU m4 prefixing (-P) */
+ char m4_options[BUFSIZ]; /* Command line options to m4 */
+ char m4_outfile[BUFSIZ] = ""; /* The output filename for m4 */
+-char *m4_prog = "m4"; /* Name of the m4 program */
++char *m4_prog = "gm4"; /* Name of the m4 program */
+ int m4_default_quotes; /* Use default m4 quotes */
+ char *m4_startquote = "`"; /* Left quote characters for m4 */
+ char *m4_endquote = "'"; /* Right quote characters for m4 */
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200102062210.f16MA3h98566>