Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 7 Aug 2015 19:12:31 +0000 (UTC)
From:      Olivier Duchateau <olivierd@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r393700 - in head/x11/tint: . files
Message-ID:  <201508071912.t77JCV9x000375@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: olivierd
Date: Fri Aug  7 19:12:30 2015
New Revision: 393700
URL: https://svnweb.freebsd.org/changeset/ports/393700

Log:
  - Update to 0.12.1
  - Use new mirror
  - Adjust dependencies
  - Rewrite options helper (remove DOCS and PYCONF options)
  - Update WWW entry (pkg-descr), project is now hosted on GitLab.com
  
  PR:		202137
  Submitted by:	myself
  Approved by:	yamagi (maintainer)

Added:
  head/x11/tint/files/patch-CMakeLists.txt   (contents, props changed)
Deleted:
  head/x11/tint/files/patch-src-battery-battery.c
Modified:
  head/x11/tint/Makefile
  head/x11/tint/distinfo
  head/x11/tint/pkg-descr
  head/x11/tint/pkg-plist

Modified: head/x11/tint/Makefile
==============================================================================
--- head/x11/tint/Makefile	Fri Aug  7 18:48:48 2015	(r393699)
+++ head/x11/tint/Makefile	Fri Aug  7 19:12:30 2015	(r393700)
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	tint2
-PORTVERSION=	0.11
-PORTREVISION=	4
+PORTVERSION=	0.12.1
 CATEGORIES=	x11
-MASTER_SITES=	GOOGLE_CODE
+MASTER_SITES=	http://leigh123linux.fedorapeople.org/pub/${PORTNAME}/source/
 
 MAINTAINER=	yamagi@yamagi.org
 COMMENT=	Lightweight freedesktop-compliant panel/taskbar/systray/clock
@@ -12,59 +11,18 @@ COMMENT=	Lightweight freedesktop-complia
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo \
-		libImlib2.so:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2 \
+		libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification
 
-PROJECTHOST=	tint2
-USES=		alias cmake pkgconfig tar:bzip2
-USE_GNOME=	glib20 pango
-USE_XORG=	xdamage xcomposite xinerama xrandr
-
-CMAKE_ARGS=	-DENABLE_BATTERY:BOOL=ON -DMANDIR:PATH=man
-
-OPTIONS_DEFINE=	DOCS EXAMPLES PYCONF
-OPTIONS_DEFAULT=	PYCONF
+USES=		alias cmake gettext pkgconfig
+USE_GNOME=	glib20 librsvg2 pango
+USE_XORG=	x11 xcomposite xdamage xinerama xrandr xrender
+
+CMAKE_ARGS=	-DMANDIR:PATH=man
+
+OPTIONS_DEFINE=	EXAMPLES
+EXAMPLES_CMAKE_ON=	-DENABLE_EXAMPLES:BOOL=ON
+EXAMPLES_CMAKE_OFF=	-DENABLE_EXAMPLES:BOOL=OFF
 OPTIONS_SUB=	yes
-PYCONF_DESC=	Configuration editing tool (requires python)
-
-PORTEXAMPLES=	icon_and_text_1.tint2rc icon_and_text_2.tint2rc \
-		icon_and_text_3.tint2rc icon_and_text_4.tint2rc \
-		icon_only_1.tint2rc icon_only_2.tint2rc icon_only_3.tint2rc \
-		icon_only_4.tint2rc icon_only_6.tint2rc icon_only_7.tint2rc \
-		text_only_1.tint2rc text_only_2.tint2rc text_only_3.tint2rc \
-		text_only_4.tint2rc text_only_5.tint2rc text_only_6.tint2rc tint2rc
-PORTDOCS=	AUTHORS ChangeLog README
-
-PYCONF_USES=	python
-PYCONF_USE=	gnome=gtk20,pygtk2
-PYCONF_CMAKE_ON=	-DENABLE_TINT2CONF:BOOL=ON
-PYCONF_CMAKE_OFF=	-DENABLE_TINT2CONF:BOOL=OFF
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MPYCONF}
-PYCONF_SRC=	${WRKSRC}/src/tint2conf
-post-patch:
-	@${MV} ${PYCONF_SRC}/tintwizard.py ${PYCONF_SRC}/tintwizard.py.Dist
-	@${SED} -e 's#pidof#pgrep#g' ${PYCONF_SRC}/tintwizard.py.Dist \
-		> ${PYCONF_SRC}/tintwizard.py
-.endif
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/tint2 ${STAGEDIR}${PREFIX}/bin
-	${MKDIR} ${STAGEDIR}${PREFIX}/share/tint2
-	${INSTALL_DATA} ${WRKSRC}/default_icon.png ${STAGEDIR}${PREFIX}/share/tint2
-	${INSTALL_MAN} ${WRKSRC}/doc/tint2.1 ${STAGEDIR}${MANPREFIX}/man/man1
-.if ${PORT_OPTIONS:MPYCONF}
-	${INSTALL_PROGRAM} ${PYCONF_SRC}/tint2conf ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_SCRIPT} ${PYCONF_SRC}/tintwizard.py ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_DATA} ${PYCONF_SRC}/tint2conf.desktop ${STAGEDIR}${PREFIX}/share/applications
-	${INSTALL_DATA} ${PYCONF_SRC}/tint2conf.png ${STAGEDIR}${PREFIX}/share/pixmaps
-	${INSTALL_DATA} ${PYCONF_SRC}/tint2conf.svg ${STAGEDIR}${PREFIX}/share/pixmaps
-.endif
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${MKDIR}  ${STAGEDIR}${EXAMPLESDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${PORTEXAMPLES:S|^|${WRKSRC}/sample/|} ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>

Modified: head/x11/tint/distinfo
==============================================================================
--- head/x11/tint/distinfo	Fri Aug  7 18:48:48 2015	(r393699)
+++ head/x11/tint/distinfo	Fri Aug  7 19:12:30 2015	(r393700)
@@ -1,2 +1,2 @@
-SHA256 (tint2-0.11.tar.bz2) = fe106e6a6057d2631abddde9f82d3fd4fb1985c4fb93f10d3886417a9e22471d
-SIZE (tint2-0.11.tar.bz2) = 91716
+SHA256 (tint2-0.12.1.tar.gz) = 5731394b812215f56441146d2a50dcf063efda0a19ccf51b3599ddbe07b14559
+SIZE (tint2-0.12.1.tar.gz) = 230228

Added: head/x11/tint/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11/tint/files/patch-CMakeLists.txt	Fri Aug  7 19:12:30 2015	(r393700)
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig	2015-08-04 09:22:00 UTC
++++ CMakeLists.txt
+@@ -114,7 +114,7 @@ endif()
+ 
+ set( MANDIR share/man CACHE PATH "Directory for man pages" )
+ set( DATADIR share CACHE PATH "Directory for shared data" )
+-set( SYSCONFDIR /etc CACHE PATH "Directory for configuration files" )
++set( SYSCONFDIR etc CACHE PATH "Directory for configuration files" )
+ set( DOCDIR share/doc/tint2 CACHE PATH "Directory for documentation files" )
+ 
+ add_custom_target( version ALL "${PROJECT_SOURCE_DIR}/get_version.sh" "\"${PROJECT_SOURCE_DIR}\"" )

Modified: head/x11/tint/pkg-descr
==============================================================================
--- head/x11/tint/pkg-descr	Fri Aug  7 18:48:48 2015	(r393699)
+++ head/x11/tint/pkg-descr	Fri Aug  7 19:12:30 2015	(r393700)
@@ -13,4 +13,4 @@ Tint panel features
     * clock with font, color and transparency
     * multi-monitor : panel position adjust to monitor, taskbar by monitor
 
-WWW: http://code.google.com/p/tint2/
+WWW: https://gitlab.com/o9000/tint2

Modified: head/x11/tint/pkg-plist
==============================================================================
--- head/x11/tint/pkg-plist	Fri Aug  7 18:48:48 2015	(r393699)
+++ head/x11/tint/pkg-plist	Fri Aug  7 19:12:30 2015	(r393700)
@@ -1,8 +1,41 @@
 bin/tint2
+bin/tint2conf
+etc/xdg/tint2/tint2rc
 man/man1/tint2.1.gz
+share/applications/tint2.desktop
+share/applications/tint2conf.desktop
+%%DOCSDIR%%/AUTHORS
+%%DOCSDIR%%/ChangeLog
+%%DOCSDIR%%/README.md
+share/icons/hicolor/scalable/apps/tint2.svg
+share/icons/hicolor/scalable/apps/tint2conf.svg
+share/locale/bs/LC_MESSAGES/tint2conf.mo
+share/locale/fr/LC_MESSAGES/tint2conf.mo
+share/locale/hr/LC_MESSAGES/tint2conf.mo
+share/locale/pl/LC_MESSAGES/tint2conf.mo
+share/locale/sr/LC_MESSAGES/tint2conf.mo
 %%DATADIR%%/default_icon.png
-%%PYCONF%%bin/tint2conf
-%%PYCONF%%bin/tintwizard.py
-%%PYCONF%%share/applications/tint2conf.desktop
-%%PYCONF%%share/pixmaps/tint2conf.png
-%%PYCONF%%share/pixmaps/tint2conf.svg
+%%EXAMPLES%%%%DATADIR%%/horizontal-dark-opaque.tint2rc
+%%EXAMPLES%%%%DATADIR%%/horizontal-dark-transparent.tint2rc
+%%EXAMPLES%%%%DATADIR%%/horizontal-light-opaque.tint2rc
+%%EXAMPLES%%%%DATADIR%%/horizontal-light-transparent.tint2rc
+%%EXAMPLES%%%%DATADIR%%/icon_and_text_1.tint2rc
+%%EXAMPLES%%%%DATADIR%%/icon_and_text_2.tint2rc
+%%EXAMPLES%%%%DATADIR%%/icon_and_text_3.tint2rc
+%%EXAMPLES%%%%DATADIR%%/icon_and_text_4.tint2rc
+%%EXAMPLES%%%%DATADIR%%/icon_only_1.tint2rc
+%%EXAMPLES%%%%DATADIR%%/icon_only_2.tint2rc
+%%EXAMPLES%%%%DATADIR%%/icon_only_3.tint2rc
+%%EXAMPLES%%%%DATADIR%%/icon_only_4.tint2rc
+%%EXAMPLES%%%%DATADIR%%/icon_only_6.tint2rc
+%%EXAMPLES%%%%DATADIR%%/icon_only_7.tint2rc
+%%EXAMPLES%%%%DATADIR%%/text_only_1.tint2rc
+%%EXAMPLES%%%%DATADIR%%/text_only_2.tint2rc
+%%EXAMPLES%%%%DATADIR%%/text_only_3.tint2rc
+%%EXAMPLES%%%%DATADIR%%/text_only_4.tint2rc
+%%EXAMPLES%%%%DATADIR%%/text_only_5.tint2rc
+%%EXAMPLES%%%%DATADIR%%/text_only_6.tint2rc
+%%EXAMPLES%%%%DATADIR%%/vertical-dark-opaque.tint2rc
+%%EXAMPLES%%%%DATADIR%%/vertical-dark-transparent.tint2rc
+%%EXAMPLES%%%%DATADIR%%/vertical-light-opaque.tint2rc
+%%EXAMPLES%%%%DATADIR%%/vertical-light-transparent.tint2rc



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508071912.t77JCV9x000375>