Date: Wed, 2 Jul 2014 13:36:23 +0000 (UTC) From: "Jason E. Hale" <jhale@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360185 - in head/audio/lingot: . files Message-ID: <201407021336.s62DaNsI070566@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhale Date: Wed Jul 2 13:36:23 2014 New Revision: 360185 URL: http://svnweb.freebsd.org/changeset/ports/360185 QAT: https://qat.redports.org/buildarchive/r360185/ Log: - Support staging - Simplify MASTER_SITES - Use options helpers - Remove patch for unsupported versions of FreeBSD - Install locale data in proper location - Bump PORTREVISION PR: 189622 (based on) Submitted by: coder@tuxfamily.org (maintainer) Added: head/audio/lingot/files/patch-Makefile.in (contents, props changed) Deleted: head/audio/lingot/files/extra-lingot-config-scale.h Modified: head/audio/lingot/Makefile head/audio/lingot/pkg-plist Modified: head/audio/lingot/Makefile ============================================================================== --- head/audio/lingot/Makefile Wed Jul 2 13:34:56 2014 (r360184) +++ head/audio/lingot/Makefile Wed Jul 2 13:36:23 2014 (r360185) @@ -3,10 +3,9 @@ PORTNAME= lingot PORTVERSION= 0.9.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio -MASTER_SITES= ${MASTER_SITE_SAVANNAH} -MASTER_SITE_SUBDIR=${PORTNAME} +MASTER_SITES= SAVANNAH MAINTAINER= coder@tuxfamily.org COMMENT= LINGOT is a musical instrument tuner @@ -14,35 +13,23 @@ COMMENT= LINGOT is a musical instrument LICENSE= GPLv2 USE_GNOME= gtk20 libglade2 -NO_STAGE= yes GNU_CONFIGURE= yes USES= gettext gmake pkgconfig +CONFIGURE_ENV= DATADIRNAME="share" LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS_DEFINE= JACK ALSA +OPTIONS_DEFINE= DOCS +OPTIONS_GROUP= SOUND +OPTIONS_GROUP_SOUND= ALSA JACK OPTIONS_DEFAULT= JACK -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MJACK} -LIB_DEPENDS+= libjack.so:${PORTSDIR}/audio/jack \ - libsamplerate.so:${PORTSDIR}/audio/libsamplerate -CONFIGURE_ARGS+=--enable-jack -.else -CONFIGURE_ARGS+=--disable-jack -.endif - -.if ${PORT_OPTIONS:MALSA} -LIB_DEPENDS+= libasound.so:${PORTSDIR}/audio/alsa-lib -RUN_DEPENDS+= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins -CONFIGURE_ARGS+=--enable-alsa -.else -CONFIGURE_ARGS+=--disable-alsa -.endif - -.if ${OSVERSION} < 802502 || (${OSVERSION} > 900000 && ${OSVERSION} < 900027) -EXTRA_PATCHES+= ${FILESDIR}/extra-lingot-config-scale.h -.endif +ALSA_LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib +ALSA_RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins +ALSA_CONFIGURE_ENABLE= alsa + +JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack \ + libsamplerate.so:${PORTSDIR}/audio/libsamplerate +JACK_CONFIGURE_ENABLE= jack .include <bsd.port.mk> Added: head/audio/lingot/files/patch-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/lingot/files/patch-Makefile.in Wed Jul 2 13:36:23 2014 (r360185) @@ -0,0 +1,32 @@ +--- ./Makefile.in.orig 2011-08-22 10:10:09.000000000 -0400 ++++ ./Makefile.in 2014-06-18 23:12:35.000000000 -0400 +@@ -291,21 +291,21 @@ + lingotdocdir = ${docdir} + lingotdoc_DATA = \ + README\ +- COPYING\ + AUTHORS\ + ChangeLog\ + INSTALL\ + NEWS\ +- TODO\ + THANKS\ +- MAINTAINERS\ +- src/lingot-background.xpm\ +- src/lingot-logo.xpm\ ++ MAINTAINERS ++EXTRA_DIST = \ ++ COPYING\ ++ TODO\ + intltool-extract.in\ + intltool-merge.in\ +- intltool-update.in +- +-EXTRA_DIST = $(lingotdoc_DATA) ++ intltool-update.in\ ++ src/lingot-background.xpm\ ++ src/lingot-logo.xpm\ ++ $(lingotdoc_DATA) + CLEANFILES = \ + intltool-extract\ + intltool-merge\ Modified: head/audio/lingot/pkg-plist ============================================================================== --- head/audio/lingot/pkg-plist Wed Jul 2 13:34:56 2014 (r360184) +++ head/audio/lingot/pkg-plist Wed Jul 2 13:36:23 2014 (r360185) @@ -1,54 +1,26 @@ bin/lingot -lib/locale/ca/LC_MESSAGES/lingot.mo -lib/locale/cs/LC_MESSAGES/lingot.mo -lib/locale/de/LC_MESSAGES/lingot.mo -lib/locale/es/LC_MESSAGES/lingot.mo -lib/locale/fr/LC_MESSAGES/lingot.mo -lib/locale/gl/LC_MESSAGES/lingot.mo -lib/locale/it/LC_MESSAGES/lingot.mo -lib/locale/pt_BR/LC_MESSAGES/lingot.mo -lib/locale/sv/LC_MESSAGES/lingot.mo -lib/locale/zh_CN/LC_MESSAGES/lingot.mo share/applications/lingot.desktop -share/doc/lingot/AUTHORS -share/doc/lingot/COPYING -share/doc/lingot/ChangeLog -share/doc/lingot/INSTALL -share/doc/lingot/MAINTAINERS -share/doc/lingot/NEWS -share/doc/lingot/README -share/doc/lingot/THANKS -share/doc/lingot/TODO -share/doc/lingot/intltool-extract.in -share/doc/lingot/intltool-merge.in -share/doc/lingot/intltool-update.in -share/doc/lingot/lingot-background.xpm -share/doc/lingot/lingot-logo.xpm -share/lingot/glade/lingot-config-dialog.glade -share/lingot/glade/lingot-mainframe.glade +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/INSTALL +%%PORTDOCS%%%%DOCSDIR%%/MAINTAINERS +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/THANKS +%%DATADIR%%/glade/lingot-config-dialog.glade +%%DATADIR%%/glade/lingot-mainframe.glade +share/locale/ca/LC_MESSAGES/lingot.mo +share/locale/cs/LC_MESSAGES/lingot.mo +share/locale/de/LC_MESSAGES/lingot.mo +share/locale/es/LC_MESSAGES/lingot.mo +share/locale/fr/LC_MESSAGES/lingot.mo +share/locale/gl/LC_MESSAGES/lingot.mo +share/locale/it/LC_MESSAGES/lingot.mo +share/locale/pt_BR/LC_MESSAGES/lingot.mo +share/locale/sv/LC_MESSAGES/lingot.mo +share/locale/zh_CN/LC_MESSAGES/lingot.mo share/pixmaps/lingot/lingot-icon.svg +%%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrm %%DATADIR%%/glade +@dirrm %%DATADIR%% @dirrm share/pixmaps/lingot -@dirrm share/lingot/glade -@dirrm share/lingot -@dirrm share/doc/lingot -@dirrm lib/locale/zh_CN/LC_MESSAGES -@dirrm lib/locale/zh_CN -@dirrm lib/locale/sv/LC_MESSAGES -@dirrm lib/locale/sv -@dirrm lib/locale/pt_BR/LC_MESSAGES -@dirrm lib/locale/pt_BR -@dirrm lib/locale/it/LC_MESSAGES -@dirrm lib/locale/it -@dirrm lib/locale/gl/LC_MESSAGES -@dirrm lib/locale/gl -@dirrm lib/locale/fr/LC_MESSAGES -@dirrm lib/locale/fr -@dirrm lib/locale/es/LC_MESSAGES -@dirrm lib/locale/es -@dirrm lib/locale/de/LC_MESSAGES -@dirrm lib/locale/de -@dirrm lib/locale/cs/LC_MESSAGES -@dirrm lib/locale/cs -@dirrm lib/locale/ca/LC_MESSAGES -@dirrm lib/locale/ca -@dirrm lib/locale
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407021336.s62DaNsI070566>