Date: Mon, 13 Jan 2014 00:07:36 -0600 (CST) From: "Matthew D.Fuller" <fullermd@over-yonder.net> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/185730: [MAINTAINER] STAGEify x11-wm/ctwm Message-ID: <3f2kqD4CZWz6ZN@draco.over-yonder.net> Resent-Message-ID: <201401130610.s0D6A0kd012067@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 185730
>Category: ports
>Synopsis: [MAINTAINER] STAGEify x11-wm/ctwm
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Jan 13 06:10:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Matthew D. Fuller
>Release: FreeBSD 9.1-STABLE amd64
>Organization:
>Environment:
System: FreeBSD draco.over-yonder.net 9.1-STABLE FreeBSD 9.1-STABLE #0 r251584: Sun Jun 9 14:23:33 CDT 2013 root@draco.over-yonder.net:/usr/obj/usr/src/sys/DRACO amd64
>Description:
>How-To-Repeat:
>Fix:
Index: Makefile
===================================================================
--- Makefile (revision 339568)
+++ 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
Property changes on: files/patch-Imakefile
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: pkg-plist
===================================================================
--- pkg-plist (revision 339568)
+++ 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
@dirrm lib/X11/twm/images
@dirrmtry lib/X11/twm
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3f2kqD4CZWz6ZN>