Mon Feb 1 02:00:32 2010 UTC ()
DESTDIR support


(joerg)
diff -r1.34 -r1.35 pkgsrc/audio/wsoundprefs/Makefile
diff -r1.7 -r1.8 pkgsrc/audio/wsoundprefs/distinfo
diff -r1.3 -r1.4 pkgsrc/audio/wsoundprefs/patches/patch-aa
diff -r1.7 -r1.8 pkgsrc/audio/wsoundprefs/patches/patch-ab
diff -r0 -r1.1 pkgsrc/audio/wsoundprefs/patches/patch-ah
diff -r0 -r1.1 pkgsrc/audio/wsoundprefs/patches/patch-ai
cvs diff -r1.34 -r1.35 pkgsrc/audio/wsoundprefs/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/wsoundprefs/Makefile 2010/01/18 09:58:39 1.34
+++ pkgsrc/audio/wsoundprefs/Makefile 2010/02/01 02:00:32 1.35
@@ -1,20 +1,22 @@ @@ -1,20 +1,22 @@
1# $NetBSD: Makefile,v 1.34 2010/01/18 09:58:39 wiz Exp $ 1# $NetBSD: Makefile,v 1.35 2010/02/01 02:00:32 joerg Exp $
2 2
3DISTNAME= WSoundPrefs-1.1.1 3DISTNAME= WSoundPrefs-1.1.1
4PKGNAME= wsoundprefs-1.1.1 4PKGNAME= wsoundprefs-1.1.1
5PKGREVISION= 9 5PKGREVISION= 9
6CATEGORIES= audio wm windowmaker 6CATEGORIES= audio wm windowmaker
7MASTER_SITES= # ftp://shadowmere.student.utwente.nl/pub/WindowMaker/ 7MASTER_SITES= # ftp://shadowmere.student.utwente.nl/pub/WindowMaker/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://shadowmere.student.utwente.nl/ 10HOMEPAGE= http://shadowmere.student.utwente.nl/
11COMMENT= WSoundServer configuration utility 11COMMENT= WSoundServer configuration utility
12 12
 13PKG_DESTDIR_SUPPORT= user-destdir
 14
13USE_IMAKE= yes 15USE_IMAKE= yes
14BROKEN_GETTEXT_DETECTION= yes 16BROKEN_GETTEXT_DETECTION= yes
15 17
16.include "../../audio/wsoundserver/buildlink3.mk" 18.include "../../audio/wsoundserver/buildlink3.mk"
17.include "../../wm/windowmaker/buildlink3.mk" 19.include "../../wm/windowmaker/buildlink3.mk"
18.include "../../x11/libXext/buildlink3.mk" 20.include "../../x11/libXext/buildlink3.mk"
19.include "../../x11/libXinerama/buildlink3.mk" 21.include "../../x11/libXinerama/buildlink3.mk"
20.include "../../mk/bsd.pkg.mk" 22.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/audio/wsoundprefs/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/wsoundprefs/distinfo 2005/02/23 20:39:53 1.7
+++ pkgsrc/audio/wsoundprefs/distinfo 2010/02/01 02:00:32 1.8
@@ -1,12 +1,14 @@ @@ -1,12 +1,14 @@
1$NetBSD: distinfo,v 1.7 2005/02/23 20:39:53 agc Exp $ 1$NetBSD: distinfo,v 1.8 2010/02/01 02:00:32 joerg Exp $
2 2
3SHA1 (WSoundPrefs-1.1.1.tar.gz) = 444571543e7a076cc49ee484dbcfd0aefc184316 3SHA1 (WSoundPrefs-1.1.1.tar.gz) = 444571543e7a076cc49ee484dbcfd0aefc184316
4RMD160 (WSoundPrefs-1.1.1.tar.gz) = c9793dd9c6b100f9de3fa9b2771c684ac890016e 4RMD160 (WSoundPrefs-1.1.1.tar.gz) = c9793dd9c6b100f9de3fa9b2771c684ac890016e
5Size (WSoundPrefs-1.1.1.tar.gz) = 32042 bytes 5Size (WSoundPrefs-1.1.1.tar.gz) = 32042 bytes
6SHA1 (patch-aa) = 8ae650bc0a79ee02dbbefc5519eff735a02a722b 6SHA1 (patch-aa) = ef58a08d3687e339502a985e106639c0702226bf
7SHA1 (patch-ab) = 8daeb7657ba5518d730ec88ff73da5a577fd5710 7SHA1 (patch-ab) = 336ae3b74f1b3541f180f186ea9591348eb51af1
8SHA1 (patch-ac) = 592155f98fa0b51690e766eb75bde69531313533 8SHA1 (patch-ac) = 592155f98fa0b51690e766eb75bde69531313533
9SHA1 (patch-ad) = 5d37585aea3950f2d01d66333cbd6fd59d3a42c8 9SHA1 (patch-ad) = 5d37585aea3950f2d01d66333cbd6fd59d3a42c8
10SHA1 (patch-ae) = 675b6b8039016f99b7bdb744eb01747f5f5f8c31 10SHA1 (patch-ae) = 675b6b8039016f99b7bdb744eb01747f5f5f8c31
11SHA1 (patch-af) = 9b60b779af703075058f8a88669cae70a5eecddb 11SHA1 (patch-af) = 9b60b779af703075058f8a88669cae70a5eecddb
12SHA1 (patch-ag) = ec0c1a3c2223b9728fa69f85547cce6b12177c06 12SHA1 (patch-ag) = ec0c1a3c2223b9728fa69f85547cce6b12177c06
 13SHA1 (patch-ah) = 7346f4b9f65782606b61bb0e5e7b52f5134a02c5
 14SHA1 (patch-ai) = 806866b0efebdd19ff6b5aedbcf0c534ab581dc4
cvs diff -r1.3 -r1.4 pkgsrc/audio/wsoundprefs/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/audio/wsoundprefs/patches/patch-aa 2001/03/12 21:19:10 1.3
+++ pkgsrc/audio/wsoundprefs/patches/patch-aa 2010/02/01 02:00:32 1.4
@@ -1,24 +1,23 @@ @@ -1,24 +1,23 @@
1$NetBSD: patch-aa,v 1.3 2001/03/12 21:19:10 wiz Exp $ 1$NetBSD: patch-aa,v 1.4 2010/02/01 02:00:32 joerg Exp $
2 2
3--- Imakefile.orig Fri Mar 31 16:16:47 2000 3--- Imakefile.orig 2000-03-31 14:16:47.000000000 +0000
4+++ Imakefile 4+++ Imakefile
5@@ -6,15 +6,16 @@ 5@@ -6,15 +6,14 @@ XCOMM Specify Your Installation Prefix H
6 XCOMM Installation Path: $(PREFIX)/Apps/WSoundPrefs.app 6 XCOMM Installation Path: $(PREFIX)/Apps/WSoundPrefs.app
7 XCOMM ------------------------------------------------- 7 XCOMM -------------------------------------------------
8 XCOMM PREFIX = /usr/GNUstep/Local 8 XCOMM PREFIX = /usr/GNUstep/Local
9-PREFIX = /usr/local/GNUstep 9-PREFIX = /usr/local/GNUstep
10+XCOMM PREFIX = /usr/local/GNUstep 10+PREFIX := ${PREFIX}/GNUstep
11  11
12  12
13 XCOMM CDEBUGFLAGS = -Wall -ggdb -DDEBUG 13 XCOMM CDEBUGFLAGS = -Wall -ggdb -DDEBUG
14-CDEBUGFLAGS ?= -O2 -m486  14-CDEBUGFLAGS ?= -O2 -m486
15+XCOMM CDEBUGFLAGS ?= -O2 -m486  15+XCOMM CDEBUGFLAGS ?= -O2 -m486
16+CDEBUGFLAGS = -DPREFIX=\\\"$(PREFIX)\\\" 16+CDEBUGFLAGS = -DPREFIX=\\\"$(PREFIX)\\\"
17  17
18 SUBDIRS = src 18 SUBDIRS = src
19  19
20-DESTDIR = $(PREFIX) 20-DESTDIR = $(PREFIX)
21+DESTDIR = $(PREFIX)/GNUstep 21-
22  
23 MakeSubdirs($(SUBDIRS)) 22 MakeSubdirs($(SUBDIRS))
24 DependSubdirs($(SUBDIRS)) 23 DependSubdirs($(SUBDIRS))
cvs diff -r1.7 -r1.8 pkgsrc/audio/wsoundprefs/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/audio/wsoundprefs/patches/patch-ab 2002/08/31 03:08:59 1.7
+++ pkgsrc/audio/wsoundprefs/patches/patch-ab 2010/02/01 02:00:32 1.8
@@ -1,13 +1,22 @@ @@ -1,13 +1,22 @@
1$NetBSD: patch-ab,v 1.7 2002/08/31 03:08:59 wiz Exp $ 1$NetBSD: patch-ab,v 1.8 2010/02/01 02:00:32 joerg Exp $
2 2
3--- src/Imakefile.orig Mon Oct 18 01:35:58 1999 3--- src/Imakefile.orig 1999-10-18 08:35:58.000000000 +0000
4+++ src/Imakefile 4+++ src/Imakefile
5@@ -30,7 +30,7 @@ 5@@ -7,7 +7,7 @@ ICONS = WSoundPrefs.xpm WSoundPrefs.tiff
 6
 7 CC = gcc
 8
 9-BINDIR = /Apps/WSoundPrefs.app
 10+BINDIR = ${PREFIX}/GNUstep/Apps/WSoundPrefs.app
 11
 12 XCOMM EFENCELIB = -lefence
 13 EFENCELIB =
 14@@ -30,7 +30,7 @@ LINTLIBS = $(LINTXLIB)
6 SRCS = PLFunctions.c SoundEvents.c SoundPaths.c SystemInfo.c WSoundPrefs.c main.c 15 SRCS = PLFunctions.c SoundEvents.c SoundPaths.c SystemInfo.c WSoundPrefs.c main.c
7 OBJS = PLFunctions.o SoundEvents.o SoundPaths.o SystemInfo.o WSoundPrefs.o main.o 16 OBJS = PLFunctions.o SoundEvents.o SoundPaths.o SystemInfo.o WSoundPrefs.o main.o
8  17
9-ComplexProgramTarget(WSoundPrefs) 18-ComplexProgramTarget(WSoundPrefs)
10+ComplexProgramTargetNoMan(WSoundPrefs) 19+ComplexProgramTargetNoMan(WSoundPrefs)
11  20
12 InstallMultiple($(ICONS),$(BINDIR)) 21 InstallMultiple($(ICONS),$(BINDIR))
13  22
File Added: pkgsrc/audio/wsoundprefs/patches/patch-ah
$NetBSD: patch-ah,v 1.1 2010/02/01 02:00:32 joerg Exp $

--- src/tiff/Imakefile.orig	2010-02-01 01:58:13.000000000 +0000
+++ src/tiff/Imakefile
@@ -1,4 +1,4 @@
-TIFFDIR = /Apps/WSoundPrefs.app/tiff/
+TIFFDIR = ${PREFIX}/GNUstep/Apps/WSoundPrefs.app/tiff/
 
 TIFFS = loadset.tiff saveset.tiff
File Added: pkgsrc/audio/wsoundprefs/patches/patch-ai
$NetBSD: patch-ai,v 1.1 2010/02/01 02:00:32 joerg Exp $

--- src/xpm/Imakefile.orig	2010-02-01 01:58:31.000000000 +0000
+++ src/xpm/Imakefile
@@ -1,4 +1,4 @@
-XPMDIR = /Apps/WSoundPrefs.app/xpm/
+XPMDIR = ${PREFIX}/GNUstep/Apps/WSoundPrefs.app/xpm/
 
 XPMS = loadset.xpm saveset.xpm