Fix build

x11-wm/notion/Makefile

 # Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
-# $FreeBSD$
 
 PORTNAME=	notion
 PORTVERSION=	2014052800
@@ -8,36 +7,36 @@ MASTER_SITES=	SF/${PORTNAME}
 DISTNAME=	${PORTNAME}-3-${PORTVERSION}-src
 
 MAINTAINER=	amdmi3@FreeBSD.org
-COMMENT=	A tiling tabbed window manager
+COMMENT=	Tiling tabbed window manager
 
-USE_XORG=	x11 xext sm
-USES=		gmake gettext tar:bzip2 lua pkgconfig
+LICENSE=	LGPL21
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=		gettext gmake lua pkgconfig tar:bzip2 xorg
+USE_XORG=	sm x11 xext
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-3-${PORTVERSION}
 
 PORTDOCS=	*
 
-OPTIONS_DEFINE=	XINERAMA XRANDR DOCS
-OPTIONS_DEFAULT=XINERAMA XRANDR
-OPTIONS_SUB=	yes
+OPTIONS_DEFINE=		DOCS XINERAMA XRANDR
+OPTIONS_DEFAULT=	XINERAMA XRANDR
+OPTIONS_SUB=		yes
 
 XINERAMA_DESC=	Xinerama module support
-XINERAMA_USE=	XORG=xinerama
 XRANDR_DESC=	Xrandr module support
-XRANDR_USE=	XORG=xrandr
 
-.include <bsd.port.options.mk>
+XINERAMA_USE=	XORG=xinerama
+XRANDR_USE=	XORG=xrandr
 
-post-patch:
-.if ! ${PORT_OPTIONS:MDOCS}
+post-patch-DOCS-off:
 	@${REINPLACE_CMD} -e '/^_install:/,/^$$/ d' ${WRKSRC}/Makefile
-.endif
-.if ! ${PORT_OPTIONS:MXINERAMA}
+
+post-patch-XINERAMA-off:
 	@${REINPLACE_CMD} -e 's|mod_xinerama||' ${WRKSRC}/modulelist.mk
-.endif
-.if ! ${PORT_OPTIONS:MXRANDR}
+
+post-patch-XRANDR-off:
 	@${REINPLACE_CMD} -e 's|mod_xrandr||' ${WRKSRC}/modulelist.mk
-.endif
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/notion \

x11-wm/notion/files/patch-build__lua-detect.mk

---- build/lua-detect.mk.orig	2014-05-28 02:00:18.000000000 +0400
-+++ build/lua-detect.mk	2014-06-09 18:58:27.837518042 +0400
+--- build/lua-detect.mk.orig	2014-05-27 22:00:18 UTC
++++ build/lua-detect.mk
 @@ -14,8 +14,8 @@
  #  * LUAC (full path to lua compiler)
  
@@ -11,7 +11,7 @@
      || (pkg-config --exists lua    && echo 5.0)))
  
  ifeq ($(LUA_VERSION),)
-@@ -27,7 +27,7 @@
+@@ -27,7 +27,7 @@ ifeq ($(LUA_VERSION),5.0)
      LUA_VERSION=
  endif
  

x11-wm/notion/files/patch-system-autodetect.mk

---- system-autodetect.mk.orig	2014-05-28 02:00:18.000000000 +0400
-+++ system-autodetect.mk	2014-06-09 19:03:02.992638832 +0400
-@@ -19,7 +19,7 @@
+--- system-autodetect.mk.orig	2014-05-27 22:00:18 UTC
++++ system-autodetect.mk
+@@ -19,7 +19,7 @@ BINDIR=$(PREFIX)/bin
  # Some .lua files and ion-* shell scripts
  SHAREDIR=$(PREFIX)/share/notion
  # Manual pages
@@ -9,7 +9,7 @@
  # Some documents
  DOCDIR=$(PREFIX)/share/doc/notion
  # Nothing at the moment
-@@ -63,7 +63,7 @@
+@@ -63,7 +63,7 @@ endif
  
  # Flags to link with libdl. Even if PRELOAD_MODULES=1, you may need this
  # setting (for e.g. Lua, when not instructed by pkg-config).
@@ -18,7 +18,7 @@
  
  
  ##
-@@ -77,7 +77,7 @@
+@@ -77,7 +77,7 @@ include $(TOPDIR)/build/lua-detect.mk
  ##
  
  # Paths
@@ -27,7 +27,7 @@
  # SunOS/Solaris
  #X11_PREFIX ?= /usr/openwin
  
-@@ -86,7 +86,7 @@
+@@ -86,7 +86,7 @@ X11_INCLUDES=-I$(X11_PREFIX)/include
  
  # XFree86 libraries up to 4.3.0 have a bug that can cause a segfault.
  # The following setting  should  work around that situation.
@@ -36,7 +36,7 @@
  
  # Use the Xutf8 routines (XFree86 extension) instead of the Xmb routines
  # in an UTF-8 locale. (No, you don't need this in UTF-8 locales, and 
-@@ -109,11 +109,11 @@
+@@ -109,11 +109,11 @@ DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WORKAROUND
  #DEFINES += -DCF_NO_LOCALE -DCF_NO_GETTEXT
  
  # On some other systems you may need to explicitly link against libintl.
@@ -50,7 +50,7 @@
  
  
  ##
-@@ -128,7 +128,7 @@
+@@ -128,7 +128,7 @@ HAS_SYSTEM_ASPRINTF ?= 1
  # The following setting is needed with GNU libc for clock_gettime and the
  # monotonic clock. Other systems may not need it, or may not provide a
  # monotonic clock at all (which Ion can live with, and usually detect).
@@ -59,7 +59,7 @@
  
  # Cygwin needs this. Also when you disable _BSD_SOURCE you may need it.
  #DEFINES += -DCF_NO_GETLOADAVG
-@@ -149,7 +149,7 @@
+@@ -149,7 +149,7 @@ CC ?= gcc
  
  WARN=-W -Wall -pedantic 
  
@@ -68,7 +68,7 @@
            -DHAS_SYSTEM_ASPRINTF=$(HAS_SYSTEM_ASPRINTF)
  
  LDFLAGS += -Wl,--as-needed $(LIBS) $(EXTRA_LIBS)
-@@ -167,7 +167,7 @@
+@@ -167,7 +167,7 @@ POSIX_SOURCE?=-D_POSIX_C_SOURCE=200112L
  BSD_SOURCE?=-D_BSD_SOURCE
  
  # Most systems

x11-wm/notion/pkg-plist

@@ -79,13 +79,13 @@ share/locale/fr/LC_MESSAGES/notion.mo
 %%DATADIR%%/welcome.cs.txt
 %%DATADIR%%/welcome.fi.txt
 %%DATADIR%%/welcome.txt
-@dirrm %%DATADIR%%
-@dirrmtry man/fi/man1
-@dirrmtry man/fi
-@dirrmtry man/cs/man1
-@dirrmtry man/cs
-@dirrm lib/notion/mod
-@dirrm lib/notion/lc
-@dirrm lib/notion/bin
-@dirrm lib/notion
-@dirrm etc/notion
+@dir %%DATADIR%%
+@dir man/fi/man1
+@dir man/fi
+@dir man/cs/man1
+@dir man/cs
+@dir lib/notion/mod
+@dir lib/notion/lc
+@dir lib/notion/bin
+@dir lib/notion
+@dir etc/notion