Mon Jan 9 17:57:34 2012 UTC ()
Add comments to patches.
Update HOMEPAGE.
Set LICENSE.


(wiz)
diff -r1.25 -r1.26 pkgsrc/x11/xosd/Makefile.common
diff -r1.12 -r1.13 pkgsrc/x11/xosd/distinfo
diff -r1.3 -r1.4 pkgsrc/x11/xosd/patches/patch-aa
diff -r1.3 -r1.4 pkgsrc/x11/xosd/patches/patch-ab
diff -r1.3 -r1.4 pkgsrc/x11/xosd/patches/patch-ac
cvs diff -r1.25 -r1.26 pkgsrc/x11/xosd/Makefile.common (expand / switch to unified diff)

--- pkgsrc/x11/xosd/Makefile.common 2010/01/16 17:57:38 1.25
+++ pkgsrc/x11/xosd/Makefile.common 2012/01/09 17:57:34 1.26
@@ -1,23 +1,24 @@ @@ -1,23 +1,24 @@
1# $NetBSD: Makefile.common,v 1.25 2010/01/16 17:57:38 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.26 2012/01/09 17:57:34 wiz Exp $
2# 2#
3# used by x11/xmms-osd/Makefile 3# used by x11/xmms-osd/Makefile
4 4
5DISTNAME= xosd-2.2.14 5DISTNAME= xosd-2.2.14
6CATEGORIES= x11 6CATEGORIES= x11
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libxosd/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libxosd/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.ignavus.net/software.html 10HOMEPAGE= http://sourceforge.net/projects/libxosd/
 11LICENSE= gnu-gpl-v2
11 12
12DISTINFO_FILE= ${.CURDIR}/../../x11/xosd/distinfo 13DISTINFO_FILE= ${.CURDIR}/../../x11/xosd/distinfo
13PATCHDIR= ${.CURDIR}/../../x11/xosd/patches 14PATCHDIR= ${.CURDIR}/../../x11/xosd/patches
14 15
15GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
16USE_LIBTOOL= yes 17USE_LIBTOOL= yes
17 18
18SHLIBTOOL_OVERRIDE= libtool-disable-static 19SHLIBTOOL_OVERRIDE= libtool-disable-static
19 20
20SUBST_CLASSES+= fixme 21SUBST_CLASSES+= fixme
21SUBST_STAGE.fixme= post-patch 22SUBST_STAGE.fixme= post-patch
22SUBST_FILES.fixme= configure 23SUBST_FILES.fixme= configure
23SUBST_SED.fixme= -e "s|-lpthread|"${PTHREAD_LIBS:M*:Q}"|g" 24SUBST_SED.fixme= -e "s|-lpthread|"${PTHREAD_LIBS:M*:Q}"|g"
cvs diff -r1.12 -r1.13 pkgsrc/x11/xosd/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/xosd/distinfo 2009/02/03 19:59:41 1.12
+++ pkgsrc/x11/xosd/distinfo 2012/01/09 17:57:34 1.13
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.12 2009/02/03 19:59:41 shattered Exp $ 1$NetBSD: distinfo,v 1.13 2012/01/09 17:57:34 wiz Exp $
2 2
3SHA1 (xosd-2.2.14.tar.gz) = 1d459a62239c9fe842d835bb7f60eb2edd7c979f 3SHA1 (xosd-2.2.14.tar.gz) = 1d459a62239c9fe842d835bb7f60eb2edd7c979f
4RMD160 (xosd-2.2.14.tar.gz) = 8a39756c5a46f2897be9bbd47dd86770f42ed648 4RMD160 (xosd-2.2.14.tar.gz) = 8a39756c5a46f2897be9bbd47dd86770f42ed648
5Size (xosd-2.2.14.tar.gz) = 418331 bytes 5Size (xosd-2.2.14.tar.gz) = 418331 bytes
6SHA1 (patch-aa) = 11399ad28cd5602905d6aff60eacb1e3f50f0a36 6SHA1 (patch-aa) = b555bbb0777dcf0d2475496ae8725b1b2c202fb5
7SHA1 (patch-ab) = 435084167cafb81f6b87d9e11b57fc021583610f 7SHA1 (patch-ab) = 5502dc0f546a5afe199e746995efd90b0056a34b
8SHA1 (patch-ac) = cede5f442c9896548f1179f20b8e89540b68d4ec 8SHA1 (patch-ac) = 3c42659ff34b26710fd1ad3329a1f203710155f5
cvs diff -r1.3 -r1.4 pkgsrc/x11/xosd/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/x11/xosd/patches/patch-aa 2004/08/27 09:18:12 1.3
+++ pkgsrc/x11/xosd/patches/patch-aa 2012/01/09 17:57:34 1.4
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-aa,v 1.3 2004/08/27 09:18:12 adam Exp $ 1$NetBSD: patch-aa,v 1.4 2012/01/09 17:57:34 wiz Exp $
 2
 3Separate build of xmms plugin from the rest, so it can be split in two packages.
2 4
3--- configure.orig 2004-08-26 22:16:19.000000000 +0000 5--- configure.orig 2004-08-26 22:16:19.000000000 +0000
4+++ configure 6+++ configure
5@@ -20632,6 +20632,7 @@ CFLAGS="$CFLAGS $X_CFLAGS -Wall" 7@@ -20632,6 +20632,7 @@ CFLAGS="$CFLAGS $X_CFLAGS -Wall"
6 M4DATADIR="$datadir/aclocal" 8 M4DATADIR="$datadir/aclocal"
7  9
8  10
9+if [ "$XOSD_XMMS_PLUGIN" = "YES" ]; then 11+if [ "$XOSD_XMMS_PLUGIN" = "YES" ]; then
10  12
11 # Check whether --with-gtk-prefix or --without-gtk-prefix was given. 13 # Check whether --with-gtk-prefix or --without-gtk-prefix was given.
12 if test "${with_gtk_prefix+set}" = set; then 14 if test "${with_gtk_prefix+set}" = set; then
13@@ -20947,6 +20948,7 @@ echo "$as_me: WARNING: *** GTK+ >= 1.2.2 15@@ -20947,6 +20948,7 @@ echo "$as_me: WARNING: *** GTK+ >= 1.2.2
14  16
cvs diff -r1.3 -r1.4 pkgsrc/x11/xosd/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/x11/xosd/patches/patch-ab 2004/08/27 09:18:12 1.3
+++ pkgsrc/x11/xosd/patches/patch-ab 2012/01/09 17:57:34 1.4
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-ab,v 1.3 2004/08/27 09:18:12 adam Exp $ 1$NetBSD: patch-ab,v 1.4 2012/01/09 17:57:34 wiz Exp $
 2
 3Separate build of xmms plugin from the rest, so it can be split in two packages.
2 4
3--- src/xmms_plugin/Makefile.in.orig 2004-08-26 22:16:25.000000000 +0000 5--- src/xmms_plugin/Makefile.in.orig 2004-08-26 22:16:25.000000000 +0000
4+++ src/xmms_plugin/Makefile.in 6+++ src/xmms_plugin/Makefile.in
5@@ -50,7 +50,7 @@ CONFIG_CLEAN_FILES = 7@@ -50,7 +50,7 @@ CONFIG_CLEAN_FILES =
6 am__installdirs = "$(DESTDIR)$(xmmsplugindir)" 8 am__installdirs = "$(DESTDIR)$(xmmsplugindir)"
7 xmmspluginLTLIBRARIES_INSTALL = $(INSTALL) 9 xmmspluginLTLIBRARIES_INSTALL = $(INSTALL)
8 LTLIBRARIES = $(xmmsplugin_LTLIBRARIES) 10 LTLIBRARIES = $(xmmsplugin_LTLIBRARIES)
9-libxmms_osd_la_DEPENDENCIES = $(top_builddir)/src/libxosd/libxosd.la 11-libxmms_osd_la_DEPENDENCIES = $(top_builddir)/src/libxosd/libxosd.la
10+libxmms_osd_la_DEPENDENCIES = 12+libxmms_osd_la_DEPENDENCIES =
11 am_libxmms_osd_la_OBJECTS = xmms_osd.lo dlg_config.lo dlg_font.lo \ 13 am_libxmms_osd_la_OBJECTS = xmms_osd.lo dlg_config.lo dlg_font.lo \
12 dlg_colour.lo 14 dlg_colour.lo
13 libxmms_osd_la_OBJECTS = $(am_libxmms_osd_la_OBJECTS) 15 libxmms_osd_la_OBJECTS = $(am_libxmms_osd_la_OBJECTS)
14@@ -216,7 +216,7 @@ xmmsplugindir = @XMMS_PLUGIN_DIR@ 16@@ -216,7 +216,7 @@ xmmsplugindir = @XMMS_PLUGIN_DIR@
cvs diff -r1.3 -r1.4 pkgsrc/x11/xosd/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/x11/xosd/patches/patch-ac 2009/02/03 19:59:42 1.3
+++ pkgsrc/x11/xosd/patches/patch-ac 2012/01/09 17:57:34 1.4
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-ac,v 1.3 2009/02/03 19:59:42 shattered Exp $ 1$NetBSD: patch-ac,v 1.4 2012/01/09 17:57:34 wiz Exp $
 2
 3Separate build of xmms plugin from the rest, so it can be split in two packages.
2 4
3--- src/Makefile.in.orig 2004-11-17 19:30:22.000000000 +0000 5--- src/Makefile.in.orig 2004-11-17 19:30:22.000000000 +0000
4+++ src/Makefile.in 6+++ src/Makefile.in
5@@ -231,7 +231,8 @@ osd_cat_LDADD = libxosd/libxosd.la 7@@ -231,7 +231,8 @@ osd_cat_LDADD = libxosd/libxosd.la
6 testprog_LDADD = libxosd/libxosd.la 8 testprog_LDADD = libxosd/libxosd.la
7 include_HEADERS = xosd.h 9 include_HEADERS = xosd.h
8 AM_CFLAGS = ${GTK_CFLAGS} 10 AM_CFLAGS = ${GTK_CFLAGS}
9-SUBDIRS = libxosd xmms_plugin bmp_plugin 11-SUBDIRS = libxosd xmms_plugin bmp_plugin
10+@BUILD_NEW_PLUGIN_TRUE@SUBDIRS = libxosd xmms_plugin 12+@BUILD_NEW_PLUGIN_TRUE@SUBDIRS = libxosd xmms_plugin
11+@BUILD_NEW_PLUGIN_FALSE@SUBDIRS = libxosd 13+@BUILD_NEW_PLUGIN_FALSE@SUBDIRS = libxosd
12 all: all-recursive 14 all: all-recursive
13  15
14 .SUFFIXES: 16 .SUFFIXES: