From owner-svn-ports-head@freebsd.org Sun Apr 17 10:16:01 2016 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 3FF02B116F8; Sun, 17 Apr 2016 10:16:01 +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 17B2E1F37; Sun, 17 Apr 2016 10:16:01 +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 u3HAG0ls070141; Sun, 17 Apr 2016 10:16:00 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3HAG0EX070134; Sun, 17 Apr 2016 10:16:00 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201604171016.u3HAG0EX070134@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Sun, 17 Apr 2016 10:16:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413499 - in head/biology/migrate: . files 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.21 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: Sun, 17 Apr 2016 10:16:01 -0000 Author: amdmi3 Date: Sun Apr 17 10:15:59 2016 New Revision: 413499 URL: https://svnweb.freebsd.org/changeset/ports/413499 Log: - Switch to options helpers - Regenerate patches with `make makepatch` - Simplify plist Modified: head/biology/migrate/Makefile head/biology/migrate/files/patch-Makefile.in head/biology/migrate/pkg-plist Modified: head/biology/migrate/Makefile ============================================================================== --- head/biology/migrate/Makefile Sun Apr 17 10:11:59 2016 (r413498) +++ head/biology/migrate/Makefile Sun Apr 17 10:15:59 2016 (r413499) @@ -10,21 +10,20 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}.src MAINTAINER= ports@FreeBSD.org COMMENT= Program to estimate population sizes and migration rates +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src +EXTRACT_AFTER_ARGS=--exclude zlib + GNU_CONFIGURE= yes CONFIGURE_ENV= ac_cv_prog_GMAKE="${MAKE}" MAKE_ARGS= PRETTYCFLAGS="${CFLAGS} -DNOJPEG -DNOZLIB -DNOPNG -Iharu \ -DPRETTY -lstdc++" -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src - -PLIST_SUB+= PORTNAME=${PORTNAME} PORTDOCS= HISTORY README README_PARALLEL_GENERAL ${PORTNAME}.html PORTEXAMPLES= * -EXTRACT_AFTER_ARGS=--exclude zlib -OPTIONS_DEFINE= DOCS EXAMPLES THREAD -THREAD_DESC= Build with THREAD support -THREAD_ALL_TARGET= thread +OPTIONS_DEFINE= DOCS EXAMPLES THREAD +THREAD_DESC= Build with THREAD support +THREAD_ALL_TARGET= thread post-patch: @${REINPLACE_CMD} -e 's|="-O "|="$$CFLAGS"|g' ${WRKSRC}/configure @@ -39,11 +38,13 @@ do-install: ${LN} -sf ${PORTNAME}.1 \ ${STAGEDIR}${MAN1PREFIX}/man/man1/${PORTNAME}-n.1 +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/../,} ${STAGEDIR}${DOCSDIR} @${MKDIR} ${STAGEDIR}${DOCSDIR}/graphics ${INSTALL_DATA} ${WRKSRC}/../graphics/* ${STAGEDIR}${DOCSDIR}/graphics +do-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/../example/[A-Za-z]* \ ${STAGEDIR}${EXAMPLESDIR} Modified: head/biology/migrate/files/patch-Makefile.in ============================================================================== --- head/biology/migrate/files/patch-Makefile.in Sun Apr 17 10:11:59 2016 (r413498) +++ head/biology/migrate/files/patch-Makefile.in Sun Apr 17 10:15:59 2016 (r413499) @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2013-05-25 14:59:22.000000000 +0000 -+++ Makefile.in 2013-05-25 14:59:37.000000000 +0000 -@@ -89,7 +89,7 @@ +--- Makefile.in.orig 2015-06-24 02:57:05 UTC ++++ Makefile.in +@@ -89,7 +89,7 @@ PAPERFORMAT = @PAPERFORMAT@ # -DINTEGRATEDLIKE may be used to get a marginal likelihood different to the current thermodynamic integr and harmonic mean [does not work] # -UEP calculates unique event polymorphism [not checked in a long time -- most likely does not work] NEWSTUFF = -DNEXUSTREE @@ -9,7 +9,7 @@ # # combine the common flags with the version number and subversion number COMMONVFLAGS = $(COMMONFLAGS) -DMIGRATESUBVERSION=\"\\\"$(MIGRATESUBVERSION)\\\"\" -@@ -544,4 +544,4 @@ +@@ -544,4 +544,4 @@ parallel_short_test:: #---------------------------------------------------------------- # BEAGLE beagle: Modified: head/biology/migrate/pkg-plist ============================================================================== --- head/biology/migrate/pkg-plist Sun Apr 17 10:11:59 2016 (r413498) +++ head/biology/migrate/pkg-plist Sun Apr 17 10:15:59 2016 (r413499) @@ -1,8 +1,8 @@ -bin/%%PORTNAME%% -bin/%%PORTNAME%%-n -man/man1/%%PORTNAME%%-n.1.gz -man/man1/%%PORTNAME%%.1.gz +bin/migrate +bin/migrate-n +man/man1/migrate-n.1.gz +man/man1/migrate.1.gz %%PORTDOCS%%%%DOCSDIR%%/graphics/librarian.gif %%PORTDOCS%%%%DOCSDIR%%/graphics/mail.gif -%%PORTDOCS%%%%DOCSDIR%%/graphics/%%PORTNAME%%.gif +%%PORTDOCS%%%%DOCSDIR%%/graphics/migrate.gif %%PORTDOCS%%%%DOCSDIR%%/graphics/packet.gif