From owner-svn-ports-head@FreeBSD.ORG Sat May 4 19:16:37 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id CEAAEA0E; Sat, 4 May 2013 19:16:37 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id C0BE9B41; Sat, 4 May 2013 19:16:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r44JGbpk006176; Sat, 4 May 2013 19:16:37 GMT (envelope-from cy@svn.freebsd.org) Received: (from cy@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r44JGbjL006169; Sat, 4 May 2013 19:16:37 GMT (envelope-from cy@svn.freebsd.org) Message-Id: <201305041916.r44JGbjL006169@svn.freebsd.org> From: Cy Schubert Date: Sat, 4 May 2013 19:16:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317333 - in head/audio/hydrogen: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 May 2013 19:16:37 -0000 Author: cy Date: Sat May 4 19:16:36 2013 New Revision: 317333 URL: http://svnweb.freebsd.org/changeset/ports/317333 Log: Update 0.9.5 --> 0.9.5.1. Unbreak build. Assign Shane Ambler as new maintainer. PR: 177806 Submitted by: Shane Ambler Approved by: Maintainer (devel@stasyan.com) Modified: head/audio/hydrogen/Makefile head/audio/hydrogen/distinfo head/audio/hydrogen/files/patch-Sconstruct head/audio/hydrogen/pkg-plist Modified: head/audio/hydrogen/Makefile ============================================================================== --- head/audio/hydrogen/Makefile Sat May 4 18:27:34 2013 (r317332) +++ head/audio/hydrogen/Makefile Sat May 4 19:16:36 2013 (r317333) @@ -2,11 +2,11 @@ # $FreeBSD$ PORTNAME= hydrogen -PORTVERSION= 0.9.5 +PORTVERSION= 0.9.5.1 CATEGORIES= audio MASTER_SITES= SF/${PORTNAME}/Hydrogen/${MAJORVERSION}%20Sources -MAINTAINER= devel@stasyan.com +MAINTAINER= FreeBSD@ShaneWare.Biz COMMENT= An advanced drum machine LICENSE= GPLv2 @@ -16,10 +16,6 @@ LIB_DEPENDS+= sndfile:${PORTSDIR}/audio/ tar:${PORTSDIR}/devel/libtar \ lrdf:${PORTSDIR}/textproc/liblrdf -DEPRECATED= Broken for more than 6 month -EXPIRATION_DATE= 2013-03-05 -BROKEN= does not install - MAJORVERSION= 0.9.5 USE_QT4= corelib gui linguist_build moc_build network qt3support rcc_build sql uic_build xml USE_SCONS= yes @@ -30,7 +26,7 @@ OPTIONS_DEFAULT= JACK LIBARCHIVE_DESC= LibArchive support post-patch: - ${REINPLACE_CMD} -e "s|includes = \[\]|includes = \['-I${QT_INCDIR}/QtCore', '-I${QT_INCDIR}/QtXml', '-I${QT_INCDIR}/QtGui', '-I${QT_INCDIR}', '-I${QT_INCDIR}/Qt', '-I${LOCALBASE}/include'\]|g; s|ldflags = \[\]|ldflags = \['-L${QT_LIBDIR}','-L${LOCALBASE}/lib'\,'-lQtCore', '-lQtGui', '-lQtXml', '-lQtNetwork', '${PTHREAD_LIBS}']|g" ${WRKSRC}/Sconstruct + ${REINPLACE_CMD} -e "s|includes = \[\]|includes = \['-I${QT_INCDIR}/QtCore', '-I${QT_INCDIR}/QtXml', '-I${QT_INCDIR}/QtGui', '-I${QT_INCDIR}', '-I${QT_INCDIR}/Qt', '-I${LOCALBASE}/include', '-I${LOCALBASE}/include/raptor2'\]|g; s|ldflags = \[\]|ldflags = \['-L${QT_LIBDIR}','-L${LOCALBASE}/lib'\,'-lQtCore', '-lQtGui', '-lQtXml', '-lQtNetwork', '${PTHREAD_LIBS}']|g" ${WRKSRC}/Sconstruct .include Modified: head/audio/hydrogen/distinfo ============================================================================== --- head/audio/hydrogen/distinfo Sat May 4 18:27:34 2013 (r317332) +++ head/audio/hydrogen/distinfo Sat May 4 19:16:36 2013 (r317333) @@ -1,2 +1,2 @@ -SHA256 (hydrogen-0.9.5.tar.gz) = 963c73ef911ec9e7589e502d17df3b794dd027d7e99a36b5115a0bb51389d9c3 -SIZE (hydrogen-0.9.5.tar.gz) = 5239702 +SHA256 (hydrogen-0.9.5.1.tar.gz) = ebe105fec9ce8e2129f9e1bb5bfe675f1c7143a80babda40620cb3ef9eb97ebb +SIZE (hydrogen-0.9.5.1.tar.gz) = 5515314 Modified: head/audio/hydrogen/files/patch-Sconstruct ============================================================================== --- head/audio/hydrogen/files/patch-Sconstruct Sat May 4 18:27:34 2013 (r317332) +++ head/audio/hydrogen/files/patch-Sconstruct Sat May 4 19:16:36 2013 (r317333) @@ -1,26 +1,49 @@ ---- Sconstruct.orig 2011-03-15 18:22:35.000000000 +0600 -+++ Sconstruct 2011-03-22 16:06:25.000000000 +0600 +--- Sconstruct.orig 2012-02-20 08:24:05.000000000 +1030 ++++ Sconstruct 2013-04-12 16:49:47.220965697 +0930 @@ -47,7 +47,7 @@ env = Environment( options = opts ) -- if sys.platform == "linux2" or sys.platform == "darwin": -+ if sys.platform == "linux2" or sys.platform == "darwin" or sys.platform > "freebsd": +- if sys.platform == "linux2" or sys.platform == "linux3" or sys.platform == "darwin": ++ if sys.platform == "linux2" or sys.platform == "linux3" or sys.platform == "darwin" or sys.platform > "freebsd": if str(env['debug']) == "1": cppflags += ['-Wall', '-g2', '-ggdb', '-O0'] for flag in env["optflags"].split(" "): -@@ -91,11 +91,12 @@ +@@ -91,11 +91,13 @@ includes.append( '/opt/local/include' ) includes.append( '/usr/local/include/jack' ) -- elif sys.platform == 'linux2': +- elif sys.platform == 'linux2' or sys.platform == 'linux3': + elif str(env['alsa']) == "1" and sys.platform > 'freebsd' : ldflags.append('-lpthread') ldflags.append('-lasound') # ldflags.append('-lrubberband') -- + + elif sys.platform > 'freebsd' : + print "Alsa disabled; nothing to do" elif sys.platform == "win32": includes.append( '3rdparty\libsndfile-1_0_17' ) includes.append( 'build\pthreads\include' ) +@@ -299,7 +301,7 @@ + + for N in glob.glob('./data/i18n/hydrogen.*'): + env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data/i18n', source=N)) +- env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data', source="./data/img")) ++ env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen', source="./data")) + + #add every img in ./data/img to the install list. + os.path.walk("./data/img/",install_images,env) +@@ -450,9 +452,9 @@ + Exit(1) + + #lrdf: categorizing of ladspa effects +-if str(env['lrdf']) == "1" and not conf.CheckCHeader('lrdf.h'): +- print 'lrdf must be installed!' +- Exit(1) ++#if str(env['lrdf']) == "1" and not conf.CheckCHeader('lrdf.h'): ++# print 'lrdf must be installed!' ++# Exit(1) + + + print "" + Modified: head/audio/hydrogen/pkg-plist ============================================================================== --- head/audio/hydrogen/pkg-plist Sat May 4 18:27:34 2013 (r317332) +++ head/audio/hydrogen/pkg-plist Sat May 4 19:16:36 2013 (r317333) @@ -211,6 +211,9 @@ share/applications/hydrogen.desktop %%DATADIR%%/data/doc/tutorial.docbook %%DATADIR%%/data/doc/tutorial.pot %%DATADIR%%/data/doc/tutorial_en.html +%%DATADIR%%/data/doc/tutorial_es.docbook +%%DATADIR%%/data/doc/tutorial_es.html +%%DATADIR%%/data/doc/tutorial_es.po %%DATADIR%%/data/doc/tutorial_fr.html %%DATADIR%%/data/doc/tutorial_fr.po %%DATADIR%%/data/doc/tutorial_it.html @@ -258,6 +261,8 @@ share/applications/hydrogen.desktop %%DATADIR%%/data/i18n/hydrogen.cs.ts %%DATADIR%%/data/i18n/hydrogen.de.qm %%DATADIR%%/data/i18n/hydrogen.de.ts +%%DATADIR%%/data/i18n/hydrogen.el.qm +%%DATADIR%%/data/i18n/hydrogen.el.ts %%DATADIR%%/data/i18n/hydrogen.es.qm %%DATADIR%%/data/i18n/hydrogen.es.ts %%DATADIR%%/data/i18n/hydrogen.fr.qm