[Midnightbsd-cvs] mports [19610] trunk/sysutils/dirdiff/Makefile: fix make.conf sourcing

[laffer1 at midnightbsd.org]

Revision: 19610
          http://svnweb.midnightbsd.org/mports/?rev=19610
Author:   laffer1
Date:     2015-07-27 20:24:35 -0400 (Mon, 27 Jul 2015)
Log Message:
-----------
fix make.conf sourcing

Modified Paths:
--------------
    trunk/sysutils/dirdiff/Makefile

Property Changed:
----------------
    trunk/sysutils/dirdiff/Makefile

Modified: trunk/sysutils/dirdiff/Makefile
===================================================================
--- trunk/sysutils/dirdiff/Makefile	2015-07-28 00:22:26 UTC (rev 19609)
+++ trunk/sysutils/dirdiff/Makefile	2015-07-28 00:24:35 UTC (rev 19610)
@@ -2,6 +2,7 @@
 
 PORTNAME=	dirdiff
 PORTVERSION=	2.1
+PORTREVISION=	2
 CATEGORIES=	sysutils tcl tk
 MASTER_SITES=	ftp://ftp.samba.org/pub/paulus/
 
@@ -8,9 +9,10 @@
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Graphical diff tool
 
-LICENSE=	gpl2
+LICENSE=	gpl2 # (or later)
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-USE_TK=		yes
+USES+=		tk
 USE_LDCONFIG=	yes
 
 PLIST_FILES=	bin/dirdiff lib/libfilecmp.so.0
@@ -17,13 +19,17 @@
 
 CFLAGS+=	-fPIC -I${TCL_INCLUDEDIR}
 
-NO_STAGE=	yes
+# When bsdmake is used to build the port, the ports infrastructure should call
+# it with MAKE_ENV+=  __MAKE_CONF=/dev/null to avoid sourcing make.conf twice.
+# This is a workaround to make sure CFLAGS are passed through.
+MAKE_ARGS=	CFLAGS="${CFLAGS}"
+
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|.0.0|.0|g ; \
 		 s|^CFLAGS=|CFLAGS?=|g' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e \
-		's|^exec wish |exec ${WISH:T} |' ${WRKSRC}/dirdiff
+		's|^exec wish |exec ${WISH} |' ${WRKSRC}/dirdiff
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/dirdiff ${PREFIX}/bin


Property changes on: trunk/sysutils/dirdiff/Makefile
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property