Hi,
Heres an update for tint2, which now has a system tray.
The name of the whole program has changed from "tint" to "tint2", so we
would need to think about how an upgrade from tint to tint2 would work.
Perhaps import this as x11/tint2 and add a @pkgpath x11/tint?
There may be another easier way.
Thanks
--
Best Regards
Edd Barrett
(Freelance software developer / technical writer / open-source developer)
http://students.dec.bmth.ac.uk/ebarrett
diff -urN tint/Makefile tint.new/Makefile
--- tint/Makefile Wed Apr 15 12:16:40 2009
+++ tint.new/Makefile Wed Apr 15 13:10:51 2009
@@ -2,7 +2,8 @@
COMMENT= lightweight freedesktop-compliant panel/taskbar/clock
-DISTNAME= tint-0.6.0
+V = tint2-0.7
+DISTNAME= ${V}-beta1
CATEGORIES= x11
HOMEPAGE= http://code.google.com/p/tint2/
@@ -17,7 +18,7 @@
WANTLIB= X11 Xau Xdmcp Xext Xinerama Xrender c cairo expat \
fontconfig freetype glib-2.0 glitz gmodule-2.0 \
- gobject-2.0 m pixman-1 png z
+ gobject-2.0 m pixman-1 png z Xrandr
MASTER_SITES= http://tint2.googlecode.com/files/
@@ -30,13 +31,15 @@
USE_GMAKE= Yes
NO_REGRESS= Yes
-WRKDIST= ${WRKDIR}/tint
WRKSRC= ${WRKDIST}/src
-ALL_TARGET= tint
+ALL_TARGET= tint2
+pre-build:
+ rm ${WRKSRC}/tint2
+
post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tint
- ${INSTALL_DATA} ${WRKDIST}/doc/tint-0.6.* ${PREFIX}/share/doc/tint/
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tint2
+ ${INSTALL_DATA} ${WRKDIST}/doc/${V}.* ${PREFIX}/share/doc/tint2/
.include <bsd.port.mk>
diff -urN tint/distinfo tint.new/distinfo
--- tint/distinfo Wed Apr 15 12:16:40 2009
+++ tint.new/distinfo Wed Apr 15 11:27:16 2009
@@ -1,5 +1,5 @@
-MD5 (tint-0.6.0.tar.gz) = UKMncwQpNzoYKGsn+RX+/Q==
-RMD160 (tint-0.6.0.tar.gz) = cBWCOs7NvF0syGf+w29F/wvHAfo=
-SHA1 (tint-0.6.0.tar.gz) = diAOYtyXHYgwO9ZAh/hpFSbAtWk=
-SHA256 (tint-0.6.0.tar.gz) = 12IxHkvaFOpJ8wbLffG4N1kmpCeaSPRu5GprhqwqNgM=
-SIZE (tint-0.6.0.tar.gz) = 362794
+MD5 (tint2-0.7-beta1.tar.gz) = k7cLRgMjWzB9Nwey5R0j2Q==
+RMD160 (tint2-0.7-beta1.tar.gz) = FLKZipJUR/x/nFHdvag6TvT/U7s=
+SHA1 (tint2-0.7-beta1.tar.gz) = 1VzKbbmqqJ/yI/wa0hz56f334G4=
+SHA256 (tint2-0.7-beta1.tar.gz) = t7YWnPjovDF6O7kxrtX1PuyWdNaRVPOuYRqwjMjNVpc=
+SIZE (tint2-0.7-beta1.tar.gz) = 1365492
diff -urN tint/patches/patch-src_Makefile tint.new/patches/patch-src_Makefile
--- tint/patches/patch-src_Makefile Wed Apr 15 12:16:40 2009
+++ tint.new/patches/patch-src_Makefile Wed Apr 15 12:54:14 2009
@@ -1,14 +1,30 @@
-$OpenBSD: patch-src_Makefile,v 1.1.1.1 2008/09/17 15:39:51 ajacoutot Exp $
---- src/Makefile.orig Sat Jul 19 15:43:41 2008
-+++ src/Makefile Wed Sep 17 14:51:56 2008
-@@ -11,8 +11,8 @@ ifndef DESTDIR
- XDG_CONFIG_DIR=/etc/xdg
- endif
- else
+$OpenBSD$
+--- src/Makefile.orig Wed Mar 11 16:46:18 2009
++++ src/Makefile Wed Apr 15 12:54:08 2009
+@@ -4,22 +4,10 @@ FLAGS=-Wall -g `pkg-config --cflags --libs cairo pango
+ PROGNAME=tint2
+ FILES=tint.c server.c panel.c config.c taskbar/task.c taskbar/taskbar.c
clock/clock.c systray/systraybar.c util/window.c util/area.c
+
+-ifndef DESTDIR
+- ifndef PREFIX
+- BINDIR=/usr/bin
+- XDG_CONFIG_DIR=/etc/xdg
+- MANDIR=/usr/share/man
+- else
+- BINDIR=$(PREFIX)/bin
+- XDG_CONFIG_DIR=/etc/xdg
+- MANDIR=/usr/share/man
+- endif
+-else
- BINDIR=$(DESTDIR)/usr/bin
- XDG_CONFIG_DIR=$(DESTDIR)/etc/xdg
-+ BINDIR=$(PREFIX)/bin
-+ XDG_CONFIG_DIR=$(PREFIX)/share/examples/
- endif
+- MANDIR=$(DESTDIR)/usr/share/man
+-endif
+-
++FAKE=$(DESTDIR)$(TRUEPREFIX)
++BINDIR=$(FAKE)/bin
++XDG_CONFIG_DIR=$(FAKE)/share/examples/tint2
++MANDIR=$(FAKE)/man
-
+ $(PROGNAME): $(FILES) $(SYSTRAYOBJ)
+ $(CC) $(CFLAGS) -I. -Iutil -Iclock -Itaskbar -Isystray -o $(PROGNAME)
$(FILES) $(FLAGS)
diff -urN tint/pkg/OLDPLIST tint.new/pkg/OLDPLIST
--- tint/pkg/OLDPLIST Thu Jan 1 01:00:00 1970
+++ tint.new/pkg/OLDPLIST Wed Apr 15 12:46:35 2009
@@ -0,0 +1,10 @@
+...@comment $OpenBSD: PLIST,v 1.1.1.1 2008/09/17 15:39:51 ajacoutot Exp $
+...@bin bin/tint
+share/doc/tint/
+share/doc/tint/tint-0.6.odt
+share/doc/tint/tint-0.6.pdf
+share/examples/tint/
+...@sample ${SYSCONFDIR}/xdg/
+...@sample ${SYSCONFDIR}/xdg/tint/
+share/examples/tint/tintrc
+...@sample ${SYSCONFDIR}/xdg/tint/tintrc
diff -urN tint/pkg/PLIST tint.new/pkg/PLIST
--- tint/pkg/PLIST Wed Apr 15 12:16:40 2009
+++ tint.new/pkg/PLIST Wed Apr 15 12:59:16 2009
@@ -1,10 +1,12 @@
-...@comment $OpenBSD: PLIST,v 1.1.1.1 2008/09/17 15:39:51 ajacoutot Exp $
-...@bin bin/tint
-share/doc/tint/
-share/doc/tint/tint-0.6.odt
-share/doc/tint/tint-0.6.pdf
-share/examples/tint/
+...@comment $OpenBSD$
+...@bin bin/tint2
+...@man man/man1/tint2.1
+share/doc/tint2/
+share/doc/tint2/tint2-0.7.odt
+share/doc/tint2/tint2-0.7.pdf
+share/examples/tint2/
+share/examples/tint2/tint2/
@sample ${SYSCONFDIR}/xdg/
@sample ${SYSCONFDIR}/xdg/tint/
-share/examples/tint/tintrc
-...@sample ${SYSCONFDIR}/xdg/tint/tintrc
+share/examples/tint2/tint2/tint2rc
+...@sample ${SYSCONFDIR}/xdg/tint/tint2rc
diff -urN tint/pkg/PLIST.orig tint.new/pkg/PLIST.orig
--- tint/pkg/PLIST.orig Thu Jan 1 01:00:00 1970
+++ tint.new/pkg/PLIST.orig Wed Apr 15 12:52:06 2009
@@ -0,0 +1,10 @@
+...@comment $OpenBSD$
+...@bin bin/tint2
+examples/
+examples/tint2/
+examples/tint2/tint2/
+examples/tint2/tint2/tint2rc
+...@man man/man1/tint2.1
+share/doc/tint2/
+share/doc/tint2/tint2-0.7.odt
+share/doc/tint2/tint2-0.7.pdf
