From 3109c54bf899a966f5551ff9752c79511f978d4b Mon Sep 17 00:00:00 2001 From: swills Date: Thu, 6 Feb 2014 17:36:38 +0000 Subject: - Use more correct OSVERSION check [1] - Remove WITHOUT_X11 and use standard X11 option PR: ports/186137 [1] Reported by: Waitman Gobble [1] --- net-p2p/litecoin/Makefile | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'net-p2p/litecoin') diff --git a/net-p2p/litecoin/Makefile b/net-p2p/litecoin/Makefile index 4f3217a77912..67b9366b5fa2 100644 --- a/net-p2p/litecoin/Makefile +++ b/net-p2p/litecoin/Makefile @@ -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=${QMAKE_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 -- cgit