From d92e5b4359101afcee691131fb688287c21b1f0f Mon Sep 17 00:00:00 2001 From: PHO Date: Thu, 28 Jan 2010 15:17:37 +0900 Subject: [PATCH] patches for configuration files... hope this works... --- Makefile | 20 ++++++ PLIST | 159 ----------------------------------------------- distinfo | 5 +- patches/patch-af | 33 ++++++++++ patches/patch-ag | 10 +-- patches/patch-ai | 48 ++++++++++++++ 6 files changed, 109 insertions(+), 166 deletions(-) create mode 100644 patches/patch-ai diff --git a/Makefile b/Makefile index 6298399..2a5f3e5 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,27 @@ SCONS_ARGS= PREFIX=${PREFIX:Q} SCONS_ARGS+= DESTDIR=${DESTDIR:Q} .endif +EXAMPLES_DIR= ${PREFIX}/share/examples/${PKGBASE} +SCONS_ARGS+= SYSCONFDIR=${PKG_SYSCONFDIR:Q} +SCONS_ARGS+= SYSCONFEXDIR=${EXAMPLES_DIR:Q} +CONF_FILES= \ + ${EXAMPLES_DIR}/SAE-de-keypad.bindings ${PKG_SYSCONFDIR}/SAE-de-keypad.bindings \ + ${EXAMPLES_DIR}/SAE-de-nokeypad.bindings ${PKG_SYSCONFDIR}/SAE-de-nokeypad.bindings \ + ${EXAMPLES_DIR}/SAE-us-keypad.bindings ${PKG_SYSCONFDIR}/SAE-us-keypad.bindings \ + ${EXAMPLES_DIR}/SAE-us-nokeypad.bindings ${PKG_SYSCONFDIR}/SAE-us-nokeypad.bindings \ + ${EXAMPLES_DIR}/ardour-sae.menus ${PKG_SYSCONFDIR}/ardour-sae.menus \ + ${EXAMPLES_DIR}/ardour.menus ${PKG_SYSCONFDIR}/ardour.menus \ + ${EXAMPLES_DIR}/ardour2_ui_dark.rc ${PKG_SYSCONFDIR}/ardour2_ui_dark.rc \ + ${EXAMPLES_DIR}/ardour2_ui_dark_sae.rc ${PKG_SYSCONFDIR}/ardour2_ui_dark_sae.rc \ + ${EXAMPLES_DIR}/ardour2_ui_default.conf ${PKG_SYSCONFDIR}/ardour2_ui_default.conf \ + ${EXAMPLES_DIR}/ardour2_ui_light.rc ${PKG_SYSCONFDIR}/ardour2_ui_light.rc \ + ${EXAMPLES_DIR}/ardour2_ui_light_sae.rc ${PKG_SYSCONFDIR}/ardour2_ui_light_sae.rc + do-build: +.if defined(DESTDIR) +# Scons complains about nonexistent paths. + ${RUN} ${MKDIR} ${DESTDIR:Q} +.endif ${RUN} cd ${WRKSRC} && \ ${SETENV} ${SCONS_ENV} scons ${SCONS_ARGS} diff --git a/PLIST b/PLIST index 3f2e65c..e69de29 100644 --- a/PLIST +++ b/PLIST @@ -1,159 +0,0 @@ -@comment $NetBSD$ -bin/ardour2 -etc/ardour2/SAE-de-keypad.bindings -etc/ardour2/SAE-de-nokeypad.bindings -etc/ardour2/SAE-us-keypad.bindings -etc/ardour2/SAE-us-nokeypad.bindings -etc/ardour2/ardour-sae.menus -etc/ardour2/ardour.menus -etc/ardour2/ardour2_ui_dark.rc -etc/ardour2/ardour2_ui_dark_sae.rc -etc/ardour2/ardour2_ui_default.conf -etc/ardour2/ardour2_ui_light.rc -etc/ardour2/ardour2_ui_light_sae.rc -etc/ardour2/ardour_system.rc -etc/ardour2/ergonomic-us.bindings -etc/ardour2/mnemonic-us.bindings -lib/ardour2/${PKGNAME} -lib/ardour2/engines/libclearlooks.so -lib/ardour2/libardour.so -lib/ardour2/libardour_cp.so -lib/ardour2/libatkmm.so -lib/ardour2/libgdkmm2.so -lib/ardour2/libglibmm2.so -lib/ardour2/libgnomecanvasmm.so -lib/ardour2/libgtkmm2.so -lib/ardour2/libgtkmm2ext.so -lib/ardour2/libmidi++.so -lib/ardour2/libpangomm.so -lib/ardour2/libpbd.so -lib/ardour2/librubberband.so -lib/ardour2/libsigc++2.so -lib/ardour2/libsoundtouch.so -lib/ardour2/libvamphostsdk.so -lib/ardour2/libvampsdk.so -lib/ardour2/surfaces/libardour_genericmidi.so -lib/ardour2/surfaces/libardour_mackie.so -lib/ardour2/vamp/libardourvampplugins.so -share/ardour2/icons/application-x-ardour_16px.png -share/ardour2/icons/application-x-ardour_22px.png -share/ardour2/icons/application-x-ardour_32px.png -share/ardour2/icons/application-x-ardour_48px.png -share/ardour2/icons/ardour_icon_16px.png -share/ardour2/icons/ardour_icon_22px.png -share/ardour2/icons/ardour_icon_32px.png -share/ardour2/icons/ardour_icon_48px.png -share/ardour2/icons/computer_keyboard.png -share/ardour2/icons/computer_keyboard_active.png -share/ardour2/icons/crossfade-in-S1.png -share/ardour2/icons/crossfade-in-S2.png -share/ardour2/icons/crossfade-in-constant-power.png -share/ardour2/icons/crossfade-in-fast-cut.png -share/ardour2/icons/crossfade-in-linear.png -share/ardour2/icons/crossfade-in-long-cut.png -share/ardour2/icons/crossfade-in-short-cut.png -share/ardour2/icons/crossfade-in-slow-cut.png -share/ardour2/icons/crossfade-out-S1.png -share/ardour2/icons/crossfade-out-S2.png -share/ardour2/icons/crossfade-out-constant-power.png -share/ardour2/icons/crossfade-out-fast-cut.png -share/ardour2/icons/crossfade-out-linear.png -share/ardour2/icons/crossfade-out-long-cut.png -share/ardour2/icons/crossfade-out-short-cut.png -share/ardour2/icons/crossfade-out-slow-cut.png -share/ardour2/icons/fader_belt.png -share/ardour2/icons/fader_belt_h.png -share/ardour2/icons/ferret_02.png -share/ardour2/icons/grabber_edit_point.png -share/ardour2/icons/hide.png -share/ardour2/icons/nudge_left.png -share/ardour2/icons/nudge_right.png -share/ardour2/icons/record_normal_red.png -share/ardour2/icons/record_tape_red.png -share/ardour2/icons/sae.png -share/ardour2/icons/saelogo.png -share/ardour2/icons/strip_width.png -share/ardour2/icons/tool_audition.png -share/ardour2/icons/tool_gain.png -share/ardour2/icons/tool_object.png -share/ardour2/icons/tool_stretch.png -share/ardour2/icons/tool_zoom.png -share/ardour2/icons/transport_end.png -share/ardour2/icons/transport_loop.png -share/ardour2/icons/transport_play.png -share/ardour2/icons/transport_range.png -share/ardour2/icons/transport_record.png -share/ardour2/icons/transport_start.png -share/ardour2/icons/transport_stop.png -share/ardour2/icons/zoom_full.png -share/ardour2/icons/zoom_in.png -share/ardour2/icons/zoom_out.png -share/ardour2/pixmaps/forwardblarrow.xpm -share/ardour2/pixmaps/hiin.xpm -share/ardour2/pixmaps/hiout.xpm -share/ardour2/pixmaps/hslider00.xpm -share/ardour2/pixmaps/hslider01.xpm -share/ardour2/pixmaps/left_arrow.xpm -share/ardour2/pixmaps/linin.xpm -share/ardour2/pixmaps/linout.xpm -share/ardour2/pixmaps/loin.xpm -share/ardour2/pixmaps/loop.xpm -share/ardour2/pixmaps/loout.xpm -share/ardour2/pixmaps/lr.xpm -share/ardour2/pixmaps/regin.xpm -share/ardour2/pixmaps/regin2.xpm -share/ardour2/pixmaps/regout.xpm -share/ardour2/pixmaps/regout2.xpm -share/ardour2/pixmaps/revdblarrow.xpm -share/ardour2/pixmaps/right_arrow.xpm -share/ardour2/pixmaps/set-next-button.xpm -share/ardour2/pixmaps/small-round-button-01.xpm -share/ardour2/pixmaps/small_x.xpm -share/ardour2/pixmaps/toggle-button-00.xpm -share/ardour2/pixmaps/toggle-button-01.xpm -share/ardour2/pixmaps/tool_audition.xpm -share/ardour2/pixmaps/tool_gain.xpm -share/ardour2/pixmaps/tool_object.xpm -share/ardour2/pixmaps/tool_range.xpm -share/ardour2/pixmaps/tool_stretch.xpm -share/ardour2/pixmaps/tool_zoom.xpm -share/ardour2/pixmaps/vslider00.xpm -share/ardour2/pixmaps/vslider01.xpm -share/ardour2/pixmaps/vslider02_rail.xpm -share/ardour2/pixmaps/vslider02_slider.xpm -share/ardour2/pixmaps/vslider_slider_16wide.xpm -share/ardour2/pixmaps/zoom_full.xpm -share/ardour2/pixmaps/zoom_in.xpm -share/ardour2/pixmaps/zoom_out.xpm -share/ardour2/splash.png -share/ardour2/templates/16 Tracks.template -share/ardour2/templates/2 Track.template -share/ardour2/templates/32 Tracks.template -share/ardour2/templates/4 Tracks.template -share/ardour2/templates/8 Tracks.template -share/locale/cs/LC_MESSAGES/gtk2_ardour.mo -share/locale/de/LC_MESSAGES/gtk2_ardour.mo -share/locale/el/LC_MESSAGES/gtk2_ardour.mo -share/locale/el/LC_MESSAGES/libardour2.mo -share/locale/el/LC_MESSAGES/libgtkmm2ext.mo -share/locale/es/LC_MESSAGES/gtk2_ardour.mo -share/locale/es/LC_MESSAGES/libardour2.mo -share/locale/es/LC_MESSAGES/libgtkmm2ext.mo -share/locale/fr/LC_MESSAGES/gtk2_ardour.mo -share/locale/fr/LC_MESSAGES/libardour2.mo -share/locale/it/LC_MESSAGES/gtk2_ardour.mo -share/locale/it/LC_MESSAGES/libardour2.mo -share/locale/nn/LC_MESSAGES/gtk2_ardour.mo -share/locale/nn/LC_MESSAGES/libardour2.mo -share/locale/nn/LC_MESSAGES/libgtkmm2ext.mo -share/locale/pl/LC_MESSAGES/gtk2_ardour.mo -share/locale/pl/LC_MESSAGES/libardour2.mo -share/locale/pl/LC_MESSAGES/libgtkmm2ext.mo -share/locale/pt/LC_MESSAGES/gtk2_ardour.mo -share/locale/pt/LC_MESSAGES/libgtkmm2ext.mo -share/locale/pt_PT/LC_MESSAGES/gtk2_ardour.mo -share/locale/ru/LC_MESSAGES/gtk2_ardour.mo -share/locale/ru/LC_MESSAGES/libardour2.mo -share/locale/ru/LC_MESSAGES/libgtkmm2ext.mo -share/locale/sv/LC_MESSAGES/gtk2_ardour.mo -share/locale/sv/LC_MESSAGES/libardour2.mo diff --git a/distinfo b/distinfo index 3ec4174..958f66a 100644 --- a/distinfo +++ b/distinfo @@ -8,5 +8,6 @@ SHA1 (patch-ab) = 8c1a5bb95193cd6b817655c23046af8eb3fe4260 SHA1 (patch-ac) = 68dcaeef86736dd16dce6b1d43a6c4a08c72a2d8 SHA1 (patch-ad) = 314343c5793f9027043b41aa5932ede08c78b1c3 SHA1 (patch-ae) = 0bdfa32d4e784d8e2dccf37dea4253a90ad56328 -SHA1 (patch-af) = 60bed00e967648d36827984edae9b99a34e775d5 -SHA1 (patch-ag) = d429d5a4e26afd0ec01363e3c42477144cb1a010 +SHA1 (patch-af) = 5a0049742142cc6628e73d96496674474f38421f +SHA1 (patch-ag) = 21ca3ec11d36c02d56c6d2c2e05387f420274f0e +SHA1 (patch-ai) = 4c9b6456316268e4c6e8d7c0f40b33eb02aaaf2b diff --git a/patches/patch-af b/patches/patch-af index df88133..395dbbb 100644 --- a/patches/patch-af +++ b/patches/patch-af @@ -20,3 +20,36 @@ $NetBSD$ if gtkardour['RUBBERBAND']: gtkardour.Merge ([ libraries['rubberband'] ]) else: +@@ -490,19 +494,19 @@ if env['NLS']: + i18n (gtkardour, gtkardour_files+skipped_files+fft_analysis_files, env) + + # configuration files +-env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), ardour_dark_theme)) +-env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), ardour_light_theme)) +-env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), ardour_dark_sae_theme)) +-env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), ardour_light_sae_theme)) +-env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour2_ui_default.conf')) +-env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour.menus')) +-env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour-sae.menus')) +-env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ergonomic-us.bindings')) +-env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'mnemonic-us.bindings')) +-env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'SAE-de-keypad.bindings')) +-env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'SAE-us-keypad.bindings')) +-env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'SAE-de-nokeypad.bindings')) +-env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'SAE-us-nokeypad.bindings')) ++env.Alias('install', env.Install(config_prefix, ardour_dark_theme)) ++env.Alias('install', env.Install(config_prefix, ardour_light_theme)) ++env.Alias('install', env.Install(config_prefix, ardour_dark_sae_theme)) ++env.Alias('install', env.Install(config_prefix, ardour_light_sae_theme)) ++env.Alias('install', env.Install(config_prefix, 'ardour2_ui_default.conf')) ++env.Alias('install', env.Install(config_prefix, 'ardour.menus')) ++env.Alias('install', env.Install(config_prefix, 'ardour-sae.menus')) ++env.Alias('install', env.Install(config_prefix, 'ergonomic-us.bindings')) ++env.Alias('install', env.Install(config_prefix, 'mnemonic-us.bindings')) ++env.Alias('install', env.Install(config_prefix, 'SAE-de-keypad.bindings')) ++env.Alias('install', env.Install(config_prefix, 'SAE-us-keypad.bindings')) ++env.Alias('install', env.Install(config_prefix, 'SAE-de-nokeypad.bindings')) ++env.Alias('install', env.Install(config_prefix, 'SAE-us-nokeypad.bindings')) + # data files + env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour2'), 'splash.png')) + env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour2', 'pixmaps'), pixmap_files)) diff --git a/patches/patch-ag b/patches/patch-ag index b69bdba..358f8a1 100644 --- a/patches/patch-ag +++ b/patches/patch-ag @@ -1,19 +1,19 @@ $NetBSD$ ---- gtk2_ardour/nn.po.orig 2010-01-27 10:04:23.000000000 +0000 -+++ gtk2_ardour/nn.po +--- gtk2_ardour/po/nn.po.orig 2010-01-28 06:04:15.000000000 +0000 ++++ gtk2_ardour/po/nn.po @@ -5,12 +5,12 @@ # msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -+"Project-Id-Version: ardour-gtk\n" ++"Project-Id-Version: nn_NO\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2010-01-27 18:57+0900\n" + "POT-Creation-Date: 2009-12-24 15:13+0100\n" "PO-Revision-Date: 2010-01-17 21:11+0100\n" "Last-Translator: Eivind Ødegård \n" -"Language-Team: LANGUAGE \n" -+"Language-Team: \n" ++"Language-Team: Nynorsk \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/patches/patch-ai b/patches/patch-ai new file mode 100644 index 0000000..383651a --- /dev/null +++ b/patches/patch-ai @@ -0,0 +1,48 @@ +$NetBSD$ + +--- SConstruct.orig 2010-01-23 17:12:22.000000000 +0000 ++++ SConstruct +@@ -49,6 +49,8 @@ opts.AddOptions( + BoolOption('LIBLO', 'Compile with support for liblo library', 1), + BoolOption('NLS', 'Set to turn on i18n support', 1), + PathOption('PREFIX', 'Set the install "prefix"', '/usr/local'), ++ PathOption('SYSCONFDIR', '(where to find config files)', None), ++ PathOption('SYSCONFEXDIR', '(where to install example config files)', None), + BoolOption('SURFACES', 'Build support for control surfaces', 1), + BoolOption('WIIMOTE', 'Build the wiimote control surface', 0), + ('DIST_LIBDIR', 'Explicitly set library dir. If not set, Fedora-style defaults are used (typically lib or lib64)', ''), +@@ -1240,12 +1242,21 @@ subst_dict['%INSTALL_PREFIX%'] = install + subst_dict['%FINAL_PREFIX%'] = final_prefix; + subst_dict['%PREFIX%'] = final_prefix; + +-if env['PREFIX'] == '/usr': +- final_config_prefix = '/etc' ++if env['SYSCONFDIR']: ++ final_config_prefix = env['SYSCONFDIR'] + else: +- final_config_prefix = env['PREFIX'] + '/etc' ++ final_config_prefix = env['PREFIX'] + '/etc/ardour2' + +-config_prefix = '$DESTDIR' + final_config_prefix ++if env['SYSCONFEXDIR']: ++ if env['DESTDIR']: ++ config_prefix = '$DESTDIR' + env['SYSCONFEXDIR'] ++ else: ++ config_prefix = env['SYSCONFEXDIR'] ++else: ++ if env['DESTDIR']: ++ config_prefix = '$DESTDIR' + env['PREFIX'] + '/share/examples/ardour' ++ else: ++ config_prefix = env['PREFIX'] + '/share/examples/ardour' + + # + # everybody needs this +@@ -1349,7 +1360,7 @@ remove_ardour = env.Command ('frobnicato + Delete ('$PREFIX/share/ardour2')]) + + env.Alias('revision', the_revision) +-env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour_system.rc')) ++env.Alias('install', env.Install(config_prefix, 'ardour_system.rc')) + env.Alias('uninstall', remove_ardour) + + Default (sysrcbuild) -- 2.40.0