diff options
Diffstat (limited to 'x11')
-rw-r--r-- | x11/tint2/Makefile | 22 | ||||
-rw-r--r-- | x11/tint2/PLIST | 3 | ||||
-rw-r--r-- | x11/tint2/distinfo | 11 | ||||
-rw-r--r-- | x11/tint2/patches/patch-aa | 35 | ||||
-rw-r--r-- | x11/tint2/patches/patch-ab | 14 |
5 files changed, 34 insertions, 51 deletions
diff --git a/x11/tint2/Makefile b/x11/tint2/Makefile index c9f2958f5fb..e4a853b7fb3 100644 --- a/x11/tint2/Makefile +++ b/x11/tint2/Makefile @@ -1,12 +1,11 @@ -# $NetBSD: Makefile,v 1.3 2010/01/18 09:59:44 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2010/04/11 21:43:57 gls Exp $ -DISTNAME= tint2-0.7.1 -PKGREVISION= 2 +DISTNAME= tint2-0.9 CATEGORIES= x11 MASTER_SITES= http://tint2.googlecode.com/files/ MAINTAINER= fernandotcl@gmail.com -HOMEPAGE= http://tint2.googlecode.com/files/ +HOMEPAGE= http://code.google.com/p/tint2/ COMMENT= Tint2 is a simple panel/taskbar LICENSE= gnu-gpl-v2 @@ -17,15 +16,22 @@ USE_LIBTOOL= yes USE_TOOLS+= gmake pkg-config PKG_SYSCONFSUBDIR= xdg - +INSTALLATION_DIRS= share/examples/tint2 OWN_DIRS= ${PKG_SYSCONFDIR}/tint2 CONF_FILES= ${PREFIX}/share/examples/tint2/tint2rc \ - ${PKG_SYSCONFDIR}/tint2/tint2rc + ${PKG_SYSCONFDIR}/tint2/tint2rc -INSTALLATION_DIRS= share/examples/tint2 +CONFIGURE_ARGS+= --disable-tint2conf +CONFIGURE_ARGS+= --disable-examples +.include "../../mk/bsd.prefs.mk" +.if ${OPSYS} == "Linux" +CONFIGURE_ARGS+= --enable-battery +.else +CONFIGURE_ARGS+= --disable-battery +.endif post-install: - ${INSTALL_DATA} ${WRKSRC}/tint2rc \ + ${INSTALL_DATA} ${WRKSRC}/sample/tint2rc \ ${DESTDIR}${PREFIX}/share/examples/tint2 .include "../../devel/glib2/buildlink3.mk" diff --git a/x11/tint2/PLIST b/x11/tint2/PLIST index e6aaa7ce937..7ae3cb00b41 100644 --- a/x11/tint2/PLIST +++ b/x11/tint2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2009/12/14 00:47:23 snj Exp $ +@comment $NetBSD: PLIST,v 1.2 2010/04/11 21:43:57 gls Exp $ bin/tint2 man/man1/tint2.1 share/doc/tint2/AUTHORS @@ -6,3 +6,4 @@ share/doc/tint2/ChangeLog share/doc/tint2/NEWS share/doc/tint2/README share/examples/tint2/tint2rc +share/tint2/default_icon.png diff --git a/x11/tint2/distinfo b/x11/tint2/distinfo index 533a25ada05..58a7abbeceb 100644 --- a/x11/tint2/distinfo +++ b/x11/tint2/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2009/12/14 00:47:23 snj Exp $ +$NetBSD: distinfo,v 1.2 2010/04/11 21:43:57 gls Exp $ -SHA1 (tint2-0.7.1.tar.gz) = afb18e29e7d1156b4455127f73decf1d87eae64f -RMD160 (tint2-0.7.1.tar.gz) = 5b91f0e7f8439f5d3ba1d64ac2dbd857a7fb599a -Size (tint2-0.7.1.tar.gz) = 331432 bytes -SHA1 (patch-aa) = c69daffa0d4598f4a53c518e50b0de66a01ba67b -SHA1 (patch-ab) = f2c4add2e221b0f12dfeb8305af0ba53c57aa7b9 +SHA1 (tint2-0.9.tar.gz) = fa69aaa924bb5a85cfa753946c8a6ebed79d73d8 +RMD160 (tint2-0.9.tar.gz) = 958a4850857e2b90fea72c48d32ca3d687d6bc74 +Size (tint2-0.9.tar.gz) = 206491 bytes +SHA1 (patch-aa) = 104875afab897c052e7011f7b4ae03ab340bcd14 diff --git a/x11/tint2/patches/patch-aa b/x11/tint2/patches/patch-aa index 54e2bc13e54..f69933a1497 100644 --- a/x11/tint2/patches/patch-aa +++ b/x11/tint2/patches/patch-aa @@ -1,23 +1,14 @@ -$NetBSD: patch-aa,v 1.1.1.1 2009/12/14 00:47:23 snj Exp $ +$NetBSD: patch-aa,v 1.2 2010/04/11 21:43:57 gls Exp $ ---- src/tint.c.orig 2009-12-12 19:33:03.000000000 -0200 -+++ src/tint.c -@@ -38,6 +38,9 @@ - #include "systraybar.h" - #include "panel.h" - -+#ifndef SIGCHLD -+# define SIGCHLD SIGCLD -+#endif - - void signal_handler(int sig) - { -@@ -53,7 +56,7 @@ void init () - signal(SIGINT, signal_handler); - signal(SIGTERM, signal_handler); - signal(SIGHUP, signal_handler); -- signal(SIGCLD, SIG_IGN); // don't have to wait() after fork() -+ signal(SIGCHLD, SIG_IGN); // don't have to wait() after fork() - - // set global data - memset(&server, 0, sizeof(Server_global)); +Do not automatically install samples +--- Makefile.in.orig 2010-01-28 11:16:45.000000000 +0000 ++++ Makefile.in +@@ -237,7 +237,7 @@ top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + ACLOCAL_AMFLAGS = -I m4 +-SUBDIRS = doc sample src ++SUBDIRS = doc src + dist_doc_DATA = AUTHORS ChangeLog NEWS README + EXTRA_DIST = autogen.sh README.source + dist_pkgdata_DATA = default_icon.png diff --git a/x11/tint2/patches/patch-ab b/x11/tint2/patches/patch-ab deleted file mode 100644 index ab997aafeb8..00000000000 --- a/x11/tint2/patches/patch-ab +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2009/12/14 00:47:23 snj Exp $ - ---- Makefile.in.orig 2009-12-13 11:11:42.000000000 -0800 -+++ Makefile.in 2009-12-13 11:12:53.000000000 -0800 -@@ -676,8 +676,7 @@ info: info-recursive - - info-am: - --install-data-am: install-dist_docDATA install-dist_examplesDATA \ -- install-dist_rcDATA -+install-data-am: install-dist_docDATA install-dist_examplesDATA - - install-dvi: install-dvi-recursive - |