Fix build and add DESTDIR support.

5 files changed, 46 insertions, 10 deletions

diff --git a/audio/rplay/Makefile b/audio/rplay/Makefile
index 6e170b4d9d3..33ddb7752c2 100644
--- a/audio/rplay/Makefile
+++ b/audio/rplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2007/01/06 17:41:00 veego Exp $
+# $NetBSD: Makefile,v 1.57 2008/04/03 11:03:21 joerg Exp $
 #
 
 DISTNAME=	rplay-3.3.2
@@ -11,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://rplay.doit.org/
 COMMENT=	Network audio player
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=		makeinfo
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
@@ -20,6 +22,7 @@ CONFIGURE_ARGS+=	--build=BUILD
 INFO_FILES=	# PLIST
 RCD_SCRIPTS=	rplayd
 EGDIR=		${PREFIX}/share/examples/rplay
+INSTALLATION_DIRS=	${EGDIR}
 
 pre-configure:
 	cd ${WRKSRC}/doc; for manpage in *.[0-9]; do			\
@@ -31,9 +34,8 @@ pre-configure:
 	done
 
 post-install:
-	${INSTALL_DATA_DIR} ${EGDIR}
 .for f in rplay.conf rplay.helpers rplay.hosts rplay.servers
-	${INSTALL_DATA} ${WRKSRC}/etc/${f} ${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/etc/${f} ${DESTDIR}${EGDIR}
 .endfor
 
 .include "../../audio/gsm/buildlink3.mk"
diff --git a/audio/rplay/distinfo b/audio/rplay/distinfo
index eedb0c6d8f7..b5bc376a9f5 100644
--- a/audio/rplay/distinfo
+++ b/audio/rplay/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.11 2007/01/06 17:41:00 veego Exp $
+$NetBSD: distinfo,v 1.12 2008/04/03 11:03:21 joerg Exp $
 
 SHA1 (rplay-3.3.2.tar.gz) = 80b8001998a6f9837773f26285afffd609df2662
 RMD160 (rplay-3.3.2.tar.gz) = e5c740eade2cc770ea78c8f53020fa6d78f59861
 Size (rplay-3.3.2.tar.gz) = 480015 bytes
-SHA1 (patch-aa) = 1487cc793f5485945436b070054d0ada8538b74c
+SHA1 (patch-aa) = d90e20abbca433740b7d53ba66e89f9dd80f8286
 SHA1 (patch-ab) = 4f2b26f96e431ebec8169c7ecd9187e0d9196b73
 SHA1 (patch-ac) = 89ccb3b33b245710b5349899c6539c004c9bade2
 SHA1 (patch-ad) = 395048f6f0d0c579dfe81a0a2a0556651305e07b
@@ -26,6 +26,8 @@ SHA1 (patch-au) = 7451e5ba18e21c3787869cf9a1d55433d9d488fc
 SHA1 (patch-av) = 6eaa0294af7d559b7e0b74e22e93aecc42db1a9a
 SHA1 (patch-aw) = 82de8a6a58f0e3db1d52f97bcaff7f4ad643bb73
 SHA1 (patch-ax) = 7b2ce8d34bca784df1fcaa53fe081c89ca882b58
+SHA1 (patch-ay) = eabf297f65a66174ce032bf7498bf6f324fe0d13
+SHA1 (patch-az) = 8a55e0097ce509e169be02a127efb3db18aa395f
 SHA1 (patch-ca) = d5ffe7a8e0f2112adf0d11b5661d565e5a57dec8
 SHA1 (patch-cb) = 24c810e43d6735c24908ba429ede32a49cff36e8
 SHA1 (patch-cc) = 824d7c70282d24e489c7c041982018da13ac70ce
diff --git a/audio/rplay/patches/patch-aa b/audio/rplay/patches/patch-aa
index 9133b2170b0..9fca1b20d61 100644
--- a/audio/rplay/patches/patch-aa
+++ b/audio/rplay/patches/patch-aa
@@ -1,17 +1,23 @@
-$NetBSD: patch-aa,v 1.4 2006/03/20 03:53:27 jlam Exp $
+$NetBSD: patch-aa,v 1.5 2008/04/03 11:03:21 joerg Exp $
 
---- Makefile.config.in.orig	1998-08-13 02:12:59.000000000 -0400
+--- Makefile.config.in.orig	1998-08-13 08:12:59.000000000 +0200
 +++ Makefile.config.in
-@@ -11,10 +11,10 @@ exec_prefix=	@exec_prefix@
+@@ -6,15 +6,15 @@
+ SHELL=		/bin/sh
+ srcdir=		@srcdir@
+ VPATH=		@srcdir@
+-prefix=		@prefix@
++prefix=		${DESTDIR}@prefix@
+ exec_prefix=	@exec_prefix@
  bindir=		$(exec_prefix)/bin
  sbindir=	$(exec_prefix)/sbin
  libdir=		$(exec_prefix)/lib
 -mandir=		$(prefix)/man
-+mandir=		@mandir@
++mandir=		${DESTDIR}@mandir@
  etcdir=		$(prefix)/etc
  includedir=	$(prefix)/include
 -infodir=	$(prefix)/info
-+infodir=	@infodir@
++infodir=	${DESTDIR}@infodir@
  tmpdir=		/tmp
  debiandir=	@srcdir@/../debian
  
diff --git a/audio/rplay/patches/patch-ay b/audio/rplay/patches/patch-ay
new file mode 100644
index 00000000000..834eb83058c
--- /dev/null
+++ b/audio/rplay/patches/patch-ay
@@ -0,0 +1,13 @@
+$NetBSD: patch-ay,v 1.1 2008/04/03 11:03:21 joerg Exp $
+
+--- rplayd/connection.c.orig	2008-04-03 12:39:36.000000000 +0200
++++ rplayd/connection.c
+@@ -25,7 +25,7 @@
+ #include "config.h"
+ #endif
+ #include <sys/time.h>
+-#include <sys/errno.h>
++#include <errno.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+ #ifdef HAVE_STRING_H
diff --git a/audio/rplay/patches/patch-az b/audio/rplay/patches/patch-az
new file mode 100644
index 00000000000..5c22aa914ff
--- /dev/null
+++ b/audio/rplay/patches/patch-az
@@ -0,0 +1,13 @@
+$NetBSD: patch-az,v 1.1 2008/04/03 11:03:21 joerg Exp $
+
+--- rplayd/rplayd.c.orig	2008-04-03 12:49:24.000000000 +0200
++++ rplayd/rplayd.c
+@@ -47,7 +47,7 @@
+ #ifdef HAVE_STRING_H
+ #include <string.h>
+ #endif
+-#include <sys/errno.h>
++#include <errno.h>
+ #ifdef __STDC__
+ #include <stdarg.h>
+ #else