From owner-svn-ports-head@freebsd.org Thu Feb 2 09:01:25 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8F7FBCCDB0D; Thu, 2 Feb 2017 09:01:25 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 67CB5F98; Thu, 2 Feb 2017 09:01:25 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1291OsN083946; Thu, 2 Feb 2017 09:01:24 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1291OqV083945; Thu, 2 Feb 2017 09:01:24 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201702020901.v1291OqV083945@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 2 Feb 2017 09:01:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r433132 - head/math/goblin X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Feb 2017 09:01:25 -0000 Author: amdmi3 Date: Thu Feb 2 09:01:24 2017 New Revision: 433132 URL: https://svnweb.freebsd.org/changeset/ports/433132 Log: - Add LICENSE - Switch to options helpers Modified: head/math/goblin/Makefile Modified: head/math/goblin/Makefile ============================================================================== --- head/math/goblin/Makefile Thu Feb 2 09:00:18 2017 (r433131) +++ head/math/goblin/Makefile Thu Feb 2 09:01:24 2017 (r433132) @@ -11,9 +11,11 @@ DISTNAME= ${PORTNAME}.${DISTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Graph Object Library for Network Programming Problems -CONFLICTS= glpk-* +LICENSE= LGPL21 GPLv2+ # GPLv2 for (optional) bundled glpk +LICENSE_COMB= multi +LICENSE_FILE_LGPL21= ${WRKSRC}/tcl/LGPL -OPTIONS_DEFINE= DOCS EXAMPLES +CONFLICTS= glpk-[0-9]* USES= gmake tk tar:tgz USE_LDCONFIG= yes @@ -24,25 +26,26 @@ MAKE_ARGS= CC="${CC}" CCFLAGS="${CFLAGS} prefix=${PREFIX} ALL_TARGET= all shared MAKE_JOBS_UNSAFE= yes -PORTDOCS= * -PORTEXAMPLES= * CFLAGS+= -I${LOCALBASE}/include/tcl${TCL_VER} -I${LOCALBASE}/include/ \ -I${LOCALBASE}/include/tk${TK_VER} -fPIC CXXFLAGS+= -fPIC LIBS+= -L${LOCALBASE}/lib -ltcl${TCL_SHLIB_VER} -ltk${TK_SHLIB_VER} -lm -pthread -.include +PORTDOCS= * +PORTEXAMPLES= * + +OPTIONS_DEFINE= DOCS EXAMPLES post-patch: - ${REINPLACE_CMD} -e 's|/usr/bin/wish|${WISH}|g' ${WRKSRC}/display - ${REINPLACE_CMD} -e \ - 's|%%WISH%%|${WISH}|g; \ - s|%%PREFIX%%|${PREFIX}|g' \ - ${WRKSRC}/Makefile.conf - ${REINPLACE_CMD} -e 's|\./gosh|${PREFIX}/bin/gosh|; \ - s|\[pwd\] tcl|${PREFIX}/lib/goblin|g' \ - ${WRKSRC}/goblet + @${REINPLACE_CMD} -e 's|/usr/bin/wish|${WISH}|g' ${WRKSRC}/display + @${REINPLACE_CMD} -e \ + 's|%%WISH%%|${WISH}|g; \ + s|%%PREFIX%%|${PREFIX}|g' \ + ${WRKSRC}/Makefile.conf + @${REINPLACE_CMD} -e 's|\./gosh|${PREFIX}/bin/gosh|; \ + s|\[pwd\] tcl|${PREFIX}/lib/goblin|g' \ + ${WRKSRC}/goblet @${GREP} -lR "malloc\.h" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \ 's|malloc\.h|stdlib.h|g' @@ -51,22 +54,22 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/bin/goblet ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/display ${STAGEDIR}${PREFIX}/bin/goblin-display @${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME} - (cd ${WRKSRC}/include && ${COPYTREE_SHARE} \*.h ${STAGEDIR}${PREFIX}/include/${PORTNAME}) + (cd ${WRKSRC}/include && ${INSTALL_DATA} *.h ${STAGEDIR}${PREFIX}/include/${PORTNAME}) ${INSTALL} -d ${STAGEDIR}${PREFIX}/lib/${PORTNAME} - (cd ${WRKSRC}/tcl && ${COPYTREE_SHARE} \* ${STAGEDIR}${PREFIX}/lib/${PORTNAME}) + (cd ${WRKSRC}/tcl && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/${PORTNAME}) ${INSTALL_DATA} ${WRKSRC}/lib/libgoblin.a ${STAGEDIR}${PREFIX}/lib ${INSTALL_LIB} ${WRKSRC}/libgoblin.so ${STAGEDIR}${PREFIX}/lib ${INSTALL_DATA} ${WRKSRC}/lib/libglpk.a ${STAGEDIR}${PREFIX}/lib ${INSTALL_LIB} ${WRKSRC}/libglpk.so ${STAGEDIR}${PREFIX}/lib -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} @${MKDIR} ${STAGEDIR}${DOCSDIR}/html - (cd ${WRKSRC}/html && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}/html) - (cd ${WRKSRC}/doku && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}) -.endif -.if ${PORT_OPTIONS:MEXAMPLES} + (cd ${WRKSRC}/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/html) + (cd ${WRKSRC}/doku && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) + +do-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - (cd ${WRKSRC}/samples && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}) -.endif + (cd ${WRKSRC}/samples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) .include