Upgrade to version 2.07. There are a lot of new configuration options which

allow for some fairly cool effects. This version also adds a built in
systray functionality.

For the port, this version has switched to a GNU auto* format, so overhaul
accordingly. Also mod the source Makefile slightly to not install what we
would consider PORTDOCS by default.

3 files changed, 26 insertions, 25 deletions

diff --git a/x11/tint/Makefile b/x11/tint/Makefile
index 7688ae2a503d..2e34e752b4c9 100644
--- a/x11/tint/Makefile
+++ b/x11/tint/Makefile
@@ -5,37 +5,38 @@
 # $FreeBSD$
 #
 
-PORTNAME=	tint
-PORTVERSION=	0.6.0
+PORTNAME=	tint2
+PORTVERSION=	0.7
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
 MAINTAINER=	dougb@FreeBSD.org
-COMMENT=	Lightweight freedesktop-compliant panel/taskbar/clock
+COMMENT=	Lightweight freedesktop-compliant panel/taskbar/systray/clock
 
 LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo
 
 PROJECTHOST=	tint2
-USE_GNOME=	pango
+USE_GNOME=	pango glib20
 USE_XORG=	xinerama xrandr
 USE_EFL=	imlib2
 USE_GMAKE=	yes
 
-MAKE_ENV+=	DESTDIR=${PREFIX}
+GNU_CONFIGURE=	yes
 
-PLIST_FILES=	bin/tint \
-		etc/xdg/tint/tintrc
-PLIST_DIRS=	etc/xdg/tint
+CONFIGURE_ARGS=	--disable-battery
 
-PORTDOCS=	ChangeLog README tint-0.6.pdf
+PLIST_FILES=	bin/tint2 \
+		etc/xdg/tint2/tint2rc
+PLIST_DIRS=	etc/xdg/tint2
 
-WRKSRC=		${WRKDIR}/${PORTNAME}/src
-ALL_TARGET=	${PORTNAME}
+MAN1=		tint2.1
+
+PORTDOCS=	AUTHORS ChangeLog README NEWS
 
 post-patch:
-	@${CP} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.dist
-	@${SED} -e 's#/usr/bin#/bin#g' \
-		${WRKSRC}/Makefile.dist > ${WRKSRC}/Makefile
+	@${CP} ${WRKSRC}/Makefile.in ${WRKSRC}/Makefile.in.presed
+	@${SED} -e "s# install-dist_docDATA##" \
+	    ${WRKSRC}/Makefile.in.presed > ${WRKSRC}/Makefile.in
 
 pre-install:
 	${ECHO} "rmdir ${X11BASE}/etc/xdg 2>/dev/null || true" > \
@@ -45,16 +46,16 @@ PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/../ChangeLog ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/../README ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/../doc/tint-0.6.pdf ${DOCSDIR}
+.for file in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.endfor
 .endif
 
 .if !defined(NOPORTEXAMPLES)
 	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/../tintrc* ${EXAMPLESDIR}
-.for N in 1 2 3 4
-PLIST_FILES+=	${EXAMPLESDIR_REL}/tintrc${N}
+	${INSTALL_DATA} ${WRKSRC}/tintrc* ${EXAMPLESDIR}
+.for N in 1 2 3 4 5 6
+PLIST_FILES+=	${EXAMPLESDIR_REL}/tintrc0${N}
 .endfor
 PLIST_DIRS+=	${EXAMPLESDIR_REL}
 .endif
diff --git a/x11/tint/distinfo b/x11/tint/distinfo
index c5465d6d718d..e48e7f4232d3 100644
--- a/x11/tint/distinfo
+++ b/x11/tint/distinfo
@@ -1,3 +1,3 @@
-MD5 (tint-0.6.0.tar.gz) = 50a327730429373a18286b27f915fefd
-SHA256 (tint-0.6.0.tar.gz) = d762311e4bda14ea49f306cb7df1b8375926a4279a48f46ee46a6b86ac2a3603
-SIZE (tint-0.6.0.tar.gz) = 362794
+MD5 (tint2-0.7.tar.gz) = 03851e10d848ec35641d531c47e352ac
+SHA256 (tint2-0.7.tar.gz) = ebfbc7ce272802cdaf5a3177c5ba0a3ed78e456785191a7e42b10a47f4027320
+SIZE (tint2-0.7.tar.gz) = 331084
diff --git a/x11/tint/pkg-descr b/x11/tint/pkg-descr
index 6b75b7d317e3..ab84b189cda3 100644
--- a/x11/tint/pkg-descr
+++ b/x11/tint/pkg-descr
@@ -1,5 +1,5 @@
-Tint is a simple panel/taskbar intentionally made for openbox3, but should
-also work with other window managers.
+Tint is a simple panel/taskbar/systray intentionally made for openbox3, but
+should also work with other window managers.
 
 The goal is to keep a clean and unintrusive look with lightweight code and
 compliance with freedesktop specifications.