From owner-svn-ports-head@freebsd.org Tue Sep 27 18:25:36 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 3EC83BEC802; Tue, 27 Sep 2016 18:25:36 +0000 (UTC) (envelope-from jbeich@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 1CBE9EFF; Tue, 27 Sep 2016 18:25:36 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8RIPZe0031858; Tue, 27 Sep 2016 18:25:35 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8RIPYMZ031853; Tue, 27 Sep 2016 18:25:34 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201609271825.u8RIPYMZ031853@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 27 Sep 2016 18:25:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r422825 - in head: . emulators emulators/ppsspp emulators/ppsspp-qt4 emulators/ppsspp-qt5 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: Tue, 27 Sep 2016 18:25:36 -0000 Author: jbeich Date: Tue Sep 27 18:25:34 2016 New Revision: 422825 URL: https://svnweb.freebsd.org/changeset/ports/422825 Log: emulators/ppsspp: enslave GUI options Catering package-only users that want Qt4 flavor or just SDL UI. COMMENT and pkg-descr (both plural) can be improved in future. Added: head/emulators/ppsspp-qt4/ head/emulators/ppsspp-qt4/Makefile (contents, props changed) head/emulators/ppsspp-qt5/ head/emulators/ppsspp-qt5/Makefile (contents, props changed) Modified: head/UPDATING head/emulators/Makefile (contents, props changed) head/emulators/ppsspp/Makefile (contents, props changed) Modified: head/UPDATING ============================================================================== --- head/UPDATING Tue Sep 27 18:25:17 2016 (r422824) +++ head/UPDATING Tue Sep 27 18:25:34 2016 (r422825) @@ -6,6 +6,15 @@ You should get into the habit of checkin you update your ports collection, before attempting any port upgrades. 20160927: + AFFECTS: emulators/ppsspp + AUTHOR: jbeich@FreeBSD.org + + Qt* GUI was split into separate ports: + + emulators/ppsspp-qt4 + emulators/ppsspp-qt5 + +20160927: AFFECTS: sysutils/android-file-transfer AUTHOR: jbeich@FreeBSD.org Modified: head/emulators/Makefile ============================================================================== --- head/emulators/Makefile Tue Sep 27 18:25:17 2016 (r422824) +++ head/emulators/Makefile Tue Sep 27 18:25:34 2016 (r422825) @@ -109,6 +109,8 @@ SUBDIR += pipelight SUBDIR += playonbsd SUBDIR += ppsspp + SUBDIR += ppsspp-qt4 + SUBDIR += ppsspp-qt5 SUBDIR += py-gns3-converter SUBDIR += q4wine SUBDIR += qemu Added: head/emulators/ppsspp-qt4/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/ppsspp-qt4/Makefile Tue Sep 27 18:25:34 2016 (r422825) @@ -0,0 +1,14 @@ +# $FreeBSD$ + +PORTREVISION= 0 +PKGNAMESUFFIX= -qt4 + +MASTERDIR= ${.CURDIR}/../ppsspp + +OPTIONS_SLAVE= QT4 +OPTIONS_EXCLUDE=${OPTIONS_SINGLE_GUI} + +# XXX Why OPTIONS_EXCLUDE doesn't trigger _OFF helpers? +do-install-QT4-on: do-install-SDL-off + +.include "${MASTERDIR}/Makefile" Added: head/emulators/ppsspp-qt5/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/ppsspp-qt5/Makefile Tue Sep 27 18:25:34 2016 (r422825) @@ -0,0 +1,14 @@ +# $FreeBSD$ + +PORTREVISION= 0 +PKGNAMESUFFIX= -qt5 + +MASTERDIR= ${.CURDIR}/../ppsspp + +OPTIONS_SLAVE= QT5 +OPTIONS_EXCLUDE=${OPTIONS_SINGLE_GUI} + +# XXX Why OPTIONS_EXCLUDE doesn't trigger _OFF helpers? +do-install-QT5-on: do-install-SDL-off + +.include "${MASTERDIR}/Makefile" Modified: head/emulators/ppsspp/Makefile ============================================================================== --- head/emulators/ppsspp/Makefile Tue Sep 27 18:25:17 2016 (r422824) +++ head/emulators/ppsspp/Makefile Tue Sep 27 18:25:34 2016 (r422825) @@ -3,7 +3,7 @@ PORTNAME= ppsspp DISTVERSIONPREFIX= v DISTVERSION?= 1.3 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= emulators # XXX Get from Debian once #697821 lands MASTER_SITES= https://bazaar.launchpad.net/~sergio-br2/${PORTNAME}/debian-sdl/download/5/${PORTNAME}.1-20140802045408-dd26dik367ztj5xg-8/:manpage @@ -25,7 +25,7 @@ GH_ACCOUNT= hrydgard:DEFAULT,lang Kingco GH_PROJECT= ${PORTNAME}-lang:lang armips:ext_armips GH_TAGNAME?= cdf4a8d:lang 1ffab37:ext_armips -CONFLICTS_INSTALL?= ${PORTNAME}-devel-[0-9]* +CONFLICTS_INSTALL= ${PORTNAME}-* USES= compiler:c++11-lib localbase pkgconfig EXCLUDE= glew snappy libzip zlib @@ -47,6 +47,7 @@ DESKTOP_ENTRIES="PPSSPP" \ OPTIONS_DEFAULT=QT5 OPTIONS_SINGLE= GUI OPTIONS_SINGLE_GUI= QT4 QT5 SDL +OPTIONS_SLAVE?= SDL QT4_USES= qmake:outsource QT4_USE= QT4=qmake_build,moc_build,rcc_build,uic_build,linguisttools_build,gui,opengl