From 48a50eba874ed8e999de9de66801a95e03ffb581 Mon Sep 17 00:00:00 2001 From: Sunpoet Po-Chuan Hsieh Date: Sun, 8 Jan 2017 14:42:45 +0000 Subject: [PATCH] Use PYTHON_PKGNAMEPREFIX instead of py${PYTHON_SUFFIX}- - Add NO_ARCH - Use bsd.port.mk instead of bsd.port.pre.mk + bsd.port.post.mk Approved by: portmgr (blanket) With hat: python --- x11/guake/Makefile | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/x11/guake/Makefile b/x11/guake/Makefile index 47d066b38d5c..b62c13437e37 100644 --- a/x11/guake/Makefile +++ b/x11/guake/Makefile @@ -11,15 +11,15 @@ COMMENT= Dropdown terminal made for the GNOME desktop LICENSE= GPLv2 BUILD_DEPENDS= gnome-common>=3.14.0:devel/gnome-common \ - py${PYTHON_SUFFIX}-dbus>=0.84.0:devel/py-dbus \ - py${PYTHON_SUFFIX}-notify>=0.1.1_9:devel/py-notify \ - py${PYTHON_SUFFIX}-vte>=0.26.2_1:x11-toolkits/py-vte \ - py${PYTHON_SUFFIX}-xdg>=0.19:devel/py-xdg + ${PYTHON_PKGNAMEPREFIX}dbus>=0.84.0:devel/py-dbus \ + ${PYTHON_PKGNAMEPREFIX}notify>=0.1.1_9:devel/py-notify \ + ${PYTHON_PKGNAMEPREFIX}vte>=0.26.2_1:x11-toolkits/py-vte \ + ${PYTHON_PKGNAMEPREFIX}xdg>=0.19:devel/py-xdg RUN_DEPENDS= keybinder>=0.3.0:x11/keybinder \ - py${PYTHON_SUFFIX}-dbus>=0.84.0:devel/py-dbus \ - py${PYTHON_SUFFIX}-notify>=0.1.1_9:devel/py-notify \ - py${PYTHON_SUFFIX}-vte>=0.26.2_1:x11-toolkits/py-vte \ - py${PYTHON_SUFFIX}-xdg>=0.19:devel/py-xdg + ${PYTHON_PKGNAMEPREFIX}dbus>=0.84.0:devel/py-dbus \ + ${PYTHON_PKGNAMEPREFIX}notify>=0.1.1_9:devel/py-notify \ + ${PYTHON_PKGNAMEPREFIX}vte>=0.26.2_1:x11-toolkits/py-vte \ + ${PYTHON_PKGNAMEPREFIX}xdg>=0.19:devel/py-xdg CPPFLAGS+= -I${LOCALBASE}/include @@ -41,6 +41,7 @@ OPTIONS_SUB= NLS PLIST_SUB+= DESKTOPDIR="${DESKTOPDIR:S,${PREFIX}/,,}" +NO_ARCH= yes USES= autoreconf:build desktop-file-utils gettext gmake libtool \ pkgconfig python:2 USE_GITHUB= yes @@ -56,8 +57,6 @@ REINPLACE_FILES+= ../../configure pre-configure: @(cd ${CONFIGURE_WRKSRC} ; ${SETENV} ${CONFIGURE_ENV} ./autogen.sh) -.include - .if exists(${LOCALBASE}/libexec/notification-daemon) RUN_DEPENDS+= notification-daemon>=0.7.2_1:deskutils/notification-daemon .elif exists (${LOCALBASE}/bin/xfce4-notifyd-config) @@ -66,4 +65,4 @@ RUN_DEPENDS+= xfce4-notifyd>=0.2.4:deskutils/xfce4-notifyd RUN_DEPENDS+= notify-osd>=0.9.29_4:deskutils/notify-osd .endif -.include +.include