From: PHO Date: Thu, 28 Jan 2010 07:58:14 +0000 (+0900) Subject: pkglint says 'looks fine' now. X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=ea81097095dc095eefafea9a3a3856ddf6330ba0;p=pkgsrc-ardour.git pkglint says 'looks fine' now. --- diff --git a/Makefile b/Makefile index 2a5f3e5..9e21f83 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,8 @@ USE_LIBTOOL= yes USE_LANGUAGES= c c++ USE_TOOLS+= pkg-config -PKG_DESTDIR_SUPPORT= user-destdir +PKG_DESTDIR_SUPPORT= user-destdir +PKG_SYSCONFSUBDIR= ${PKGBASE} SCONS_ENV= ${CONFIGURE_ENV} ${MAKE_ENV} SCONS_ARGS= PREFIX=${PREFIX:Q} @@ -51,10 +52,6 @@ CONF_FILES= \ ${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 e69de29..0f17970 100644 --- a/PLIST +++ b/PLIST @@ -0,0 +1,159 @@ +@comment $NetBSD$ +bin/ardour2 +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/examples/ardour/SAE-de-keypad.bindings +share/examples/ardour/SAE-de-nokeypad.bindings +share/examples/ardour/SAE-us-keypad.bindings +share/examples/ardour/SAE-us-nokeypad.bindings +share/examples/ardour/ardour-sae.menus +share/examples/ardour/ardour.menus +share/examples/ardour/ardour2_ui_dark.rc +share/examples/ardour/ardour2_ui_dark_sae.rc +share/examples/ardour/ardour2_ui_default.conf +share/examples/ardour/ardour2_ui_light.rc +share/examples/ardour/ardour2_ui_light_sae.rc +share/examples/ardour/ardour_system.rc +share/examples/ardour/ergonomic-us.bindings +share/examples/ardour/mnemonic-us.bindings +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 958f66a..e78f30b 100644 --- a/distinfo +++ b/distinfo @@ -10,4 +10,4 @@ SHA1 (patch-ad) = 314343c5793f9027043b41aa5932ede08c78b1c3 SHA1 (patch-ae) = 0bdfa32d4e784d8e2dccf37dea4253a90ad56328 SHA1 (patch-af) = 5a0049742142cc6628e73d96496674474f38421f SHA1 (patch-ag) = 21ca3ec11d36c02d56c6d2c2e05387f420274f0e -SHA1 (patch-ai) = 4c9b6456316268e4c6e8d7c0f40b33eb02aaaf2b +SHA1 (patch-ai) = d08bf49e8754411411de791cfc70d4467eca1046 diff --git a/patches/patch-ai b/patches/patch-ai index 383651a..1b61c62 100644 --- a/patches/patch-ai +++ b/patches/patch-ai @@ -2,12 +2,21 @@ $NetBSD$ --- SConstruct.orig 2010-01-23 17:12:22.000000000 +0000 +++ SConstruct +@@ -39,7 +39,7 @@ opts.AddOptions( + BoolOption('OLDFONTS', 'Old school font sizes', 0), + BoolOption('DEBUG', 'Set to build with debugging information and no optimizations', 0), + BoolOption('STL_DEBUG', 'Set to build with Standard Template Library Debugging', 0), +- PathOption('DESTDIR', 'Set the intermediate install "prefix"', '/'), ++ PathOption('DESTDIR', 'Set the intermediate install "prefix"', '/', PathOption.PathAccept), + EnumOption('DIST_TARGET', 'Build target for cross compiling packagers', 'auto', allowed_values=('auto', 'i386', 'i686', 'x86_64', 'powerpc', 'tiger', 'panther', 'leopard', 'none' ), ignorecase=2), + BoolOption('DMALLOC', 'Compile and link using the dmalloc library', 0), + BoolOption('EXTRA_WARN', 'Compile with -Wextra, -ansi, and -pedantic. Might break compilation. For pedants', 0), @@ -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), ++ PathOption('SYSCONFDIR', '(where to find config files)', None, PathOption.PathAccept), ++ PathOption('SYSCONFEXDIR', '(where to install example config files)', None, PathOption.PathAccept), 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)', ''),