6 files changed, 88 insertions, 10 deletions

diff --git a/x11/dzen2/Makefile b/x11/dzen2/Makefile
index 7d72cfa0eb68..2b4fbf1a5cb9 100644
--- a/x11/dzen2/Makefile
+++ b/x11/dzen2/Makefile
@@ -3,22 +3,27 @@
 
 PORTNAME=	dzen2
 PORTVERSION=	0.8.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://gotmor.googlepages.com/
 
-MAINTAINER=	msk@nullpointer.dk
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	General purpose messaging, notification and menuing program for X11
 
-USE_XORG=	x11
+LICENSE=	MIT
 
-PLIST_FILES=	bin/${PORTNAME}
+USE_XORG=	x11
 
-OPTIONS_DEFINE=	XPM XINERAMA
+OPTIONS_DEFINE=	EXAMPLES GADGETS XPM XINERAMA
 OPTIONS_DEFAULT=	XPM XINERAMA
+GADGETS_DESC=Build and install gadgets
+OPTIONS_SUB=yes
+
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=		-I${LOCALBASE}/include
+GADGETS_ALL_TARGET=all gadgets
+GADGETS_INSTALL_TARGET=install install-gadgets
 
-LDFLAGS=	-L${LOCALBASE}/lib
-CFLAGS=		-I${LOCALBASE}/include
 XPM_USE=	XORG=xpm
 XPM_CFLAGS=	-DDZEN_XPM
 XPM_LDFLAGS=	-lXpm
@@ -26,7 +31,14 @@ XINERAMA_USE=	XORG=xinerama
 XINERAMA_LDFLAGS=	-lXinerama
 XINERAMA_CLAGS=	-DDZEN_XINERAMA
 
-MAKE_ARGS=	LDFLAGS="${LDFLAGS} \$${LIBS}" \
+MAKE_ARGS+=	LDFLAGS="${LDFLAGS} \$${LIBS}" \
 		CFLAGS="${CFLAGS} ${INCS} -DVERSION=\\\"\$${VERSION}\\\""
 
+post-install:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_MAN} ${WRKSRC}/README.dzen ${STAGEDIR}${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/gadgets/README.* ${STAGEDIR}${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/gadgets/*.sh ${STAGEDIR}${EXAMPLESDIR}
+
 .include <bsd.port.mk>
diff --git a/x11/dzen2/files/patch-Makefile b/x11/dzen2/files/patch-Makefile
new file mode 100644
index 000000000000..9094a2ce55bd
--- /dev/null
+++ b/x11/dzen2/files/patch-Makefile
@@ -0,0 +1,25 @@
+--- ./Makefile.orig	2007-08-18 08:18:50.000000000 +0200
++++ ./Makefile	2014-06-17 14:58:37.000000000 +0200
+@@ -27,6 +27,9 @@
+ 	@strip $@
+ 	@echo "Run ./help for documentation"
+ 
++gadgets:
++	$(MAKE) -C gadgets
++
+ clean:
+ 	@echo cleaning
+ 	@rm -f dzen2 ${OBJ} dzen2-${VERSION}.tar.gz
+@@ -49,8 +52,11 @@
+ 	@cp -f dzen2 ${DESTDIR}${PREFIX}/bin
+ 	@chmod 755 ${DESTDIR}${PREFIX}/bin/dzen2
+ 
++install-gadgets: gadgets
++	$(MAKE) -C gadgets install
++
+ uninstall:
+ 	@echo removing executable file from ${DESTDIR}${PREFIX}/bin
+ 	@rm -f ${DESTDIR}${PREFIX}/bin/dzen2
+ 
+-.PHONY: all options clean dist install uninstall
++.PHONY: all options clean dist install uninstall gadgets install-gadgets
diff --git a/x11/dzen2/files/patch-config.mk b/x11/dzen2/files/patch-config.mk
index 88734290dd81..0704cc7993fe 100644
--- a/x11/dzen2/files/patch-config.mk
+++ b/x11/dzen2/files/patch-config.mk
@@ -1,5 +1,5 @@
---- config.mk.orig	2013-07-03 22:32:45.866885213 +0200
-+++ config.mk	2013-07-03 22:32:51.306100406 +0200
+--- ./config.mk.orig	2007-08-18 08:18:50.000000000 +0200
++++ ./config.mk	2014-06-17 14:58:37.000000000 +0200
 @@ -49,5 +49,5 @@
  #LDFLAGS = -g ${LIBS}
  
diff --git a/x11/dzen2/files/patch-gadgets__config.mk b/x11/dzen2/files/patch-gadgets__config.mk
new file mode 100644
index 000000000000..459377efe292
--- /dev/null
+++ b/x11/dzen2/files/patch-gadgets__config.mk
@@ -0,0 +1,9 @@
+--- ./gadgets/config.mk.orig	2007-08-18 08:18:50.000000000 +0200
++++ ./gadgets/config.mk	2014-06-17 14:58:37.000000000 +0200
+@@ -14,5 +14,5 @@
+ LDFLAGS = ${LIBS}
+ 
+ # compiler and linker
+-CC = gcc
++CC ?= cc
+ LD = ${CC}
diff --git a/x11/dzen2/files/patch-gadgets__kittscanner.sh b/x11/dzen2/files/patch-gadgets__kittscanner.sh
new file mode 100644
index 000000000000..6f53699f2f34
--- /dev/null
+++ b/x11/dzen2/files/patch-gadgets__kittscanner.sh
@@ -0,0 +1,17 @@
+--- ./gadgets/kittscanner.sh.orig	2014-06-17 15:00:13.000000000 +0200
++++ ./gadgets/kittscanner.sh	2014-06-17 15:00:24.000000000 +0200
+@@ -19,10 +19,10 @@
+ 
+ SLEEP=0.1
+ 
+-#DZEN=/usr/local/bin/dzen2
+-DZEN=../dzen2
+-#DZENOPTS="-bg $BG -fg $INACTIVE_LED_COLOR"
+-DZENOPTS="-bg $BG -fg $INACTIVE_LED_COLOR -xs 1 -y 30"
++DZEN=/usr/local/bin/dzen2
++#DZEN=../dzen2
++DZENOPTS="-bg $BG -fg $INACTIVE_LED_COLOR"
++#DZENOPTS="-bg $BG -fg $INACTIVE_LED_COLOR -xs 1 -y 30"
+ 
+ #-----------------------------------------------------------------------
+ 
diff --git a/x11/dzen2/pkg-plist b/x11/dzen2/pkg-plist
new file mode 100644
index 000000000000..87c27a657d89
--- /dev/null
+++ b/x11/dzen2/pkg-plist
@@ -0,0 +1,15 @@
+bin/dzen2
+%%GADGETS%%bin/dbar
+%%GADGETS%%bin/gcpubar
+%%GADGETS%%bin/gdbar
+%%GADGETS%%bin/textwidth
+%%DOCSDIR%%/README.dzen
+%%GADGETS%%%%DOCSDIR%%/README.dbar
+%%GADGETS%%%%DOCSDIR%%/README.gcpubar
+%%GADGETS%%%%DOCSDIR%%/README.gdbar
+%%GADGETS%%%%DOCSDIR%%/README.kittscanner
+%%GADGETS%%%%DOCSDIR%%/README.textwidth
+%%EXAMPLES%%%%EXAMPLESDIR%%/kittscanner.sh
+%%EXAMPLES%%%%EXAMPLESDIR%%/noisyalert.sh
+@dirrmtry %%DOCSDIR%%
+%%EXAMPLES%%@dirrmtry %%EXAMPLESDIR%%