3 files changed, 50 insertions, 37 deletions

diff --git a/x11/tabbed/Makefile b/x11/tabbed/Makefile
index 83e1254737b5..c85b5f863b45 100644
--- a/x11/tabbed/Makefile
+++ b/x11/tabbed/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	tabbed
-PORTVERSION=	0.3
+PORTVERSION=	0.6
 CATEGORIES=	x11
 MASTER_SITES=	http://dl.suckless.org/tools/
 
@@ -13,11 +13,12 @@ LICENSE=	MIT
 
 USE_XORG=	x11
 
-MAN1=		tabbed.1
-PLIST_FILES=	bin/tabbed
+OPTIONS_DEFINE=	DOCS
+
+PLIST_FILES=	bin/tabbed \
+		man/man1/tabbed.1.gz
 PORTDOCS=	LICENSE README
 
-NO_STAGE=	yes
 pre-everything::
 	@${ECHO_MSG} "You can build tabbed with your own config.h using the TABBED_CONF knob:"
 	@${ECHO_MSG} "make TABBED_CONF=/path/to/tabbed/config.h install clean"
@@ -27,13 +28,11 @@ post-extract:
 	@${ECHO_MSG} "creating config.h from ${TABBED_CONF}"
 	@${CP} ${TABBED_CONF} ${WRKSRC}/config.h
 .endif
+	@${REINPLACE_CMD} 's|-std=c99 -pedantic -Wall -O0|${CFLAGS}|' \
+		${WRKSRC}/config.mk
 
 post-install:
-.if !defined(NOPORTDOCS)
-	@${ECHO_MSG} "installing additional documentation to ${DOCSDIR}"
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_MAN} ${WRKSRC}/LICENSE ${DOCSDIR}
-	@${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/x11/tabbed/distinfo b/x11/tabbed/distinfo
index 0f4d59f3d6fb..8af115909d34 100644
--- a/x11/tabbed/distinfo
+++ b/x11/tabbed/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tabbed-0.3.tar.gz) = bb72aa6e4831e0aadee8a6232d8532a548e736236bbaaed970e77fb5d3177ff0
-SIZE (tabbed-0.3.tar.gz) = 9177
+SHA256 (tabbed-0.6.tar.gz) = 7651ea3acbec5d6a25469e8665da7fc70aba2b4fa61a2a6a5449eafdfd641c42
+SIZE (tabbed-0.6.tar.gz) = 12926
diff --git a/x11/tabbed/files/patch-config.mk b/x11/tabbed/files/patch-config.mk
index a6e5ed4e804e..cbb51cbf5d80 100644
--- a/x11/tabbed/files/patch-config.mk
+++ b/x11/tabbed/files/patch-config.mk
@@ -1,25 +1,39 @@
---- config.mk.orig	2010-09-03 23:40:32.000000000 -0500
-+++ config.mk	2010-09-03 23:42:18.000000000 -0500
-@@ -4,12 +4,12 @@
- # Customize below to fit your system
- 
- # paths
--PREFIX = /usr/local
--MANPREFIX = ${PREFIX}/share/man
-+PREFIX?= /usr/local
-+MANPREFIX = ${PREFIX}/man
- 
- # includes and libs
--INCS = -I. -I/usr/include
--LIBS = -L/usr/lib -lc -lX11
-+INCS = -I. -I/usr/include -I/usr/local/include
-+LIBS = -L/usr/lib -L/usr/local/lib -lc -lX11
- 
- # flags
- CPPFLAGS = -DVERSION=\"${VERSION}\"
-@@ -21,4 +21,4 @@
- #LDFLAGS = ${LIBS}
- 
- # compiler and linker
--CC = cc
-+CC?= cc
+*** config.mk.orig	2014-01-19 21:53:24.000000000 +0400
+--- config.mk	2014-01-19 22:40:13.000000000 +0400
+***************
+*** 5,15 ****
+  
+  # paths
+  PREFIX = /usr/local
+! MANPREFIX = ${PREFIX}/share/man
+  
+  # includes and libs
+! INCS = -I. -I/usr/include
+! LIBS = -L/usr/lib -lc -lX11
+  
+  # flags
+  CPPFLAGS = -DVERSION=\"${VERSION}\" -D_BSD_SOURCE
+--- 5,15 ----
+  
+  # paths
+  PREFIX = /usr/local
+! MANPREFIX = ${PREFIX}/man
+  
+  # includes and libs
+! INCS = -I. -I/usr/local/include
+! LIBS = -L/usr/local/lib -lc -lX11
+  
+  # flags
+  CPPFLAGS = -DVERSION=\"${VERSION}\" -D_BSD_SOURCE
+***************
+*** 21,25 ****
+  #LDFLAGS = ${LIBS}
+  
+  # compiler and linker
+! CC = cc
+  
+--- 21,25 ----
+  #LDFLAGS = ${LIBS}
+  
+  # compiler and linker
+! CC?= cc