From owner-svn-ports-head@FreeBSD.ORG Thu Feb 6 17:36:39 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5FDA148C; Thu, 6 Feb 2014 17:36:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3166810A1; Thu, 6 Feb 2014 17:36:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s16HadHG043606; Thu, 6 Feb 2014 17:36:39 GMT (envelope-from swills@svn.freebsd.org) Received: (from swills@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s16Hadub043605; Thu, 6 Feb 2014 17:36:39 GMT (envelope-from swills@svn.freebsd.org) Message-Id: <201402061736.s16Hadub043605@svn.freebsd.org> From: Steve Wills Date: Thu, 6 Feb 2014 17:36:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r343127 - head/net-p2p/litecoin 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.17 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, 06 Feb 2014 17:36:39 -0000 Author: swills Date: Thu Feb 6 17:36:38 2014 New Revision: 343127 URL: http://svnweb.freebsd.org/changeset/ports/343127 QAT: https://qat.redports.org/buildarchive/r343127/ Log: - Use more correct OSVERSION check [1] - Remove WITHOUT_X11 and use standard X11 option PR: ports/186137 [1] Reported by: Waitman Gobble [1] Modified: head/net-p2p/litecoin/Makefile Modified: head/net-p2p/litecoin/Makefile ============================================================================== --- head/net-p2p/litecoin/Makefile Thu Feb 6 16:50:42 2014 (r343126) +++ head/net-p2p/litecoin/Makefile Thu Feb 6 17:36:38 2014 (r343127) @@ -24,10 +24,9 @@ WANT_BDB_VER= 48 USES= gmake -OPTIONS_DEFINE= GUI UPNP QRCODES DBUS -OPTIONS_DEFAULT= GUI QRCODES +OPTIONS_DEFINE= X11 UPNP QRCODES DBUS +OPTIONS_DEFAULT= X11 QRCODES -GUI_DESC= Build as a QT4 GUI UPNP_DESC= Build with UPNP support QRCODES_DESC= Build with QR code display DBUS_DESC= Build with DBUS support @@ -44,7 +43,7 @@ QMAKE_USE_UPNP= 1 QMAKE_USE_UPNP= - .endif -.if ${PORT_OPTIONS:MGUI} && !defined(WITHOUT_X11) +.if ${PORT_OPTIONS:MX11} USE_QT4= qmake_build linguist uic moc rcc BINARY= litecoin-qt .else @@ -56,7 +55,7 @@ MAKE_ARGS+= -C ${WRKSRC}/src USE_UPNP=${ PLIST_FILES= bin/${BINARY} -.if ${PORT_OPTIONS:MGUI} && !defined(WITHOUT_X11) && ${PORT_OPTIONS:MQRCODES} +.if ${PORT_OPTIONS:MX11} && ${PORT_OPTIONS:MQRCODES} LIB_DEPENDS+= libqrencode.so:${PORTSDIR}/graphics/libqrencode QMAKE_USE_QRCODE=1 .else @@ -72,16 +71,16 @@ QMAKE_USE_DBUS= 0 .include -.if ${PORT_OPTIONS:MGUI} && !defined(WITHOUT_X11) +.if ${PORT_OPTIONS:MX11} PLIST_FILES+= share/applications/litecoin-qt.desktop share/pixmaps/litecoin64.png .endif -.if ${OSVERSION} >= 1000000 +.if ${OSVERSION} >= 1000054 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-endian .endif do-configure: -.if ${PORT_OPTIONS:MGUI} && !defined(WITHOUT_X11) +.if ${PORT_OPTIONS:MX11} cd ${BUILD_WRKSRC} && \ ${QMAKE} ${QMAKE_ARGS} \ QMAKE_LIBDIR+=${BDB_LIB_DIR} \ @@ -93,7 +92,7 @@ do-configure: .endif do-install: -.if ${PORT_OPTIONS:MGUI} && !defined(WITHOUT_X11) +.if ${PORT_OPTIONS:MX11} ${INSTALL_PROGRAM} ${WRKSRC}/${BINARY} ${STAGEDIR}${PREFIX}/bin/ ${REINPLACE_CMD} -e 's,=/usr,=${PREFIX},' \ -e 's,bitcoin,litecoin,g' \ @@ -109,7 +108,7 @@ post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/src/makefile.unix regression-test: -.if !${PORT_OPTIONS:MGUI} || defined(WITHOUT_X11) +.if !${PORT_OPTIONS:MX11} @${GMAKE} -C ${WRKSRC}/src -f makefile.unix USE_UPNP=${QMAKE_USE_UPNP} test_litecoin (cd ${WRKSRC}/src ; ./test_litecoin) .endif