From nobody Thu Apr 27 15:52:26 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q6gGy5xwGz47KDR; Thu, 27 Apr 2023 15:52:26 +0000 (UTC) (envelope-from git@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 4Q6gGy4mDkz4G2w; Thu, 27 Apr 2023 15:52:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682610746; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IdJBAmc+WjnuGY/FrdlPTkkellJifIG9rtj2ZUYRaFI=; b=xHqCn3qpxdRoTkPxPngQhnbVyu1sioWt8D+1UEKxz27B8bpgs2Siguxe8/HR0ZMVe7H9Do 5jTqSBJ6d0419+Fyarz9j7PMSkuLbVv5eMw/lvFevmKBtfpzn4+N97UY/jQCXeO+9mfG9Z SZ1mY+V31LmA5L5Jrt8hxlFZIlIWrHoONpi2TMie/DjuP10/8egFFQYCw3NXaTsZq6h6Sg CermRJbjf6ml+JVnBLI1KNhDwUvqhCB87VK9OMVkUOteT7hlpia8NHql9+zy0whpCk3+/l kMa7jF2KR+A84vCaDJ248lk1A81PshWN3q0OVLn+fh0nl3MoLPInjs9sMNeOzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682610746; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IdJBAmc+WjnuGY/FrdlPTkkellJifIG9rtj2ZUYRaFI=; b=F81ArbPsOXLpa7TU+rBKv0m7W6Qkp1XAiMBLRE5QVjv2K1p+rcUbUFNcnTZ/v8CV94RVeE mFLYGO0RJD4VNm0T0uOvxY3EnE3tJKAefO4foOb6xlLepMjK7nh04z5CHwU2yZR+bQaU/6 I4cn+dDRpTC1eRgMkX5Wsy05b/qkwASiifuFMlGX48F/A/QzNvjT3JC1FVnC/nnGpBe3oy 4XNRyK3r8s8dG2L1mHpnZLDt/Kra9sFeGjIcbDqvKpPoArvIqx+G01nXbVskQPObPCWgDk /dnMus2mg6MeMYRe+HcFN5DMatnIu3U3siH3IEvwLFdsHhnu28+aFDWGdKWBHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682610746; a=rsa-sha256; cv=none; b=e0GY8F/qIu6hHxSosDySpipfTFDOuIxafZScOh/k30jzE+FHIChho36BNaRkrGtQkNID3V XpZKCbnqwnCoztBJiJjGKhCc8JzHN8hZQy1MQsV1r84CrolgW1qTwq4djE7vrSKz1QDcIC JQwiAoaCOSPF7g+laaAVHgXz6OEsrdn0pd3nWKY9wRIEKcBDGH/7xvV8aEkDAbl56BsqNU WR9R4fTKlzRzB+aKDOY/KYfjlJMNHaMVOKGiyX3bfkwr97jtT8U9ZhtaFOOJsmFWAV9OIH fbsFm1yMyu8uC8ifZpv8CcvwJv5luuhPI7gCLecIOKoi8yuOo0kRRcEUyrlSyw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q6gGy3r9FzP60; Thu, 27 Apr 2023 15:52:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33RFqQkP025774; Thu, 27 Apr 2023 15:52:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33RFqQCi025773; Thu, 27 Apr 2023 15:52:26 GMT (envelope-from git) Date: Thu, 27 Apr 2023 15:52:26 GMT Message-Id: <202304271552.33RFqQCi025773@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 35cb4f7cea6e - main - devel/astyle: Update to 3.2.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 35cb4f7cea6ea13d70b5266f216143f65446b762 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=35cb4f7cea6ea13d70b5266f216143f65446b762 commit 35cb4f7cea6ea13d70b5266f216143f65446b762 Author: Po-Chuan Hsieh AuthorDate: 2023-04-27 15:45:33 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-04-27 15:45:33 +0000 devel/astyle: Update to 3.2.1 - Update MASTER_SITES - Update WWW Changes: https://astyle.sourceforge.net/news.html https://astyle.sourceforge.net/notes.html --- devel/astyle/Makefile | 23 ++++++++++------------- devel/astyle/distinfo | 6 +++--- devel/astyle/files/patch-build_clang_Makefile | 11 ----------- devel/astyle/files/patch-build_gcc_Makefile | 11 ----------- devel/astyle/files/patch-src_astyle__main.cpp | 13 ------------- devel/astyle/pkg-plist | 16 ++++++++++++++++ 6 files changed, 29 insertions(+), 51 deletions(-) diff --git a/devel/astyle/Makefile b/devel/astyle/Makefile index 8e7a00661605..a351ebddc51d 100644 --- a/devel/astyle/Makefile +++ b/devel/astyle/Makefile @@ -1,38 +1,35 @@ PORTNAME= astyle -PORTVERSION= 3.1 -PORTREVISION= 3 +PORTVERSION= 3.2.1 CATEGORIES= devel textproc -MASTER_SITES= SF/astyle/astyle/astyle%20${PORTVERSION} -DISTNAME= ${PORTNAME}_${PORTVERSION}_linux +MASTER_SITES= SF/astyle/astyle/astyle%20${PORTVERSION:R} MAINTAINER= sunpoet@FreeBSD.org COMMENT= Source code indenter and formatter for C, C++, C\#, and Java -WWW= http://astyle.sourceforge.net/ +WWW= https://astyle.sourceforge.net/ \ + https://gitlab.com/saalen/astyle LICENSE= MIT -LICENSE_FILE= ${WRKDIR}/astyle/LICENSE.md +LICENSE_FILE= ${WRKSRC}/../../LICENSE.md -USES= compiler:c++11-lang dos2unix gmake +USES= compiler:c++11-lang dos2unix gmake tar:bz2 ALL_TARGET= astyle -WRKSRC= ${WRKDIR}/astyle/build/${CHOSEN_COMPILER_TYPE} +MAKE_ENV= CXX="${CXX}" +WRKSRC_SUBDIR= build/${CHOSEN_COMPILER_TYPE} DOS2UNIX_GLOB= *.ini OPTIONS_DEFINE= DOCS EXAMPLES -post-patch: - @${REINPLACE_CMD} -e 's|%%CXX%%|${CXX}|' ${WRKSRC}/${MAKEFILE} - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/astyle ${STAGEDIR}${PREFIX}/bin do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKDIR}/astyle/doc/* ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/../../doc/* ${STAGEDIR}${DOCSDIR} do-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKDIR}/astyle/file/* ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/../../file/* ${STAGEDIR}${EXAMPLESDIR} .include diff --git a/devel/astyle/distinfo b/devel/astyle/distinfo index f670b0f60e2f..283b91a23f2b 100644 --- a/devel/astyle/distinfo +++ b/devel/astyle/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1516007468 -SHA256 (astyle_3.1_linux.tar.gz) = cbcc4cf996294534bb56f025d6f199ebfde81aa4c271ccbd5ee1c1a3192745d7 -SIZE (astyle_3.1_linux.tar.gz) = 185589 +TIMESTAMP = 1682354468 +SHA256 (astyle-3.2.1.tar.bz2) = 191576fbd1f4abe55a25769c176da78294ec590f96f27037a4746bda0f84fe60 +SIZE (astyle-3.2.1.tar.bz2) = 224540 diff --git a/devel/astyle/files/patch-build_clang_Makefile b/devel/astyle/files/patch-build_clang_Makefile deleted file mode 100644 index 560ab96f0652..000000000000 --- a/devel/astyle/files/patch-build_clang_Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- ../../build/clang/Makefile.orig 2018-01-11 17:18:18 UTC -+++ ../../build/clang/Makefile -@@ -37,7 +37,7 @@ objdir = obj - ipath=$(prefix)/bin - CBASEFLAGS = -Wall -Wextra -fno-rtti -fno-exceptions -std=c++11 - JAVAINCS = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux --CXX = clang++ -+CXX = %%CXX%% - INSTALL=install -o $(USER) -g $(USER) - - # Library's major version number -- Increment in case of incompatible API diff --git a/devel/astyle/files/patch-build_gcc_Makefile b/devel/astyle/files/patch-build_gcc_Makefile deleted file mode 100644 index 038d6e645f08..000000000000 --- a/devel/astyle/files/patch-build_gcc_Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- ../../build/gcc/Makefile.orig 2018-01-11 17:18:18 UTC -+++ ../../build/gcc/Makefile -@@ -37,7 +37,7 @@ objdir = obj - ipath=$(prefix)/bin - CBASEFLAGS = -Wall -Wextra -fno-rtti -fno-exceptions -std=c++11 - JAVAINCS = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux --CXX = g++ -+CXX = %%CXX%% - INSTALL=install -o $(USER) -g $(USER) - - # Library's major version number -- Increment in case of incompatible API diff --git a/devel/astyle/files/patch-src_astyle__main.cpp b/devel/astyle/files/patch-src_astyle__main.cpp deleted file mode 100644 index 3ad3c79f366b..000000000000 --- a/devel/astyle/files/patch-src_astyle__main.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- ../../src/astyle_main.cpp.orig 2018-11-28 00:32:16.924868000 +0100 -+++ ../../src/astyle_main.cpp 2018-11-28 00:33:36.071105000 +0100 -@@ -46,6 +46,10 @@ - #ifdef _WIN32 - #undef UNICODE // use ASCII windows functions - #include -+#elif defined(__FreeBSD__) -+ #include -+ #include -+ #include - #else - #include - #include diff --git a/devel/astyle/pkg-plist b/devel/astyle/pkg-plist index afda622667eb..ad4638c73fcc 100644 --- a/devel/astyle/pkg-plist +++ b/devel/astyle/pkg-plist @@ -1,12 +1,28 @@ bin/astyle %%PORTDOCS%%%%DOCSDIR%%/astyle.html +%%PORTDOCS%%%%DOCSDIR%%/development.html +%%PORTDOCS%%%%DOCSDIR%%/favicon.ico +%%PORTDOCS%%%%DOCSDIR%%/index.html %%PORTDOCS%%%%DOCSDIR%%/install.html +%%PORTDOCS%%%%DOCSDIR%%/links.html %%PORTDOCS%%%%DOCSDIR%%/news.html +%%PORTDOCS%%%%DOCSDIR%%/newsArchives.html %%PORTDOCS%%%%DOCSDIR%%/notes.html +%%PORTDOCS%%%%DOCSDIR%%/notesArchives.html +%%PORTDOCS%%%%DOCSDIR%%/scripts.html %%PORTDOCS%%%%DOCSDIR%%/styles.css +%%PORTDOCS%%%%DOCSDIR%%/subversion.html +%%PORTDOCS%%%%DOCSDIR%%/vsinstall.html +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README.md %%PORTEXAMPLES%%%%EXAMPLESDIR%%/allman.ini %%PORTEXAMPLES%%%%EXAMPLESDIR%%/astyle.ini %%PORTEXAMPLES%%%%EXAMPLESDIR%%/chromium.ini +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clang-chromium.yaml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clang-google.yaml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clang-llvm.yaml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clang-mozilla.yaml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clang-visualstudio.yaml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clang-webkit.yaml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu.ini %%PORTEXAMPLES%%%%EXAMPLESDIR%%/google.ini %%PORTEXAMPLES%%%%EXAMPLESDIR%%/horstmann.ini