diff options
author | markd <markd> | 2006-01-11 11:32:38 +0000 |
---|---|---|
committer | markd <markd> | 2006-01-11 11:32:38 +0000 |
commit | ddeb33c2ed32a886d61614bd3c5e52fc2da59930 (patch) | |
tree | c21a4e85134ced9b08f6a756ae3216941c1bf545 /audio/nas/patches | |
parent | 8dc5ddac1ad3faf4a057a64e9b876a3e75a3d952 (diff) | |
download | pkgsrc-ddeb33c2ed32a886d61614bd3c5e52fc2da59930.tar.gz |
Some makedepend's object if a referenced header file is a dangling
symlink, so create the actual release.h file at the includes stage as
the depends stage is too late (server/os is before lib/audio).
Fixes PR pkg/32098 from Gilles Dauphin.
Also fix installation of nasd.conf manual page on systems where imake
doesn't have an InstallGenManPage rule (ie. solaris with openwin)
Diffstat (limited to 'audio/nas/patches')
-rw-r--r-- | audio/nas/patches/patch-ab | 10 | ||||
-rw-r--r-- | audio/nas/patches/patch-ag | 13 |
2 files changed, 20 insertions, 3 deletions
diff --git a/audio/nas/patches/patch-ab b/audio/nas/patches/patch-ab index cfdb23d6a60..8ebe6cb88b2 100644 --- a/audio/nas/patches/patch-ab +++ b/audio/nas/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.11 2005/06/04 23:43:51 markd Exp $ +$NetBSD: patch-ab,v 1.12 2006/01/11 11:32:38 markd Exp $ --- server/Imakefile.orig 2005-06-04 16:40:58.000000000 +1200 +++ server/Imakefile @@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.11 2005/06/04 23:43:51 markd Exp $ # define CanBuildAuServer YES # if defined(cygwinArchitecture) -@@ -213,6 +213,7 @@ clean:: +@@ -213,14 +213,19 @@ clean:: $(RM) $(ALL) ETCDIR = NasConfigSearchPath @@ -28,11 +28,15 @@ $NetBSD: patch-ab,v 1.11 2005/06/04 23:43:51 markd Exp $ InstallManPage(nasd,$(MANDIR)) #ifdef InstallGenManPage -@@ -220,7 +221,7 @@ InstallGenManPage(nasd.conf,$(FILEMANDIR + InstallGenManPage(nasd.conf,$(FILEMANDIR),$(FILEMANSUFFIX)) #else ++#ifdef InstallNamedTarget ++InstallNamedTarget(install.man,nasd.conf.man,$(INSTMANFLAGS),$(FILEMANDIR),nasd.conf.$(FILEMANSUFFIX)) ++#else InstallManPage(nasd.conf,$(FILEMANDIR)) #endif -InstallNonExecFile(nasd.conf.eg,$(ETCDIR)) ++#endif +InstallNonExecFile(nasd.conf.eg,$(EGDIR)) #else /* CanBuildAuServer */ diff --git a/audio/nas/patches/patch-ag b/audio/nas/patches/patch-ag new file mode 100644 index 00000000000..6a82b3b512b --- /dev/null +++ b/audio/nas/patches/patch-ag @@ -0,0 +1,13 @@ +$NetBSD: patch-ag,v 1.4 2006/01/11 11:32:38 markd Exp $ + +--- config/NetAudio.tmpl.orig 2006-01-11 23:44:25.000000000 +1300 ++++ config/NetAudio.tmpl +@@ -287,6 +287,8 @@ AuComplexProgramTarget(program) + release.h: $(TOP)/RELEASE @@\ + @echo "static char *release = \"@(#)`cat $(TOP)/RELEASE`\";" > $@ @@\ + @@\ ++includes:: release.h @@\ ++ @@\ + depend:: release.h @@\ + @@\ + clean:: @@\ |