PKG_DESTDIR_SUPPORT

4 files changed, 30 insertions, 12 deletions

diff --git a/audio/rsynth/Makefile b/audio/rsynth/Makefile
index b3a63d08aaf..31bea5e75aa 100644
--- a/audio/rsynth/Makefile
+++ b/audio/rsynth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2007/12/01 23:46:59 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2009/12/17 22:08:09 abs Exp $
 
 DISTNAME=	rsynth-2.0
 PKGREVISION=	2
@@ -17,17 +17,21 @@ DIST_SUBDIR=	rsynth
 GNU_CONFIGURE=	YES
 CONFIGURE_HAS_MANDIR=	NO
 
+USE_TOOLS+=	gzcat
+
 CONFIGURE_ARGS+=--with-aDict="${WRKDIR}/cmudict.0.4"
 CONFIGURE_ARGS+=--without-bDict
 CONFIGURE_ENV+=	ac_cv_lib_audio=yes XLIBS=-lXt
 
+INSTALLATION_DIRS+= bin share/rsynth
+PKG_DESTDIR_SUPPORT= user-destdir
+
 pre-configure:
 	${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/cmudict.0.4.Z > ${WRKDIR}/cmudict.0.4
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/rsynth/
 	cd ${DISTDIR}/${DIST_SUBDIR} && \
-		${INSTALL_DATA} ${DICT_FILES} ${PREFIX}/share/rsynth/
+		${INSTALL_DATA} ${DICT_FILES} ${DESTDIR}${PREFIX}/share/rsynth/
 
 .include "../../audio/nas/buildlink3.mk"
 .include "../../databases/gdbm/buildlink3.mk"
diff --git a/audio/rsynth/distinfo b/audio/rsynth/distinfo
index 7adda9c827c..005b7553339 100644
--- a/audio/rsynth/distinfo
+++ b/audio/rsynth/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2005/12/11 21:10:29 joerg Exp $
+$NetBSD: distinfo,v 1.4 2009/12/17 22:08:09 abs Exp $
 
 SHA1 (rsynth/rsynth-2.0.tar.gz) = 50693c68eb74cf82405c7d402d31d3c811ad4515
 RMD160 (rsynth/rsynth-2.0.tar.gz) = 02efbf2e3db504c5c8fb76e8e21253c48900fbfb
@@ -15,5 +15,5 @@ Size (rsynth/cmulex.0.4.Z) = 430761 bytes
 SHA1 (rsynth/phoneset.0.4) = 8c7e386dbaf33a4e16debd4c538a154a247c1e97
 RMD160 (rsynth/phoneset.0.4) = 9565dcb4db24fc0b0cfd16ea31f45994f24e2753
 Size (rsynth/phoneset.0.4) = 629 bytes
-SHA1 (patch-aa) = 59b0b765461adec5140a8867c7a668cd87d71281
-SHA1 (patch-ab) = 9305005ff26bdb309d2ca8c10e4713fb21d9c0d6
+SHA1 (patch-aa) = d2bab8492ba8d280c1de30a4a006a445441ef906
+SHA1 (patch-ab) = b3e9917e3301b600d90c2e245687c8d18b049101
diff --git a/audio/rsynth/patches/patch-aa b/audio/rsynth/patches/patch-aa
index b6890174c05..ef7d106108a 100644
--- a/audio/rsynth/patches/patch-aa
+++ b/audio/rsynth/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2001/12/22 04:11:40 fredb Exp $
+$NetBSD: patch-aa,v 1.4 2009/12/17 22:08:09 abs Exp $
 
---- Makefile.in.orig	Tue Nov  8 07:30:52 1994
+--- Makefile.in.orig	1994-11-08 13:30:52.000000000 +0000
 +++ Makefile.in
-@@ -5,7 +5,7 @@
+@@ -5,7 +5,7 @@ SRCDIR       = @srcdir@
  CC           = @CC@
  PREFIX       = @prefix@
  BIN_DIR      = $(PREFIX)/bin
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.3 2001/12/22 04:11:40 fredb Exp $
  LDLIBS       = @LIBS@
  XLIBS        = @XLIBS@
  CFLAGS       = @CFLAGS@
-@@ -58,7 +58,7 @@
+@@ -58,18 +58,18 @@ distclean : clean
  hplay.o : hplay.c proto.h getargs.h hplay.h 
  
  aDict.db : $(ADICT) mkdictdb
@@ -20,3 +20,17 @@ $NetBSD: patch-aa,v 1.3 2001/12/22 04:11:40 fredb Exp $
  
  bDict.db : $(BDICT) mkdictdb
  	mkdictdb $(BDICT) bDict.db  
+ 
+ install  : $(PROGS) $(DICTS)
+ 	for f in $(PROGS); do \
+-	$(INSTALL_PROG) $$f $(BIN_DIR); \
++	$(INSTALL_PROG) $$f $(DESTDIR)$(BIN_DIR); \
+ 	done
+-	$(INSTALL) -d $(LIB_DIR)
++	$(INSTALL) -d $(DESTDIR)$(LIB_DIR)
+ 	for f in $(DICTS); do \
+-	$(INSTALL_DATA) $$f $(LIB_DIR); \
++	$(INSTALL_DATA) $$f $(DESTDIR)$(LIB_DIR); \
+ 	done
+ 
+ @make_dist@
diff --git a/audio/rsynth/patches/patch-ab b/audio/rsynth/patches/patch-ab
index 06122892925..74818758eab 100644
--- a/audio/rsynth/patches/patch-ab
+++ b/audio/rsynth/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.3 2005/12/11 21:10:29 joerg Exp $
+$NetBSD: patch-ab,v 1.4 2009/12/17 22:08:09 abs Exp $
 
---- configure.orig	2005-12-11 20:56:09.000000000 +0000
+--- configure.orig	1994-11-08 13:32:08.000000000 +0000
 +++ configure
 @@ -1329,9 +1329,10 @@ cat > conftest.$ac_ext <<EOF
  #line 1330 "configure"