[pkgsrc/trunk]: pkgsrc/audio/rtunes Fix build on DragonFly. Always build with...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b277bc0b91ce
branches:  trunk
changeset: 536937:b277bc0b91ce
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sat Dec 29 19:54:02 2007 +0000

description:
Fix build on DragonFly. Always build with gmake as lex / yacc output gets
named incorrectly otherwise. Set WRKSRC correctly.

diffstat:

 audio/rtunes/Makefile         |  23 +++++------------------
 audio/rtunes/distinfo         |   5 +++--
 audio/rtunes/patches/patch-af |   8 ++++----
 audio/rtunes/patches/patch-ai |  21 +++++++++++++++++++++
 4 files changed, 33 insertions(+), 24 deletions(-)

diffs (122 lines):

diff -r 05078f8ebb83 -r b277bc0b91ce audio/rtunes/Makefile
--- a/audio/rtunes/Makefile     Sat Dec 29 19:49:43 2007 +0000
+++ b/audio/rtunes/Makefile     Sat Dec 29 19:54:02 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/11/23 00:18:41 bjs Exp $
+# $NetBSD: Makefile,v 1.2 2007/12/29 19:54:02 joerg Exp $
 #
 
 DISTNAME=      rtunes-snap-20071122
@@ -6,40 +6,27 @@
 MASTER_SITES=  ${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=  .tar.bz2
 
-
 MAINTAINER=    bjs%NetBSD.org@localhost
 HOMEPAGE=      http://www.nazgul.ch/dev.html
 COMMENT=       Streams audio to an Apple AirPort Express device
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
+WRKSRC=                ${WRKDIR}/rtunes
+
 NO_CONFIGURE=          yes
-USE_TOOLS+=            yacc lex
+USE_TOOLS+=            yacc lex gmake
+MAKE_FILE=             GNUmakefile
 
 .include "../../mk/bsd.prefs.mk"
 
-###
-### XXX this dual-makefile, non-libtoolized package really needs to be
-###     reworked for proper multi-platform support, but I do not have
-###     time as of now.
-###
-.if ${OPSYS} == "Linux"
-USE_TOOLS+=    gmake
-MAKE_ENV+=     MAKE=${GMAKE:Q}
-.else
-USE_BSD_MAKEFILE=      yes
-MAKE_ENV+=             MKPRIVATELIB=yes
-.endif
-
 EGDIR=                 ${PREFIX}/share/examples/rtunes
 CONF_FILES=            ${EGDIR}/${RTUNES_CONF:T} \
                                ${PKG_SYSCONFDIR}/${RTUNES_CONF:T}
 RTUNES_CONF=           ${WRKDIR}/rtunes.conf
 
-
 INSTALLATION_DIRS_FROM_PLIST=  yes
 
-
 SUBST_CLASSES+=                doc
 SUBST_FILES.doc=       librtunes/README
 SUBST_STAGE.doc=       post-extract
diff -r 05078f8ebb83 -r b277bc0b91ce audio/rtunes/distinfo
--- a/audio/rtunes/distinfo     Sat Dec 29 19:49:43 2007 +0000
+++ b/audio/rtunes/distinfo     Sat Dec 29 19:54:02 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/11/23 00:18:41 bjs Exp $
+$NetBSD: distinfo,v 1.2 2007/12/29 19:54:02 joerg Exp $
 
 SHA1 (rtunes-snap-20071122.tar.bz2) = 8de9a4e7811785bf2fa05f1da85319942a38c000
 RMD160 (rtunes-snap-20071122.tar.bz2) = 8442a8f90a1a94bdeb61fb8bf1d94bcd861169ab
@@ -8,6 +8,7 @@
 SHA1 (patch-ac) = 323085981da113f9cc118895af14a60b2ce6fba1
 SHA1 (patch-ad) = 199a0844ce3e62f53e5f34df00af3eb26ab8cbb6
 SHA1 (patch-ae) = 45afb27cd512e77aee74c4da1607f85fd5d15ee1
-SHA1 (patch-af) = 3a4b8e29943e29bf0b94028e3777b07e79a1b9b7
+SHA1 (patch-af) = d3cec3bcf6054eacb5567080ae9f7472926e5268
 SHA1 (patch-ag) = e5fb147e809875404a1cd239751b7d8667e0b927
 SHA1 (patch-ah) = 7c04858f66bce0e9def8689b4ecf0f1a5d2c3948
+SHA1 (patch-ai) = 6a770a3eed2874c6d7663dabbea4d779de1ad505
diff -r 05078f8ebb83 -r b277bc0b91ce audio/rtunes/patches/patch-af
--- a/audio/rtunes/patches/patch-af     Sat Dec 29 19:49:43 2007 +0000
+++ b/audio/rtunes/patches/patch-af     Sat Dec 29 19:54:02 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1.1.1 2007/11/23 00:18:41 bjs Exp $
+$NetBSD: patch-af,v 1.2 2007/12/29 19:54:02 joerg Exp $
 
 --- libbsd/GNUmakefile.orig    2006-05-06 10:15:59.000000000 -0400
 +++ libbsd/GNUmakefile
@@ -7,12 +7,12 @@
  
  strlcpy.o:    strlcpy.c
 -              cc ${CCFLAGS} strlcpy.c
-+              %{CC} ${CCFLAGS} strlcpy.c
++              ${CC} ${CCFLAGS} strlcpy.c
  strlcat.o:    strlcat.c
 -              cc ${CCFLAGS} strlcat.c
-+              %{CC} ${CCFLAGS} strlcat.c
++              ${CC} ${CCFLAGS} strlcat.c
  arc4random.o: arc4random.c
 -              cc ${CCFLAGS} arc4random.c
-+              %{CC} ${CCFLAGS} arc4random.c
++              ${CC} ${CCFLAGS} arc4random.c
  clean:
                rm -f libbsd.a *.o
diff -r 05078f8ebb83 -r b277bc0b91ce audio/rtunes/patches/patch-ai
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/rtunes/patches/patch-ai     Sat Dec 29 19:54:02 2007 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-ai,v 1.1 2007/12/29 19:54:02 joerg Exp $
+
+Conflicts with system function (size_t datlen) on DragonFly.
+
+--- libbsd/arc4random.c.orig   2007-12-29 17:37:54.000000000 +0000
++++ libbsd/arc4random.c
+@@ -150,14 +150,6 @@ arc4random_stir(void)
+       arc4_stir(&rs);
+ }
+ 
+-void
+-arc4random_addrandom(u_char *dat, int datlen)
+-{
+-      if (!rs_initialized)
+-              arc4random_stir();
+-      arc4_addrandom(&rs, dat, datlen);
+-}
+-
+ u_int32_t
+ arc4random(void)
+ {