Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 20 Jan 2014 08:01:05 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r340372 - in head/x11-wm/ctwm: . files
Message-ID:  <201401200801.s0K8151s051165@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Mon Jan 20 08:01:05 2014
New Revision: 340372
URL: http://svnweb.freebsd.org/changeset/ports/340372
QAT: https://qat.redports.org/buildarchive/r340372/

Log:
  Support stage
  
  PR:		ports/185730
  Submitted by:	Matthew D.Fuller <fullermd@over-yonder.net> (maintainer)

Added:
  head/x11-wm/ctwm/files/patch-Imakefile   (contents, props changed)
Modified:
  head/x11-wm/ctwm/Makefile
  head/x11-wm/ctwm/pkg-plist

Modified: head/x11-wm/ctwm/Makefile
==============================================================================
--- head/x11-wm/ctwm/Makefile	Mon Jan 20 07:54:54 2014	(r340371)
+++ head/x11-wm/ctwm/Makefile	Mon Jan 20 08:01:05 2014	(r340372)
@@ -12,13 +12,11 @@ MASTER_SITES=	http://ctwm.free.lp.se/dis
 MAINTAINER=	fullermd@over-yonder.net
 COMMENT=	Extension to twm, with support for multiple virtual screens, etc
 
-LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
 
 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

Added: head/x11-wm/ctwm/files/patch-Imakefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-wm/ctwm/files/patch-Imakefile	Mon Jan 20 08:01:05 2014	(r340372)
@@ -0,0 +1,13 @@
+--- ./Imakefile.orig	2014-01-20 08:59:13.000000000 +0100
++++ ./Imakefile	2014-01-20 08:59:40.000000000 +0100
+@@ -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

Modified: head/x11-wm/ctwm/pkg-plist
==============================================================================
--- head/x11-wm/ctwm/pkg-plist	Mon Jan 20 07:54:54 2014	(r340371)
+++ head/x11-wm/ctwm/pkg-plist	Mon Jan 20 08:01:05 2014	(r340372)
@@ -90,5 +90,6 @@ lib/X11/twm/images/xrn.nonews.xpm
 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?201401200801.s0K8151s051165>