Date: Mon, 27 Oct 2014 23:36:31 +0000 (UTC) From: "Jason E. Hale" <jhale@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r371610 - head/graphics/electrix Message-ID: <201410272336.s9RNaVFe059817@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhale Date: Mon Oct 27 23:36:31 2014 New Revision: 371610 URL: https://svnweb.freebsd.org/changeset/ports/371610 QAT: https://qat.redports.org/buildarchive/r371610/ Log: - Fix stage-qa error where STAGEDIR was being referenced by the binary by setting up MAKE_ENV instead of passing STAGEDIR through PREFIX - Respect CC, CFLAGS, LDFLAGS, and MAKE_JOBS - Strip binaries - Convert USE_BZIP2 to USES - Use options helpers (this also fixes a problem where LIB_DEPENDS was being over-ridden in the PDF option, effectively cancelling out the LIB_DEPENDS for the PS option) Note: Did not use <OPT>_CONFIGURE_ENABLE because the configure script only understands --disable-<feature> - Bump PORTREVISION PR: 194317 Approved by: olivierd (maintainer) Modified: head/graphics/electrix/Makefile Modified: head/graphics/electrix/Makefile ============================================================================== --- head/graphics/electrix/Makefile Mon Oct 27 21:48:42 2014 (r371609) +++ head/graphics/electrix/Makefile Mon Oct 27 23:36:31 2014 (r371610) @@ -2,7 +2,7 @@ PORTNAME= electrix PORTVERSION= 0.2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics print MASTER_SITES= SF/${PORTNAME:tl}/${PORTVERSION} @@ -11,54 +11,38 @@ COMMENT= Application to view PDF files LICENSE= GPLv2 -USES= pkgconfig desktop-file-utils python:2 -USE_BZIP2= yes +USES= desktop-file-utils pkgconfig python:2 tar:bzip2 USE_GNOME= gtk20 glib20 intltool intlhack -CONFIGURE_ARGS= --prefix=${STAGEDIR}${PREFIX} +MAKE_ENV= DESTDIR="${STAGEDIR}" \ + JOBS="${MAKE_JOBS_NUMBER}" \ + LINKFLAGS="${LDFLAGS}" -OPTIONS_DEFINE= DBUS NLS PDF PS +OPTIONS_DEFINE= DBUS NLS PDF PS OPTIONS_DEFAULT= DBUS PDF +OPTIONS_SUB= yes -PDF_DESC= Portable Document Format Support -PS_DESC= PostScript Support +DBUS_LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib +DBUS_CONFIGURE_OFF= --disable-dbus -.include <bsd.port.options.mk> +NLS_USES= gettext +NLS_CONFIGURE_OFF= --disable-nls -.if ${PORT_OPTIONS:MDBUS} -LIB_DEPENDS+= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib -.else -CONFIGURE_ARGS+= --disable-dbus -.endif - -.if ${PORT_OPTIONS:MNLS} -PLIST_SUB= NLS="" -USES+= gettext -.else -CONFIGURE_ARGS+= --disable-nls -PLIST_SUB= NLS="@comment " -.endif - -.if ${PORT_OPTIONS:MPDF} -LIB_DEPENDS= libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib -.else -CONFIGURE_ARGS+= --disable-pdf -.endif - -.if ${PORT_OPTIONS:MPS} -LIB_DEPENDS+= libspectre.so:${PORTSDIR}/print/libspectre -.else -CONFIGURE_ARGS+= --disable-ps -.endif +PDF_LIB_DEPENDS= libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib +PDF_CONFIGURE_OFF= --disable-pdf + +PS_LIB_DEPENDS= libspectre.so:${PORTSDIR}/print/libspectre +PS_CONFIGURE_OFF= --disable-ps do-configure: - @cd ${WRKSRC} && ${SETENV} ${PYTHON_CMD} waf configure \ - ${CONFIGURE_ARGS} && ${TRUE} + @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} waf configure \ + ${CONFIGURE_ARGS} && ${TRUE}) do-build: - @cd ${WRKSRC} && ${SETENV} ${PYTHON_CMD} waf build && ${TRUE} + @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} waf build && ${TRUE}) do-install: - @cd ${WRKSRC} && ${SETENV} ${PYTHON_CMD} waf install && ${TRUE} + @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} waf install && ${TRUE}) + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/electrix .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410272336.s9RNaVFe059817>