From owner-svn-ports-all@FreeBSD.ORG  Mon Jan  6 21:10:01 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 9266EBD7;
 Mon,  6 Jan 2014 21:10:01 +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 7E7AB19B3;
 Mon,  6 Jan 2014 21:10:01 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s06LA1J1043016;
 Mon, 6 Jan 2014 21:10:01 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s06LA1m1043015;
 Mon, 6 Jan 2014 21:10:01 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201401062110.s06LA1m1043015@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 6 Jan 2014 21:10:01 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r338934 - head/x11/dzen2
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Jan 2014 21:10:01 -0000

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>