diff options
author | markd <markd> | 2006-01-11 11:32:38 +0000 |
---|---|---|
committer | markd <markd> | 2006-01-11 11:32:38 +0000 |
commit | 673a90842453feb7a84c845209b3fabddeb770a4 (patch) | |
tree | c21a4e85134ced9b08f6a756ae3216941c1bf545 /audio | |
parent | db4d508ebf55a3ddb97627931d7c7f3b6b3fa01e (diff) | |
download | pkgsrc-673a90842453feb7a84c845209b3fabddeb770a4.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')
-rw-r--r-- | audio/nas/distinfo | 5 | ||||
-rw-r--r-- | audio/nas/patches/patch-ab | 10 | ||||
-rw-r--r-- | audio/nas/patches/patch-ag | 13 |
3 files changed, 23 insertions, 5 deletions
diff --git a/audio/nas/distinfo b/audio/nas/distinfo index 09467e1ceb9..3403799819f 100644 --- a/audio/nas/distinfo +++ b/audio/nas/distinfo @@ -1,10 +1,11 @@ -$NetBSD: distinfo,v 1.15 2005/06/04 23:43:51 markd Exp $ +$NetBSD: distinfo,v 1.16 2006/01/11 11:32:38 markd Exp $ SHA1 (nas-1.7b.src.tar.gz) = 6d6e6990f6774fe36fb55679489c08358ac3c9b8 RMD160 (nas-1.7b.src.tar.gz) = cc4f9ba61cf1e9c726938e6de8569d9ddd6d9f59 Size (nas-1.7b.src.tar.gz) = 1290251 bytes -SHA1 (patch-ab) = bb992f10d5176fee23faacbd243a4260ce06c7d8 +SHA1 (patch-ab) = f86037dc3a52cff543ee077d7f0d0a97cf24d9ff SHA1 (patch-ac) = 36f8ee0ec494e9d6a7994780c608c7a5fbf2114d SHA1 (patch-ad) = 5918e8188c8400fc7133c3ae4016d99c7c7594fa SHA1 (patch-ae) = f8ec2cb1809937aa7366ab65bee294e8affce543 SHA1 (patch-af) = 3dfd09dad97549c69e44aac042ed971534926cca +SHA1 (patch-ag) = fe8e2eed681f94499aaa1bbd19b158d2047a29fd 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:: @@\ |