Date: Wed, 15 Jan 2014 11:00:01 GMT From: "Matthew D.Fuller" <fullermd@over-yonder.net> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/185730: [MAINTAINER] STAGEify x11-wm/ctwm Message-ID: <201401151100.s0FB01H3027704@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/185730; it has been noted by GNATS.
From: "Matthew D.Fuller" <fullermd@over-yonder.net>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc:
Subject: Re: ports/185730: [MAINTAINER] STAGEify x11-wm/ctwm
Date: Wed, 15 Jan 2014 04:59:18 -0600
Whoops, slightly wrong patch, plus gnats seems a little confused by
the extra svn spewage in the diff. Cleaned up:
Index: Makefile
===================================================================
--- Makefile (revision 339625)
+++ Makefile (working copy)
@@ -16,9 +16,7 @@
USES= imake
USE_XORG= xpm xmu
-MAN1= ctwm.1
-NO_STAGE= yes
pre-configure:
${CP} ${WRKSRC}/Imakefile.local-template ${WRKSRC}/Imakefile.local
${CAT} ${FILESDIR}/Imakefile.local-additional >> ${WRKSRC}/Imakefile.local
Index: files/patch-Imakefile
===================================================================
--- files/patch-Imakefile (revision 0)
+++ files/patch-Imakefile (working copy)
@@ -0,0 +1,13 @@
+--- Imakefile.orig 2014-01-12 23:55:22.734333835 -0600
++++ Imakefile 2014-01-12 23:55:29.061331935 -0600
+@@ -167,8 +167,8 @@
+ 3dcircle.xpm 3ddimple.xpm 3ddot.xpm 3dfeet.xpm 3dleopard.xpm \
+ 3dpie.xpm 3dpyramid.xpm 3dslant.xpm
+
+-SpecialObjectRule(parse.o,parse.c,'-DSYSTEM_INIT_FILE="$(DESTDIR)$(CONFDIR)/system.ctwmrc"' '-DPIXMAP_DIRECTORY="$(DESTDIR)$(PIXMAPDIR)"')
+-SpecialObjectRule(ctwm.o,ctwm.c,'-DPIXMAP_DIRECTORY="$(DESTDIR)$(PIXMAPDIR)"')
++SpecialObjectRule(parse.o,parse.c,'-DSYSTEM_INIT_FILE="$(CONFDIR)/system.ctwmrc"' '-DPIXMAP_DIRECTORY="$(PIXMAPDIR)"')
++SpecialObjectRule(ctwm.o,ctwm.c,'-DPIXMAP_DIRECTORY="$(PIXMAPDIR)"')
+ #if !HasPutenv
+ SpecialObjectRule(util.o,util.c,-DNOPUTENV)
+ #endif
Index: pkg-plist
===================================================================
--- pkg-plist (revision 339625)
+++ pkg-plist (working copy)
@@ -90,5 +90,6 @@
lib/X11/twm/images/xrn.xpm
lib/X11/twm/images/xterm.xpm
lib/X11/twm/system.ctwmrc
+man/man1/ctwm.1.gz
@dirrm lib/X11/twm/images
@dirrmtry lib/X11/twm
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401151100.s0FB01H3027704>