From 31a91a803a008f1256c7a3d917425a9eff95035c Mon Sep 17 00:00:00 2001
From: Alex Kozlov <ak@FreeBSD.org>
Date: Mon, 30 Sep 2013 04:32:30 +0000
Subject: - Fix build on 10.x [1] - Support STAGEDIR

Reported by:	pkg-fallout [1]
---
 x11-wm/vtwm/Makefile           | 8 +++++---
 x11-wm/vtwm/files/Makefile.bsd | 4 ++--
 x11-wm/vtwm/pkg-plist          | 4 ----
 3 files changed, 7 insertions(+), 9 deletions(-)
 delete mode 100644 x11-wm/vtwm/pkg-plist

(limited to 'x11-wm')

diff --git a/x11-wm/vtwm/Makefile b/x11-wm/vtwm/Makefile
index eb80f7da81b0..1c9a55d47ffc 100644
--- a/x11-wm/vtwm/Makefile
+++ b/x11-wm/vtwm/Makefile
@@ -12,16 +12,18 @@ COMMENT=	Twm with a virtual desktop and optional Motif-like features
 
 LICENSE=	MIT
 
-USE_XORG=	xpm xmu
+USE_XORG=	x11 xext xpm xmu
 MAKEFILE=	${FILESDIR}/Makefile.bsd
 
 ETCDIR?=	${PREFIX}/etc
-MAN1=		vtwm.1
+
+PLIST_FILES=	bin/vtwm \
+		etc/system.vtwmrc \
+		man/man1/vtwm.1.gz
 
 OPTIONS_DEFINE=	SOUND NLS
 OPTIONS_DEFAULT=	SOUND NLS
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSOUND}
diff --git a/x11-wm/vtwm/files/Makefile.bsd b/x11-wm/vtwm/files/Makefile.bsd
index cb098894b9c6..84239f6bf3ba 100644
--- a/x11-wm/vtwm/files/Makefile.bsd
+++ b/x11-wm/vtwm/files/Makefile.bsd
@@ -18,7 +18,7 @@ SYS_VTWMRC_LOOK = 3D
 CONFDEFINES=	'-DSYSTEM_VTWMRC="'$(ETCDIR)'/system.vtwmrc"' \
 		'-DSYSTEM_TWMRC="'$(ETCDIR)'/system.twmrc"'
 CFLAGS+=		-I/usr/local/include $(CONFDEFINES)
-LDADD+=			-L/usr/local/lib -ll -lXpm -lXmu
+LDADD+=			-L/usr/local/lib -ll -lX11 -lXext -lXpm -lXmu
 
 .if ${SOUND} == "yes"
 LDADD+=			-lrplay
@@ -32,7 +32,7 @@ SRCS=	gram.y gram.h lex.l deftwmrc.c add_window.c gc.c list.c twm.c sound.c \
 		parse.c menus.c events.c resize.c util.c version.c iconmgr.c \
 		cursor.c regions.c applets.c icons.c desktop.c doors.c lastmake.c
 
-FILES=	system.vtwmrc	
+FILES=	system.vtwmrc
 FILESDIR= $(ETCDIR)
 FILESMODE= 644
 
diff --git a/x11-wm/vtwm/pkg-plist b/x11-wm/vtwm/pkg-plist
deleted file mode 100644
index 3cc57a48d7cf..000000000000
--- a/x11-wm/vtwm/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/vtwm
-etc/system.vtwmrc
-@unexec rm -f %D/lib/X11/twm/system.vtwmrc
-@dirrmtry lib/X11/twm
-- 
cgit v1.2.3