aboutsummaryrefslogtreecommitdiffstats
path: root/x11-wm
diff options
context:
space:
mode:
authorbapt <bapt@FreeBSD.org>2013-01-08 04:50:20 +0800
committerbapt <bapt@FreeBSD.org>2013-01-08 04:50:20 +0800
commit50554743437f66d65a2f937157963c5690f61803 (patch)
treec532e96c629a3d179d5c6a9afedc5d84033ebf76 /x11-wm
parent56b694dfc518532b78f5bdbbe271e46752eb602f (diff)
downloadfreebsd-ports-gnome-50554743437f66d65a2f937157963c5690f61803.tar.gz
freebsd-ports-gnome-50554743437f66d65a2f937157963c5690f61803.tar.zst
freebsd-ports-gnome-50554743437f66d65a2f937157963c5690f61803.zip
Convert dhn's ports to the new options framework
While here trim headers and convert some USE_GNOME=pkgconfig to USE_PKGCONFIG=build Approved by: maintainer (dhn)
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/ratpoison/Makefile21
-rw-r--r--x11-wm/wmfs/Makefile23
2 files changed, 18 insertions, 26 deletions
diff --git a/x11-wm/ratpoison/Makefile b/x11-wm/ratpoison/Makefile
index 811becd5bd09..f8c5f9e39fe2 100644
--- a/x11-wm/ratpoison/Makefile
+++ b/x11-wm/ratpoison/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: ratpoison
-# Date created: January 20, 2001
-# Whom: Gergely Nagy <8@free.bsd.hu>
-#
+# Created by: Gergely Nagy <8@free.bsd.hu>
# $FreeBSD$
-#
PORTNAME= ratpoison
PORTVERSION= 1.4.5
@@ -19,16 +15,17 @@ COMMENT= Simple window manager with no fat library dependencies
USE_XORG= xext xinerama xtst
GNU_CONFIGURE= yes
-OPTIONS= GDM_SUPPORT "Install session data files for GDM" off
+OPTIONS_DEFINE= GDM_SUPPORT DOCS
+GDM_SUPPORT_DESC= Install session data files for GDM
SUB_FILES= ratpoison.desktop
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
post-patch:
${REINPLACE_CMD} -e 's|bash|sh|g' ${WRKSRC}/contrib/allwindows.sh
-.if defined (WITH_GDM_SUPPORT)
+.if ${PORT_OPTIONS:MGDM_SUPPORT}
PLIST_SUB+= WITH_GDM=""
post-install:
@@ -38,11 +35,11 @@ post-install:
PLIST_SUB+= WITH_GDM="@comment "
.endif
-.if defined(NOPORTDOCS)
-INSTALL_TARGET= SUBDIRS=src install-exec
-.else
+.if ${PORT_OPTIONS:MDOCS}
MAN1= ratpoison.1
INFO= ratpoison
+.else
+INSTALL_TARGET= SUBDIRS=src install-exec
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-wm/wmfs/Makefile b/x11-wm/wmfs/Makefile
index 926cd1441475..87daa5ce8107 100644
--- a/x11-wm/wmfs/Makefile
+++ b/x11-wm/wmfs/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: wmfs
-# Date created: 08 December 2008
-# Whom: Dennis Herrmann <adox@mcx2.org>
-#
+# Created by: Dennis Herrmann <adox@mcx2.org>
# $FreeBSD$
-#
PORTNAME= wmfs
DISTVERSION= 201104
@@ -19,7 +15,7 @@ LICENSE= BSD
LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2
-USE_GNOME= pkgconfig
+USE_PKGCONFIG= build
USE_XORG= x11 xft xpm
HAS_CONFIGURE= yes
@@ -28,29 +24,28 @@ MANCOMPRESSED= yes
SUB_FILES= pkg-message
-OPTIONS= XRANDR "Enable xrandr support" on \
- XINERAMA "Enable xinerama support" on \
- IMLIB "Enable Imlib2 support" on
+OPTIONS_DEFINE= XRANDR XINERAMA IMLIB
+OPTIONS_DEFAULT= XRANDR XINERAMA IMLIB
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
CONFIGURE_ARGS= --prefix ${PREFIX} \
--man-prefix ${MANPREFIX}/man \
--xdg-config-dir ${PREFIX}/etc/xdg
-.if defined(WITH_XRANDR)
+.if ${PORT_OPTIONS:MXRANDR}
USE_XORG+= xrandr
.else
CONFIGURE_ARGS+= --without-xrandr
.endif
-.if defined(WITH_XINERAMA)
+.if ${PORT_OPTIONS:MXINERAMA}
USE_XORG+= xinerama
.else
CONFIGURE_ARGS+= --without-xinerama
.endif
-.if defined(WITH_IMLIB)
+.if ${PORT_OPTIONS:MIMLIB}
USE_EFL+= imlib2
.else
CONFIGURE_ARGS+= --without-imlib2
@@ -59,4 +54,4 @@ CONFIGURE_ARGS+= --without-imlib2
post-install:
@${CAT} ${PKGMESSAGE}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>