ardour: Improve PKG_SYSCONFDIR handling

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sun Jun 19 16:06:46 2016 +0200
Changeset:	e4e7dd5e94933c01a86fafc6150f837f6b670c6c

Modified Files:
	ardour/Makefile
	ardour/PLIST
	ardour/distinfo
	ardour/patches/patch-libs_ardouralsautil_wscript
	ardour/patches/patch-wscript

Log Message:
ardour: Improve PKG_SYSCONFDIR handling

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e4e7dd5e94933c01a86fafc6150f837f6b670c6c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 ardour/Makefile                                  | 18 +++++++++++++++++-
 ardour/PLIST                                     | 20 ++++++++++----------
 ardour/distinfo                                  |  4 ++--
 ardour/patches/patch-libs_ardouralsautil_wscript |  2 +-
 ardour/patches/patch-wscript                     |  2 +-
 5 files changed, 31 insertions(+), 15 deletions(-)

diffs:
diff --git a/ardour/Makefile b/ardour/Makefile
index f5da858..68ad3f8 100644
--- a/ardour/Makefile
+++ b/ardour/Makefile
@@ -117,6 +117,22 @@ PKGCONFIG_OVERRIDE+=	libs/gtkmm2ext/libgtkmm2ext.pc.in
 PKGCONFIG_OVERRIDE+=	libs/midi++2/libmidi++.pc.in
 PKGCONFIG_OVERRIDE+=	libs/pbd/libpbd.pc.in
 
+BUILD_DEFS+=		PKG_SYSCONFBASE
+
+EGDIR=			${PREFIX}/share/examples/ardour4
+PKG_SYSCONFSUBDIR=	ardour4
+
+CONF_FILES+=		${EGDIR}/ardour4/ardour.menus ${PKG_SYSCONFBASE}/menus/ardour.menus
+CONF_FILES+=		${EGDIR}/ardour4/clearlooks.rc ${PKG_SYSCONFDIR}/clearlooks.rc
+CONF_FILES+=		${EGDIR}/ardour4/dark.colors ${PKG_SYSCONFDIR}/dark.colors
+CONF_FILES+=		${EGDIR}/ardour4/default_ui_config ${PKG_SYSCONFDIR}/default_ui_config
+CONF_FILES+=		${EGDIR}/ardour4/export/CD.format ${PKG_SYSCONFDIR}/export/CD.format
+CONF_FILES+=		${EGDIR}/ardour4/mixer.bindings ${PKG_SYSCONFDIR}/mixer.bindings
+CONF_FILES+=		${EGDIR}/ardour4/mnemonic-us.bindings ${PKG_SYSCONFDIR}/mnemonic-us.bindings
+CONF_FILES+=		${EGDIR}/ardour4/step_editing.bindings ${PKG_SYSCONFDIR}/step_editing.bindings
+CONF_FILES+=		${EGDIR}/ardour4/system_config ${PKG_SYSCONFDIR}/system_config
+CONF_FILES+=		${EGDIR}/ardour4/trx.menus ${PKG_SYSCONFBASE}/menus/trx.menus
+
 # As of NetBSD-7.99.21 pkgsrc's checks cannot open file with rare unicode characters
 CHECK_PORTABILITY_SKIP+=	libs/pbd/test/i18n_test/*.tst
 
@@ -142,7 +158,7 @@ pre-configure:
 		${FILESDIR}/revision.cc > ${WRKSRC}/libs/ardour/revision.cc
 
 WAF_ARGS+=	--prefix=${PREFIX}
-WAF_ARGS+=	--configdir=${PKG_SYSCONFDIR}
+WAF_ARGS+=	--configdir=${EGDIR}
 # Use dlopen(3) for the JACK library
 WAF_ARGS+=	--libjack=weak
 WAF_ARGS+=	--optimize
diff --git a/ardour/PLIST b/ardour/PLIST
index fee6618..9a93d86 100644
--- a/ardour/PLIST
+++ b/ardour/PLIST
@@ -1,16 +1,6 @@
 @comment $NetBSD$
 bin/ardour4
 ${PLIST.dummy}bin/ardour4-export
-etc/ardour4/ardour.menus
-etc/ardour4/clearlooks.rc
-etc/ardour4/dark.colors
-etc/ardour4/default_ui_config
-etc/ardour4/export/CD.format
-etc/ardour4/mixer.bindings
-etc/ardour4/mnemonic-us.bindings
-etc/ardour4/step_editing.bindings
-etc/ardour4/system_config
-etc/ardour4/trx.menus
 lib/ardour4/LV2/reasonablesynth.lv2/manifest.ttl
 lib/ardour4/LV2/reasonablesynth.lv2/reasonablesynth.so
 lib/ardour4/LV2/reasonablesynth.lv2/reasonablesynth.ttl
@@ -417,3 +407,13 @@ share/ardour4/pixmaps/zoom_in.xpm
 share/ardour4/pixmaps/zoom_out.xpm
 share/ardour4/small-splash.png
 share/ardour4/splash.png
+share/examples/ardour4/ardour4/ardour.menus
+share/examples/ardour4/ardour4/clearlooks.rc
+share/examples/ardour4/ardour4/dark.colors
+share/examples/ardour4/ardour4/default_ui_config
+share/examples/ardour4/ardour4/export/CD.format
+share/examples/ardour4/ardour4/mixer.bindings
+share/examples/ardour4/ardour4/mnemonic-us.bindings
+share/examples/ardour4/ardour4/step_editing.bindings
+share/examples/ardour4/ardour4/system_config
+share/examples/ardour4/ardour4/trx.menus
diff --git a/ardour/distinfo b/ardour/distinfo
index 24debcd..4e38f10 100644
--- a/ardour/distinfo
+++ b/ardour/distinfo
@@ -6,7 +6,7 @@ SHA512 (ardour-4.7.tar.gz) = 5daff563ec0b2dc38ec6ca55bb12526ef54da9d8d5a29a9fd6d
 Size (ardour-4.7.tar.gz) = 9863149 bytes
 SHA1 (patch-gtk2__ardour_ardour.sh.in) = dc175db3f0375f18662baf2219be3f999158c17c
 SHA1 (patch-libs_ardour_session__state.cc) = 168f67f4af32181d2e3d85d2759383f9acfcbf29
-SHA1 (patch-libs_ardouralsautil_wscript) = d0ce5b6683018760c68d39ad49229904c57f8f7a
+SHA1 (patch-libs_ardouralsautil_wscript) = 7867f29bc2590219ad0cca387bae27bc503374f4
 SHA1 (patch-libs_backends_alsa_zita-alsa-pcmi.cc) = bb9efc33e62e840ba253031b60d4de323b7c3e21
 SHA1 (patch-libs_backends_jack_wscript) = a048453911b72c9005a5821a5227443e9f78c2e6
 SHA1 (patch-libs_fst_wscript) = b94e18a903fe3fc0bc71edefa1fd690adc17ee6d
@@ -14,4 +14,4 @@ SHA1 (patch-libs_pbd_fpu.cc) = ebdb6d345bf2e3db0402165412978cb1c9043950
 SHA1 (patch-libs_pbd_mountpoint.cc) = 001b8112c08086d32989c82ab699335ecb92ede6
 SHA1 (patch-libs_pbd_wscript) = 0caa774358b511d9790e146e92454a0c34a8d5ef
 SHA1 (patch-libs_vfork_wscript) = 1d357b3bed8a2006cdc50fcdfa387ebca8c699c7
-SHA1 (patch-wscript) = 026e2ad811e2907cfd1d9100b4eb131cc3cf7d31
+SHA1 (patch-wscript) = 0462008436b3adf7ae104adf2c873d25159a7833
diff --git a/ardour/patches/patch-libs_ardouralsautil_wscript b/ardour/patches/patch-libs_ardouralsautil_wscript
index 5f38b37..2f011ab 100644
--- a/ardour/patches/patch-libs_ardouralsautil_wscript
+++ b/ardour/patches/patch-libs_ardouralsautil_wscript
@@ -9,7 +9,7 @@ Add support for NetBSD.
  def configure(conf):
      autowaf.configure(conf)
 -    if re.search ("linux", sys.platform) != None and Options.options.dist_target != 'mingw':
-+    if (re.search ("linux", sys.platform) != None and Options.options.dist_target != 'mingw') or sys.platform.startswith('netbsd'):
++    if (re.search ("linux", sys.platform) != None or sys.platform.startswith('netbsd')) and Options.options.dist_target != 'mingw':
          autowaf.check_pkg(conf, 'alsa', uselib_store='ALSA')
          autowaf.check_pkg(conf, 'dbus-1', uselib_store='DBUS', mandatory = False)
  
diff --git a/ardour/patches/patch-wscript b/ardour/patches/patch-wscript
index e6ddf3f..3d82fbc 100644
--- a/ardour/patches/patch-wscript
+++ b/ardour/patches/patch-wscript
@@ -9,7 +9,7 @@ ALSA and PortAudio are supported on NetBSD.
                    errmsg = 'too old\nPlease install boost version 1.39 or higher.')
  
 -    if re.search ("linux", sys.platform) != None and Options.options.dist_target != 'mingw':
-+    if re.search ("linux", sys.platform) != None and Options.options.dist_target != 'mingw' or sys.platform.startswith('netbsd'):
++    if (re.search ("linux", sys.platform) != None or sys.platform.startswith('netbsd')) and Options.options.dist_target != 'mingw':
          autowaf.check_pkg(conf, 'alsa', uselib_store='ALSA')
  
      autowaf.check_pkg(conf, 'glib-2.0', uselib_store='GLIB', atleast_version='2.28', mandatory=True)