ardour: Fix installation into EGDIR

diff --git a/ardour/Makefile b/ardour/Makefile
index ea26bb5deba6d6cc789275494c72933586cd6369..fe2a136bd4ce20afcd7d2d495d77914e720c482f 100644 (file)
--- a/ardour/Makefile
+++ b/ardour/Makefile
@@ -125,16 +125,16 @@ PKG_SYSCONFSUBDIR=        ardour4
 OWN_DIRS=              ${PKG_SYSCONFDIR}
 OWN_DIRS=              ${PKG_SYSCONFDIR}/export
 
-CONF_FILES+=           ${EGDIR}/ardour4/ardour.menus ${PKG_SYSCONFDIR}/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_SYSCONFDIR}/trx.menus
+CONF_FILES+=           ${EGDIR}/ardour.menus ${PKG_SYSCONFDIR}/ardour.menus
+CONF_FILES+=           ${EGDIR}/clearlooks.rc ${PKG_SYSCONFDIR}/clearlooks.rc
+CONF_FILES+=           ${EGDIR}/dark.colors ${PKG_SYSCONFDIR}/dark.colors
+CONF_FILES+=           ${EGDIR}/default_ui_config ${PKG_SYSCONFDIR}/default_ui_config
+CONF_FILES+=           ${EGDIR}/export/CD.format ${PKG_SYSCONFDIR}/export/CD.format
+CONF_FILES+=           ${EGDIR}/mixer.bindings ${PKG_SYSCONFDIR}/mixer.bindings
+CONF_FILES+=           ${EGDIR}/mnemonic-us.bindings ${PKG_SYSCONFDIR}/mnemonic-us.bindings
+CONF_FILES+=           ${EGDIR}/step_editing.bindings ${PKG_SYSCONFDIR}/step_editing.bindings
+CONF_FILES+=           ${EGDIR}/system_config ${PKG_SYSCONFDIR}/system_config
+CONF_FILES+=           ${EGDIR}/trx.menus ${PKG_SYSCONFDIR}/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
@@ -161,13 +161,16 @@ pre-configure:
                ${FILESDIR}/revision.cc > ${WRKSRC}/libs/ardour/revision.cc
 
 WAF_ARGS+=     --prefix=${PREFIX}
-WAF_ARGS+=     --configdir=${EGDIR}
+WAF_ARGS+=     --configdir=${PKG_SYSCONFBASE}
 # Use dlopen(3) for the JACK library
 WAF_ARGS+=     --libjack=weak
 WAF_ARGS+=     --optimize
 # Required to build on NetBSD
 WAF_ARGS+=     --cxx11
 
+# Sources are patched to install configuration into EGDIR instead of CONFDIR
+WAF_ENV+=      EGDIR=${EGDIR}
+
 WAF_REPLACE_EXECUTABLE=        no
 
 # ./waf i18n

diff --git a/ardour/PLIST b/ardour/PLIST
index 9a93d8647e003fc4ecfad84eebe4984a4e2b3222..e5dc2504c3927aed2d099e95cc93d99776ddef00 100644 (file)
--- a/ardour/PLIST
+++ b/ardour/PLIST
@@ -407,13 +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
+share/examples/ardour4/ardour.menus
+share/examples/ardour4/clearlooks.rc
+share/examples/ardour4/dark.colors
+share/examples/ardour4/default_ui_config
+share/examples/ardour4/export/CD.format
+share/examples/ardour4/mixer.bindings
+share/examples/ardour4/mnemonic-us.bindings
+share/examples/ardour4/step_editing.bindings
+share/examples/ardour4/system_config
+share/examples/ardour4/trx.menus

diff --git a/ardour/distinfo b/ardour/distinfo
index 4e38f10a7a53d5b2ec61b23a2914f94ce7672f18..77701b7879e17628962a963b24beefafb522f089 100644 (file)
--- a/ardour/distinfo
+++ b/ardour/distinfo
@@ -5,6 +5,7 @@ RMD160 (ardour-4.7.tar.gz) = 366f7057fab9878ac425dd70a751899984abc030
 SHA512 (ardour-4.7.tar.gz) = 5daff563ec0b2dc38ec6ca55bb12526ef54da9d8d5a29a9fd6d869f54b83e6fe5ff3c28ef654e6700455110b4a46ce42a33902eb66d96330c6c0948eb3cd3096
 Size (ardour-4.7.tar.gz) = 9863149 bytes
 SHA1 (patch-gtk2__ardour_ardour.sh.in) = dc175db3f0375f18662baf2219be3f999158c17c
+SHA1 (patch-gtk2__ardour_wscript) = 31f9c9db9d918eab04a66a3196d10593681391d5
 SHA1 (patch-libs_ardour_session__state.cc) = 168f67f4af32181d2e3d85d2759383f9acfcbf29
 SHA1 (patch-libs_ardouralsautil_wscript) = 7867f29bc2590219ad0cca387bae27bc503374f4
 SHA1 (patch-libs_backends_alsa_zita-alsa-pcmi.cc) = bb9efc33e62e840ba253031b60d4de323b7c3e21
@@ -14,4 +15,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) = 0462008436b3adf7ae104adf2c873d25159a7833
+SHA1 (patch-wscript) = e3f64b19c9bf92784139feb0640c3cee39233af8

diff --git a/ardour/options.mk b/ardour/options.mk
index d1d592c7242b14ee24b541a44475801c504853c2..5e2b4fc5da2db27210cc563146046771b0c85b7a 100644 (file)
--- a/ardour/options.mk
+++ b/ardour/options.mk
@@ -9,6 +9,12 @@ PLIST_VARS=            alsa jack dummy
 
 .include "../../mk/bsd.options.mk"
 
+.if ${OPSYS} == "Linux" || ${OPSYS} == "Linux"
+.  if !empty(PKG_OPTIONS:Malsa)
+.    error ALSA is required on this platform
+.  endif
+.endif
+
 .if !empty(PKG_OPTIONS:Malsa)
 .include "../../audio/alsa-lib/buildlink3.mk"
 ARDOUR_BACKENDS_ALSA=  yes

diff --git a/ardour/patches/patch-gtk2__ardour_wscript b/ardour/patches/patch-gtk2__ardour_wscript
new file mode 100644 (file)
index 0000000..e21ed25
--- /dev/null
+++ b/ardour/patches/patch-gtk2__ardour_wscript
@@ -0,0 +1,62 @@
+$NetBSD$
+
+--- gtk2_ardour/wscript.orig   2016-02-19 01:28:56.000000000 +0000
++++ gtk2_ardour/wscript
+@@ -651,13 +651,13 @@ def build(bld):
+     obj              = bld(features = 'subst')
+     obj.source       = [ 'clearlooks.rc.in' ]
+     obj.target       = 'clearlooks.rc'
+-    obj.install_path = bld.env['CONFDIR']
++    obj.install_path = os.environ['EGDIR']
+     set_subst_dict(obj, font_subst_dict)
+ 
+     obj              = bld(features = 'subst')
+     obj.source       = [ 'default_ui_config.in' ]
+     obj.target       = 'default_ui_config'
+-    obj.install_path = bld.env['CONFDIR']
++    obj.install_path = os.environ['EGDIR']
+     set_subst_dict(obj, font_subst_dict)
+ 
+     # Menus
+@@ -681,7 +681,7 @@ def build(bld):
+         obj.dep_vars = ['PTFORMAT', 'GTKOSX', 'WINDOWS']
+         obj.stdin = program + '.menus.in'
+         obj.stdout = program + '.menus'
+-        bld.install_files (bld.env['CONFDIR'], program + '.menus')
++        bld.install_files (os.environ['EGDIR'], program + '.menus')
+ 
+     # Freedesktop
+     freedesktop_subst_dict = {
+@@ -728,12 +728,12 @@ def build(bld):
+             source = b + '.bindings.in',
+             rule = a_rule
+             )
+-        obj.install_path = bld.env['CONFDIR']
++        obj.install_path = os.environ['EGDIR']
+ 
+     # not modified at present
+-    bld.install_files(bld.env['CONFDIR'], 'dark.colors')
+-    bld.install_files(bld.env['CONFDIR'], 'step_editing.bindings')
+-    bld.install_files(bld.env['CONFDIR'], 'mixer.bindings')
++    bld.install_files(os.environ['EGDIR'], 'dark.colors')
++    bld.install_files(os.environ['EGDIR'], 'step_editing.bindings')
++    bld.install_files(os.environ['EGDIR'], 'mixer.bindings')
+ 
+     # Icons/Images
+     bld.install_files(os.path.join (bld.env['DATADIR'], 'icons'), bld.path.ant_glob('icons/*.png'))
+@@ -749,12 +749,12 @@ def build(bld):
+         bld.install_files(os.path.join (bld.env['DATADIR'], 'icons'), 'icons/cursor_square/hotspots')
+ 
+     # Default UI configuration
+-    bld.install_files(bld.env['CONFDIR'], 'default_ui_config')
++    bld.install_files(os.environ['EGDIR'], 'default_ui_config')
+     # Color Themes
+-    bld.install_files(bld.env['CONFDIR'], 'dark.colors')
++    bld.install_files(os.environ['EGDIR'], 'dark.colors')
+ 
+     # Default export stuff
+-    bld.install_files(os.path.join(bld.env['CONFDIR'], 'export'), bld.path.ant_glob('export/*.format'))
++    bld.install_files(os.path.join(os.environ['EGDIR'], 'export'), bld.path.ant_glob('export/*.format'))
+ 
+     # i18n
+     if bld.is_defined('ENABLE_NLS'):

diff --git a/ardour/patches/patch-wscript b/ardour/patches/patch-wscript
index 3d82fbc983454868fec25f16a8c6ef2781627db2..0e4548f1654fb77b01398d13ca729df0cda20aa5 100644 (file)
--- a/ardour/patches/patch-wscript
+++ b/ardour/patches/patch-wscript
@@ -34,3 +34,12 @@ ALSA and PortAudio are supported on NetBSD.
          sys.exit(1)
  
      set_compiler_flags (conf, Options.options)
+@@ -1241,7 +1241,7 @@ def build(bld):
+     for i in children:
+         bld.recurse(i)
+ 
+-    bld.install_files (bld.env['CONFDIR'], 'system_config')
++    bld.install_files (os.environ['EGDIR'], 'system_config')
+ 
+     if bld.env['RUN_TESTS']:
+         bld.add_post_fun(test)