From owner-svn-ports-head@freebsd.org Wed Jun 13 19:25:38 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4AD911009DCE; Wed, 13 Jun 2018 19:25:38 +0000 (UTC) (envelope-from jrm@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 99A2475B41; Wed, 13 Jun 2018 19:25:37 +0000 (UTC) (envelope-from jrm@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7A9681DC36; Wed, 13 Jun 2018 19:25:37 +0000 (UTC) (envelope-from jrm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5DJPbbb019812; Wed, 13 Jun 2018 19:25:37 GMT (envelope-from jrm@FreeBSD.org) Received: (from jrm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5DJPbXB019811; Wed, 13 Jun 2018 19:25:37 GMT (envelope-from jrm@FreeBSD.org) Message-Id: <201806131925.w5DJPbXB019811@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jrm set sender to jrm@FreeBSD.org using -f From: Joseph Mingrone Date: Wed, 13 Jun 2018 19:25:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r472340 - head/net/wpa_gui X-SVN-Group: ports-head X-SVN-Commit-Author: jrm X-SVN-Commit-Paths: head/net/wpa_gui X-SVN-Commit-Revision: 472340 X-SVN-Commit-Repository: ports 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.26 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: Wed, 13 Jun 2018 19:25:38 -0000 Author: jrm Date: Wed Jun 13 19:25:37 2018 New Revision: 472340 URL: https://svnweb.freebsd.org/changeset/ports/472340 Log: net/wpa_gui: Switch to QT5, add NLS option, cleanup PR: 217565 Submitted by: avos (in part) Modified: head/net/wpa_gui/Makefile (contents, props changed) Modified: head/net/wpa_gui/Makefile ============================================================================== --- head/net/wpa_gui/Makefile Wed Jun 13 19:08:49 2018 (r472339) +++ head/net/wpa_gui/Makefile Wed Jun 13 19:25:37 2018 (r472340) @@ -3,6 +3,7 @@ PORTNAME= wpa_gui PORTVERSION= 2.6 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://w1.fi/releases/ \ http://partmedia.users.sourceforge.net/dist/:icons \ @@ -15,47 +16,59 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Qt-based frontend for wpa_supplicant LICENSE= BSD3CLAUSE -LICENSE_FILE= ${WRKSRC}/../../COPYING +LICENSE_FILE= ${WRKSRC}/../COPYING -PATCH_WRKSRC= ${WRKDIR}/${DISTNAME} -WRKSRC_SUBDIR= wpa_supplicant/wpa_gui-qt4 +USES= gmake +USE_QT5= qmake_build buildtools_build linguisttools_build core gui \ + widgets svg_run -PLIST_FILES= "@(,,4555) sbin/wpa_gui" \ +ALL_TARGET= wpa_gui-qt4 +INSTALL_WRKSRC= ${WRKSRC}/wpa_gui-qt4 +PATCH_WRKSRC= ${WRKDIR}/${DISTNAME} +PLIST_FILES= sbin/wpa_gui \ share/applications/wpa_gui.desktop \ share/icons/hicolor/16x16/apps/wpa_gui.png \ share/icons/hicolor/scalable/apps/wpa_gui.svgz \ man/man8/wpa_gui.8.gz - +WRKSRC_SUBDIR= wpa_supplicant SUB_FILES= pkg-message SUB_LIST= LOCALBASE=${LOCALBASE} -USE_QT4= corelib gui moc_build rcc_build uic_build \ - imageformats_run -USES= qmake -INSTALLS_ICONS= yes +OPTIONS_DEFINE= DEBUG NLS -OPTIONS_DEFINE= DEBUG +NLS_PLIST_FILES= ${DATADIR_REL}/translations/wpa_gui_de.qm post-patch: @${REINPLACE_CMD} -e \ '/^Exec/s|=.*|=${PREFIX}/sbin/wpa_gui|' \ - ${WRKSRC}/wpa_gui.desktop + ${INSTALL_WRKSRC}/wpa_gui.desktop + @${REINPLACE_CMD} -e '/resourceDir = / \ + s|QLibraryInfo::location(QLibraryInfo::TranslationsPath)| \ + "${DATADIR}/translations"|' \ + ${INSTALL_WRKSRC}/main.cpp post-patch-DEBUG-on: @${REINPLACE_CMD} -e \ 's| release| debug|' \ - ${WRKSRC}/wpa_gui.pro + ${INSTALL_WRKSRC}/wpa_gui.pro do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin - ${INSTALL_DATA} ${WRKSRC}/wpa_gui.desktop ${STAGEDIR}${PREFIX}/share/applications + ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${PORTNAME} \ + ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_DATA} ${INSTALL_WRKSRC}/wpa_gui.desktop \ + ${STAGEDIR}${PREFIX}/share/applications @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/16x16/apps ${INSTALL_DATA} ${WRKDIR}/icons/hicolor/16x16/apps/wpa_gui.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/16x16/apps @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps - ${GZIP_CMD} < ${WRKSRC}/icons/wpa_gui.svg \ + ${GZIP_CMD} < ${INSTALL_WRKSRC}/icons/wpa_gui.svg \ > ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/wpa_gui.svgz - ${GZIP_CMD} < ${WRKSRC}/../doc/docbook/wpa_gui.8 \ + ${GZIP_CMD} < ${WRKSRC}/doc/docbook/wpa_gui.8 \ > ${STAGEDIR}${PREFIX}/man/man8/wpa_gui.8.gz + +do-install-NLS-on: + @${MKDIR} ${STAGEDIR}${DATADIR}/translations + ${INSTALL_DATA} ${INSTALL_WRKSRC}/lang/wpa_gui_de.qm \ + ${STAGEDIR}${DATADIR}/translations .include