From owner-svn-ports-all@freebsd.org Wed Mar 3 18:07:51 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 010AD54AB7F; Wed, 3 Mar 2021 18:07:51 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DrMRP6lwZz4fQF; Wed, 3 Mar 2021 18:07:45 +0000 (UTC) (envelope-from sunpoet@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 732905EBA; Wed, 3 Mar 2021 18:07:44 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 123I7iDM040122; Wed, 3 Mar 2021 18:07:44 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 123I7hS0040119; Wed, 3 Mar 2021 18:07:43 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <202103031807.123I7hS0040119@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Wed, 3 Mar 2021 18:07:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r567122 - in head/textproc/discount: . files X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: in head/textproc/discount: . files X-SVN-Commit-Revision: 567122 X-SVN-Commit-Repository: ports 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.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Mar 2021 18:07:51 -0000 Author: sunpoet Date: Wed Mar 3 18:07:43 2021 New Revision: 567122 URL: https://svnweb.freebsd.org/changeset/ports/567122 Log: Update to 2.2.7 - Fix LICENSE - Take maintainership Changes: https://github.com/Orc/discount/commits/main Modified: head/textproc/discount/Makefile head/textproc/discount/distinfo head/textproc/discount/files/patch-Makefile.in head/textproc/discount/pkg-plist Modified: head/textproc/discount/Makefile ============================================================================== --- head/textproc/discount/Makefile Wed Mar 3 18:07:38 2021 (r567121) +++ head/textproc/discount/Makefile Wed Mar 3 18:07:43 2021 (r567122) @@ -2,48 +2,40 @@ # $FreeBSD$ PORTNAME= discount +PORTVERSION= 2.2.7 DISTVERSIONPREFIX= v -DISTVERSION= 2.2.6 CATEGORIES= textproc devel -MAINTAINER= ports@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= C implementation of the Markdown markup language -LICENSE= BSD2CLAUSE +LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYRIGHT USES= pkgconfig + USE_GITHUB= yes GH_ACCOUNT= Orc -HAS_CONFIGURE= yes +CFLAGS+= -fPIC +CONFIGURE_ARGS= --prefix=${PREFIX} --mandir=${MANPREFIX}/man CONFIGURE_SCRIPT= configure.sh -CONFIGURE_ARGS= --prefix=${PREFIX} \ - --mandir=${MANPREFIX}/man - +HAS_CONFIGURE= yes +MAKE_JOBS_UNSAFE= yes # libmarkdown is used before it is built INSTALL_TARGET= install install.man +TEST_TARGET= test -CFLAGS+= -fPIC +CONFLICTS_INSTALL= markdown -MAKE_JOBS_UNSAFE= yes # libmarkdown is used before it is built +OPTIONS_DEFINE= EXTRA SAMPLES TAB8 +OPTIONS_DEFAULT=EXTRA TAB8 +OPTIONS_SUB= yes +EXTRA_DESC= Enable all extra features +SAMPLES_DESC= Install sample programs +TAB8_DESC= Use a tabstop of 8 (default is 4) -OPTIONS_DEFINE= EXTRA TAB8 SAMPLES -OPTIONS_DEFAULT= EXTRA TAB8 - -EXTRA_DESC= Enable all extra features -TAB8_DESC= Use a tabstop of 8 (default is 4) -SAMPLES_DESC= Install sample programs - -EXTRA_CONFIGURE_ON= --with-dl=both --with-fenced-code --with-github-tags \ - --with-id-anchor - -TAB8_CONFIGURE_ON= --with-tabstops=8 - +EXTRA_CONFIGURE_ON= --with-dl=both --with-fenced-code --with-github-tags --with-id-anchor SAMPLES_INSTALL_TARGET= install install.samples -SAMPLES_PLIST_FILES= bin/makepage bin/mkd2html bin/theme \ - man/man1/makepage.1.gz man/man1/mkd2html.1.gz \ - man/man1/theme.1.gz - -CONFLICTS_INSTALL= markdown +TAB8_CONFIGURE_ON= --with-tabstops=8 .include Modified: head/textproc/discount/distinfo ============================================================================== --- head/textproc/discount/distinfo Wed Mar 3 18:07:38 2021 (r567121) +++ head/textproc/discount/distinfo Wed Mar 3 18:07:43 2021 (r567122) @@ -1,3 +1,3 @@ -TIMESTAMP = 1584899335 -SHA256 (Orc-discount-v2.2.6_GH0.tar.gz) = 0beb98a66a6e38ed125e2d0a161ff6b461f6a38538bb72498766f376c94a0ad3 -SIZE (Orc-discount-v2.2.6_GH0.tar.gz) = 128790 +TIMESTAMP = 1613738747 +SHA256 (Orc-discount-v2.2.7_GH0.tar.gz) = 72c1325ddfc40871d6810f1e272cf2d45b361f26357eb38f170fd04d737bb9f2 +SIZE (Orc-discount-v2.2.7_GH0.tar.gz) = 128805 Modified: head/textproc/discount/files/patch-Makefile.in ============================================================================== --- head/textproc/discount/files/patch-Makefile.in Wed Mar 3 18:07:38 2021 (r567121) +++ head/textproc/discount/files/patch-Makefile.in Wed Mar 3 18:07:43 2021 (r567122) @@ -1,8 +1,8 @@ ---- Makefile.in.orig 2015-01-18 16:49:13 UTC +--- Makefile.in.orig 2020-08-24 05:45:49 UTC +++ Makefile.in -@@ -39,13 +39,13 @@ install.man: - @INSTALL_DIR@ $(DESTDIR)$(MANDIR)/man3 - @INSTALL_DATA@ $(MAN3PAGES) $(DESTDIR)$(MANDIR)/man3 +@@ -57,13 +57,13 @@ install.man: + $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man3 + $(INSTALL_DATA) $(MAN3PAGES) $(DESTDIR)$(MANDIR)/man3 for x in mkd_line mkd_generateline; do \ - ( echo '.\"' ; echo ".so man3/mkd-line.3" ) > $(DESTDIR)$(MANDIR)/man3/$$x.3;\ + ln -sf mkd-line.3 $(DESTDIR)$(MANDIR)/man3/$$x.3; \ @@ -15,5 +15,5 @@ - ( echo '.\"' ; echo ".so man3/mkd-functions.3" ) > $(DESTDIR)$(MANDIR)/man3/$$x.3; \ + ln -sf mkd-functions.3 $(DESTDIR)$(MANDIR)/man3/$$x.3; \ done - @INSTALL_DIR@ $(DESTDIR)$(MANDIR)/man7 - @INSTALL_DATA@ markdown.7 mkd-extensions.7 $(DESTDIR)$(MANDIR)/man7 + $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man7 + $(INSTALL_DATA) markdown.7 mkd-extensions.7 $(DESTDIR)$(MANDIR)/man7 Modified: head/textproc/discount/pkg-plist ============================================================================== --- head/textproc/discount/pkg-plist Wed Mar 3 18:07:38 2021 (r567121) +++ head/textproc/discount/pkg-plist Wed Mar 3 18:07:43 2021 (r567122) @@ -1,8 +1,14 @@ +%%SAMPLES%%bin/makepage bin/markdown +%%SAMPLES%%bin/mkd2html +%%SAMPLES%%bin/theme include/mkdio.h lib/libmarkdown.a libdata/pkgconfig/libmarkdown.pc +%%SAMPLES%%man/man1/makepage.1.gz man/man1/markdown.1.gz +%%SAMPLES%%man/man1/mkd2html.1.gz +%%SAMPLES%%man/man1/theme.1.gz man/man3/markdown.3.gz man/man3/mkd-callbacks.3.gz man/man3/mkd-functions.3.gz