Date: Mon, 6 Jan 2014 21:10:01 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r338934 - head/x11/dzen2 Message-ID: <201401062110.s06LA1m1043015@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Mon Jan 6 21:10:01 2014 New Revision: 338934 URL: http://svnweb.freebsd.org/changeset/ports/338934 Log: Support stage Play with MAKE_ARGS instead of patching Modified: head/x11/dzen2/Makefile Modified: head/x11/dzen2/Makefile ============================================================================== --- head/x11/dzen2/Makefile Mon Jan 6 21:04:14 2014 (r338933) +++ head/x11/dzen2/Makefile Mon Jan 6 21:10:01 2014 (r338934) @@ -17,29 +17,16 @@ PLIST_FILES= bin/${PORTNAME} OPTIONS_DEFINE= XPM XINERAMA OPTIONS_DEFAULT= XPM XINERAMA -NO_STAGE= yes -.include <bsd.port.options.mk> +LDFLAGS= -L${LOCALBASE}/lib +CFLAGS= -I${LOCALBASE}/include +XPM_USE= XORG=xpm +XPM_CFLAGS= -DDZEN_XPM +XPM_LDFLAGS= -lXpm +XINERAMA_USE= XORG=xinerama +XINERAMA_LDFLAGS= -lXinerama +XINERAMA_CLAGS= -DDZEN_XINERAMA -.if ${PORT_OPTIONS:MXPM} -USE_XORG+= xpm -.endif - -.if ${PORT_OPTIONS:MXINERAMA} -USE_XORG+= xinerama -.endif - -post-patch: -.if ${PORT_OPTIONS:MXPM} - ${REINPLACE_CMD} -e 's/^LIBS =\(.*\)$$/LIBS =\1 -lXpm/g' \ - -e 's/^CFLAGS =\(.*\)$$/CFLAGS =\1 -DDZEN_XPM/g' \ - ${WRKSRC}/config.mk -.endif -.if ${PORT_OPTIONS:MXINERAMA} - ${REINPLACE_CMD} -e 's/^LIBS =\(.*\)$$/LIBS =\1 -lXinerama/g' \ - -e 's/^CFLAGS =\(.*\)$$/CFLAGS =\1 -DDZEN_XINERAMA/g' \ - ${WRKSRC}/config.mk -.endif - ${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' \ - ${WRKSRC}/config.mk +MAKE_ARGS= LDFLAGS="${LDFLAGS} \$${LIBS}" \ + CFLAGS="${CFLAGS} ${INCS} -DVERSION=\\\"\$${VERSION}\\\"" .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401062110.s06LA1m1043015>