svn commit: r328771 - in head/x11-wm/vtwm: . files
Alex Kozlov
ak at FreeBSD.org
Mon Sep 30 04:32:31 UTC 2013
Author: ak
Date: Mon Sep 30 04:32:30 2013
New Revision: 328771
URL: http://svnweb.freebsd.org/changeset/ports/328771
Log:
- Fix build on 10.x [1]
- Support STAGEDIR
Reported by: pkg-fallout [1]
Deleted:
head/x11-wm/vtwm/pkg-plist
Modified:
head/x11-wm/vtwm/Makefile
head/x11-wm/vtwm/files/Makefile.bsd (contents, props changed)
Modified: head/x11-wm/vtwm/Makefile
==============================================================================
--- head/x11-wm/vtwm/Makefile Mon Sep 30 04:17:06 2013 (r328770)
+++ head/x11-wm/vtwm/Makefile Mon Sep 30 04:32:30 2013 (r328771)
@@ -12,16 +12,18 @@ COMMENT= Twm with a virtual desktop and
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}
Modified: head/x11-wm/vtwm/files/Makefile.bsd
==============================================================================
--- head/x11-wm/vtwm/files/Makefile.bsd Mon Sep 30 04:17:06 2013 (r328770)
+++ head/x11-wm/vtwm/files/Makefile.bsd Mon Sep 30 04:32:30 2013 (r328771)
@@ -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
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
More information about the svn-ports-all
mailing list