svn commit: r363007 - in head/x11/dzen2: . files
John Marino
marino at FreeBSD.org
Sun Jul 27 01:29:04 UTC 2014
Author: marino
Date: Sun Jul 27 01:29:03 2014
New Revision: 363007
URL: http://svnweb.freebsd.org/changeset/ports/363007
QAT: https://qat.redports.org/buildarchive/r363007/
Log:
x11/dzen2: gadgets and docs support
* Can build and install gadgets optionally
* Install docs
* minor fixes
* Reset maintainer (two timeouts, not heard from since 2008)
PR: 191128
Submitted by: Zsolt Udvari
Added:
head/x11/dzen2/files/patch-Makefile (contents, props changed)
head/x11/dzen2/files/patch-gadgets__config.mk (contents, props changed)
head/x11/dzen2/files/patch-gadgets__kittscanner.sh (contents, props changed)
head/x11/dzen2/pkg-plist (contents, props changed)
Modified:
head/x11/dzen2/Makefile
head/x11/dzen2/files/patch-config.mk
Modified: head/x11/dzen2/Makefile
==============================================================================
--- head/x11/dzen2/Makefile Sun Jul 27 01:16:18 2014 (r363006)
+++ head/x11/dzen2/Makefile Sun Jul 27 01:29:03 2014 (r363007)
@@ -3,22 +3,27 @@
PORTNAME= dzen2
PORTVERSION= 0.8.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= http://gotmor.googlepages.com/
-MAINTAINER= msk at nullpointer.dk
+MAINTAINER= ports at 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>
Added: head/x11/dzen2/files/patch-Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11/dzen2/files/patch-Makefile Sun Jul 27 01:29:03 2014 (r363007)
@@ -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
Modified: head/x11/dzen2/files/patch-config.mk
==============================================================================
--- head/x11/dzen2/files/patch-config.mk Sun Jul 27 01:16:18 2014 (r363006)
+++ head/x11/dzen2/files/patch-config.mk Sun Jul 27 01:29:03 2014 (r363007)
@@ -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}
Added: head/x11/dzen2/files/patch-gadgets__config.mk
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11/dzen2/files/patch-gadgets__config.mk Sun Jul 27 01:29:03 2014 (r363007)
@@ -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}
Added: head/x11/dzen2/files/patch-gadgets__kittscanner.sh
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11/dzen2/files/patch-gadgets__kittscanner.sh Sun Jul 27 01:29:03 2014 (r363007)
@@ -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"
+
+ #-----------------------------------------------------------------------
+
Added: head/x11/dzen2/pkg-plist
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11/dzen2/pkg-plist Sun Jul 27 01:29:03 2014 (r363007)
@@ -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
+ at dirrmtry %%DOCSDIR%%
+%%EXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
More information about the svn-ports-all
mailing list