Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 2 Feb 2014 13:32:48 +0000 (UTC)
From:      Antoine Brodin <antoine@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r342287 - head/deskutils/mdh
Message-ID:  <201402021332.s12DWmjM055446@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: antoine
Date: Sun Feb  2 13:32:48 2014
New Revision: 342287
URL: http://svnweb.freebsd.org/changeset/ports/342287
QAT: https://qat.redports.org/buildarchive/r342287/

Log:
  - Stage support
  - Convert to OPTIONS and OPTIONS helpers

Modified:
  head/deskutils/mdh/Makefile

Modified: head/deskutils/mdh/Makefile
==============================================================================
--- head/deskutils/mdh/Makefile	Sun Feb  2 13:29:58 2014	(r342286)
+++ head/deskutils/mdh/Makefile	Sun Feb  2 13:32:48 2014	(r342287)
@@ -18,19 +18,15 @@ GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-.if defined(WITHOUT_GTOP)
-CONFIGURE_ARGS+=	--disable-gtop
-.else
-LIB_DEPENDS+=	libgtop-2.0.so:${PORTSDIR}/devel/libgtop
-.endif
-
-.if defined(WITHOUT_CURL)
-CONFIGURE_ARGS+=	--disable-curl
-.else
-LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
-.endif
+OPTIONS_DEFINE=	CURL DOCS GTOP
+OPTIONS_DEFAULT=	CURL GTOP
+
+CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+CURL_CONFIGURE_OFF=	--disable-curl
+
+GTOP_LIB_DEPENDS=	libgtop-2.0.so:${PORTSDIR}/devel/libgtop
+GTOP_CONFIGURE_OFF=	--disable-gtop
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's| make| $$(MAKE)|g' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's|\.\./lib/getopt/getopt\.c||g ; \
@@ -43,9 +39,7 @@ post-patch:
 	@${REINPLACE_CMD} -e '/<curl\/types.h>/d' ${WRKSRC}/src/curl.c
 
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402021332.s12DWmjM055446>