From owner-svn-ports-head@freebsd.org Thu Nov 24 11:26:43 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 696F0C5383B; Thu, 24 Nov 2016 11:26:43 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1ED08102; Thu, 24 Nov 2016 11:26:43 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uAOBQgJe098001; Thu, 24 Nov 2016 11:26:42 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAOBQgt5098000; Thu, 24 Nov 2016 11:26:42 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201611241126.uAOBQgt5098000@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Thu, 24 Nov 2016 11:26:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r427006 - head/audio/dream 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.23 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: Thu, 24 Nov 2016 11:26:43 -0000 Author: tcberner Date: Thu Nov 24 11:26:42 2016 New Revision: 427006 URL: https://svnweb.freebsd.org/changeset/ports/427006 Log: Simplify the Makefile by switching to USES=qmake. * This allows us to get rid of both manually specified targets. * As no PLIST_SUBS are used, also OPTIONS_SUB can be dropped. * Further, do not use QT_BINDIR and install the manpage to man/ intead of share/man. PR: 214621 Approved by: rakuco (mentor), takefu (maintainer) Modified: head/audio/dream/Makefile Modified: head/audio/dream/Makefile ============================================================================== --- head/audio/dream/Makefile Thu Nov 24 11:22:44 2016 (r427005) +++ head/audio/dream/Makefile Thu Nov 24 11:26:42 2016 (r427006) @@ -2,6 +2,7 @@ PORTNAME= dream PORTVERSION= 2.1.1 +PORTREVISION= 1 CATEGORIES= audio comms hamradio MASTER_SITES= SF/drm/${PORTNAME}/${PORTVERSION} DISTNAME= ${PORTNAME}-${PORTVERSION}-svn808 @@ -15,16 +16,14 @@ LIB_DEPENDS= libhamlib.so:comms/hamlib\ libqwt.so:x11-toolkits/qwt5\ libfftw3.so:math/fftw3 +USES= gmake pkgconfig qmake USE_QT4= qmake_build moc_build uic_build corelib gui network rcc webkit -QT4_MAKE_ARGS= INSTALL_ROOT=${STAGEDIR} -USES= gmake pkgconfig WRKSRC= ${WRKDIR}/${PORTNAME} OPTIONS_DEFINE= SNDFILE OGG VORBIS FLAC OPUS SPEEX FAAD FAAC OPTIONS_RADIO= DEVICE OPTIONS_RADIO_DEVICE= PORTAUDIO PULSEAUDIO OPTIONS_DEFAULT= PORTAUDIO SNDFILE -OPTIONS_SUB= yes PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio @@ -38,22 +37,12 @@ SPEEX_LIB_DEPENDS= libspeexdsp.so:audio/ FAAD_LIB_DEPENDS= libfaad.so:audio/faad FAAC_LIB_DEPENDS= libfaac.so:audio/faac -MANDIRS= ${PREFIX}/share/man/man1 -PLIST_FILES= %%QT_BINDIR%%/dream share/man/man1/dream.1.gz +PLIST_FILES= bin/dream man/man1/dream.1.gz pre-patch: @${REINPLACE_CMD} -e 's|/opt|/usr|g' -e 's|/usr/local|${PREFIX}|g'\ - -e 's|target.path = /usr/bin|target.path = ${STAGEDIR}${QT_BINDIR}|g'\ - -e 's|/usr/share/man/man1|${STAGEDIR}${PREFIX}/share/man/man1|g'\ - -e 's|INSTALLS += documentation||g'\ + -e 's|target.path = /usr/bin|target.path = ${PREFIX}/bin|g'\ + -e 's|/usr/share/man/man1|${PREFIX}/man/man1|g'\ ${WRKSRC}/dream.pro -do-configure: - cd ${WRKSRC} &&\ - ${SETENV} ${MAKE_ENV} ${QMAKE} dream.pro ${QMAKE_ARGS} - -post-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/share/man/man1 - ${INSTALL_MAN} ${WRKSRC}/linux/dream.1 ${STAGEDIR}${PREFIX}/share/man/man1/ - .include