update to 0.9.5 using the github repository which includes many fixes

including continuous segmentation faults
2014-07-09 14:34:54 +00:00 · 2014-07-09 14:34:54 +00:00 · b7ff8f2a83
commit b7ff8f2a83
parent b13d4fd0f1
6 changed files with 50 additions and 62 deletions
--- a/x11/dzen2/Makefile
+++ b/x11/dzen2/Makefile
@ -1,16 +1,15 @@
-# $OpenBSD: Makefile,v 1.4 2013/03/11 11:46:09 espie Exp $
+# $OpenBSD: Makefile,v 1.5 2014/07/09 14:34:54 robert Exp $

 COMMENT-main=	general purpose messaging, notification and menu program
 COMMENT-gadgets=gadgets and scripts for dzen2

-V=			0.8.5
+V=			0.9.5
 DISTNAME=		dzen2-$V
 PKGNAME-main=		${DISTNAME}
 PKGNAME-gadgets=	dzen2-gadgets-$V
 CATEGORIES=		x11
-REVISION-gadgets =	0

-HOMEPAGE=		http://gotmor.googlepages.com/dzen
+HOMEPAGE=		https://github.com/robm/dzen
 MAINTAINER=		Dmitri Alenitchev <dma@dma.org.ru>

 MULTI_PACKAGES=		-main -gadgets
@ -20,7 +19,9 @@ PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB-main=		X11 c Xinerama Xpm
 WANTLIB-gadgets=	X11 c

-MASTER_SITES=		http://gotmor.googlepages.com/
+GH_COMMIT=		488ab66019f475e35e067646621827c18a879ba1
+GH_ACCOUNT=		robm
+GH_PROJECT=		dzen

 RUN_DEPENDS-gadgets=	x11/dzen2

--- a/x11/dzen2/distinfo
+++ b/x11/dzen2/distinfo
@ -1,5 +1,2 @@
-MD5 (dzen2-0.8.5.tar.gz) = WXhiDCEkyKitUtfxfOlP1w==
-RMD160 (dzen2-0.8.5.tar.gz) = u++/93nNjrPqBu2gZm9bD+mbe5A=
-SHA1 (dzen2-0.8.5.tar.gz) = khYWPobgKyp13h3+wZVLEFioKeQ=
-SHA256 (dzen2-0.8.5.tar.gz) = Xkzpbo7SKkoK1s+vrN3gUy0T0EnXd0QhSxlsSyvN3/k=
-SIZE (dzen2-0.8.5.tar.gz) = 33274
+SHA256 (dzen2-0.9.5.tar.gz) = aGH2/5GAVbKGtlDzOu+X35vPGJGiVdxdV4UPZCDs23w=
+SIZE (dzen2-0.9.5.tar.gz) = 38181
--- a/x11/dzen2/patches/patch-config_mk
+++ b/x11/dzen2/patches/patch-config_mk
@ -0,0 +1,21 @@
+$OpenBSD: patch-config_mk,v 1.1 2014/07/09 14:34:54 robert Exp $
+--- config.mk.orig	Mon Sep 23 11:57:39 2013
+++ config.mk	Sun Jul  6 11:23:19 2014
+@@ -34,13 +34,13 @@ INCS = -I. -I/usr/include -I${X11INC}
+ 
+ 
+ ## Option 4: With Xinerama and XPM
+-#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXinerama -lXpm
+-#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA -DDZEN_XPM
+LIBS = -L${X11LIB} -lX11 -lXinerama -lXpm
+CFLAGS = -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA -DDZEN_XPM
+ 
+ 
+ ## Option 5: With XFT
+-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 `pkg-config --libs xft`
+-CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XFT `pkg-config --cflags xft`
+#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 `pkg-config --libs xft`
+#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XFT `pkg-config --cflags xft`
+ 
+ 
+ ## Option 6: With XPM and XFT
--- a/x11/dzen2/patches/patch-gadgets_Makefile
+++ b/x11/dzen2/patches/patch-gadgets_Makefile
@ -1,59 +1,28 @@
-$OpenBSD: patch-gadgets_Makefile,v 1.1.1.1 2007/09/06 19:46:01 merdely Exp $
--- gadgets/Makefile.orig	Wed Sep  5 17:28:21 2007
-+++ gadgets/Makefile	Wed Sep  5 17:31:27 2007
-@@ -16,30 +16,21 @@ options:
- 	@echo "LD       = ${LD}"
- 
- .c.o:
-	@echo CC $<
-	@${CC} -c ${CFLAGS} $<
-+	${CC} -c ${CFLAGS} $<
- 
- ${OBJ}: config.mk
- 
+$OpenBSD: patch-gadgets_Makefile,v 1.2 2014/07/09 14:34:54 robert Exp $
+--- gadgets/Makefile.orig	Sun Jul  6 11:19:45 2014
+++ gadgets/Makefile	Sun Jul  6 11:20:05 2014
+@@ -24,24 +24,20 @@ ${OBJ}: dbar.h config.mk
 dbar: ${OBJ}
-	@echo LD $@
-	@${LD} -o $@ dbar.o ${LDFLAGS}
+ 	@echo LD $@
+ 	@${LD} -o $@ dbar-main.o dbar.o ${LDFLAGS}
 -	@strip $@
-+	${LD} -o $@ dbar.o ${LDFLAGS}
 
 gdbar: ${OBJ}
-	@echo LD $@
-	@${LD} -o $@ gdbar.o ${LDFLAGS} -L${X11LIB} -lX11
+ 	@echo LD $@
+ #	@${LD} -o $@ gdbar.o dbar.o ${LDFLAGS} -L${X11LIB} -lX11
+ 	@${LD} -o $@ gdbar.o dbar.o ${LDFLAGS}
 -	@strip $@
-+	${LD} -o $@ gdbar.o ${LDFLAGS} -L${X11LIB} -lX11
 
 gcpubar: ${OBJ}
-	@echo LD $@
-	@${LD} -o $@ gcpubar.o ${LDFLAGS} -L${X11LIB}
+ 	@echo LD $@
+ #	@${LD} -o $@ gcpubar.o dbar.o ${LDFLAGS} -L${X11LIB}
+ 	@${LD} -o $@ gcpubar.o dbar.o ${LDFLAGS}
 -	@strip $@
-+	${LD} -o $@ gcpubar.o ${LDFLAGS} -L${X11LIB}
 
 textwidth: ${OBJ}
-	@echo LD $@
-	@${LD} -o $@ textwidth.o ${LDFLAGS} -L${X11LIB} -lX11
+ 	@echo LD $@
+ 	@${LD} -o $@ textwidth.o ${LDFLAGS} -L${X11LIB} -lX11
 -	@strip $@
-+	${LD} -o $@ textwidth.o ${LDFLAGS} -L${X11LIB} -lX11
 
 clean:
 	@echo cleaning
-@@ -49,16 +40,9 @@ clean:
- 	@rm -f ${OBJ} textwidth
- 
- install: all
-	@echo installing executable file to ${DESTDIR}${PREFIX}/bin
-	@mkdir -p ${DESTDIR}${PREFIX}/bin
-	@cp -f dbar ${DESTDIR}${PREFIX}/bin
-	@chmod 755 ${DESTDIR}${PREFIX}/bin/dbar
-	@cp -f gdbar ${DESTDIR}${PREFIX}/bin
-	@chmod 755 ${DESTDIR}${PREFIX}/bin/gdbar
-	@cp -f gcpubar ${DESTDIR}${PREFIX}/bin
-	@chmod 755 ${DESTDIR}${PREFIX}/bin/gcpubar
-	@cp -f textwidth ${DESTDIR}${PREFIX}/bin
-	@chmod 755 ${DESTDIR}${PREFIX}/bin/textwidth
-+	${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
-+	${BSD_INSTALL_PROGRAM} dbar gdbar gcpubar textwidth \
-+		${DESTDIR}${PREFIX}/bin
- 
- uninstall:
- 	@echo removing executable file from ${DESTDIR}${PREFIX}/bin
--- a/x11/dzen2/pkg/PLIST-gadgets
+++ b/x11/dzen2/pkg/PLIST-gadgets
@ -1,10 +1,10 @@
-@comment $OpenBSD: PLIST-gadgets,v 1.1.1.1 2007/09/06 19:46:01 merdely Exp $
-bin/dbar
-bin/gcpubar
-bin/gdbar
+@comment $OpenBSD: PLIST-gadgets,v 1.2 2014/07/09 14:34:54 robert Exp $
+@bin bin/dbar
+@bin bin/gcpubar
+@bin bin/gdbar
 bin/kittscanner.sh
 bin/noisyalert.sh
-bin/textwidth
+@bin bin/textwidth
 share/doc/dzen2/README.dbar
 share/doc/dzen2/README.gcpubar
 share/doc/dzen2/README.gdbar
--- a/x11/dzen2/pkg/PLIST-main
+++ b/x11/dzen2/pkg/PLIST-main
@ -1,5 +1,5 @@
-@comment $OpenBSD: PLIST-main,v 1.1.1.1 2007/09/06 19:46:01 merdely Exp $
-bin/dzen2
+@comment $OpenBSD: PLIST-main,v 1.2 2014/07/09 14:34:54 robert Exp $
+@bin bin/dzen2
 share/doc/dzen2/
 share/doc/dzen2/CREDITS
 share/doc/dzen2/LICENSE