From nobody Sun May 22 05:14:37 2022 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 E3D431B57FE4; Sun, 22 May 2022 05:14:39 +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 4L5TCy5mfHz3PXX; Sun, 22 May 2022 05:14:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653196479; 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=k4gYe/9GcVQxdd/V9mnjKmP0ForI0Q7Pfe/8LYYIu3o=; b=vsnRNyfVeeW5NYc542q3qIz1EthqyJV0RsQAMIU68aW6zMiOCnyxPm7hufJqgLwcAb7vWP cODnTd53tWCv8Ga+J3pTCgzqLU68l0zYKC20g3c3ze/LsXb6W1DecFzC3+xYW8ZssOGaeP dWbkCJQ6+WHW/OXIPtGtHnLzFxlah9FIzBYDSbkogEvRpLKkUi0ZOM6fxkbAuLPLu1eLfK znwtiGqg+Q3JBldfkwaYqBQJTKyXvPVcZQrAPyDicsL4ZhIrVO3s/mZihjguvNYVm37bH9 ldDwS1eeonQ3aBuVIRfVMVbB3u4Ww+xIMNVbVreFzmDBL7K7UL2l5MdEmw5y5Q== 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 C48E61568C; Sun, 22 May 2022 05:14:37 +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 24M5Ebum060942; Sun, 22 May 2022 05:14:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24M5EbUr060941; Sun, 22 May 2022 05:14:37 GMT (envelope-from git) Date: Sun, 22 May 2022 05:14:37 GMT Message-Id: <202205220514.24M5EbUr060941@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: 5997ddbef8ec - main - devel/astyle: Respect CXX for Clang 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: 5997ddbef8ec10357d5f401c47c5476bf5965e21 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653196479; 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=k4gYe/9GcVQxdd/V9mnjKmP0ForI0Q7Pfe/8LYYIu3o=; b=yh/aEIlnQk23OqIcuK2MEee+1xA4eaw9eSIByQsWBPsW7xmO+cI8ksif0AtHNoGbrVBT5U n+U3xYE2cB669XEclpu5ZFtzzkovzCOibkh6VC2wx0igQTJzTT4nwiFceyeOqvxbXbG9NG G2hk8Grt1PgDUqBzqc0gA3PSMYq00BTJDPppIvtnJ3tld4kzeLJ/hHK1Bm7VPJFukz54fk rh1Fpox2kpG0lC5e3mDv7FXa45jZ/TDCEMb6LEgTIDGV5JFUOBM0aeri9CGCa8HE9h8KAN L4unvdtDhrOx34h3K7bokmlFnQpENcZUSH3EdE0TttfCP2S3vDMVC59MpdWLqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653196479; a=rsa-sha256; cv=none; b=SplOhcBPGxMny+WmRLLv5uci0Ey6xfe6NB0XOIPRF99jJFN7gBcMU6U88tDmD9p3T/YzMy jUVfZPpYLphtUVgPqHltOMi8FXcEM9rfq2ES6ddHpqp3bZIs3cI5rKFMj2gy472NyBSHX+ SRZxlbNd6VeBP8DJW0fduhqQZ3rgmEopKDYF2yg9QtPddvXKt7irL0sfVZjY1K3OqRyEAb k4tdS+Y3pye5xAb8QMRdOhbd6OSZI50UOhUhqP50/4KAI5TEJ/ju5gFowly1JrIWTXCwCP AR2xnlxPmj6E6BesXEwgZRa8rJzuKYlR9d0JHwLakD/LuDGz27LBUko0iSmcgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=5997ddbef8ec10357d5f401c47c5476bf5965e21 commit 5997ddbef8ec10357d5f401c47c5476bf5965e21 Author: Po-Chuan Hsieh AuthorDate: 2022-05-22 04:10:47 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-05-22 04:10:47 +0000 devel/astyle: Respect CXX for Clang - Convert to options target helper - Update pkg-descr - Take maintainership --- devel/astyle/Makefile | 16 ++++++++++------ devel/astyle/files/patch-build_clang_Makefile | 11 +++++++++++ devel/astyle/pkg-descr | 23 +++++++++++++++++++++-- 3 files changed, 42 insertions(+), 8 deletions(-) diff --git a/devel/astyle/Makefile b/devel/astyle/Makefile index 274efea2aa9b..41c5e64b9562 100644 --- a/devel/astyle/Makefile +++ b/devel/astyle/Makefile @@ -4,10 +4,10 @@ PORTNAME= astyle PORTVERSION= 3.1 PORTREVISION= 3 CATEGORIES= devel textproc -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION} +MASTER_SITES= SF/astyle/astyle/astyle%20${PORTVERSION} DISTNAME= ${PORTNAME}_${PORTVERSION}_linux -MAINTAINER= ports@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= Source code indenter and formatter for C, C++, C\#, and Java LICENSE= MIT @@ -16,19 +16,23 @@ LICENSE_FILE= ${WRKDIR}/astyle/LICENSE.md USES= compiler:c++11-lang dos2unix gmake ALL_TARGET= astyle -DOS2UNIX_GLOB= *.ini WRKSRC= ${WRKDIR}/astyle/build/${CHOSEN_COMPILER_TYPE} +DOS2UNIX_GLOB= *.ini + OPTIONS_DEFINE= DOCS EXAMPLES -do-configure: - @${REINPLACE_CMD} -e "s:%%CXX%%:${CXX}:" \ - ${WRKSRC}/${MAKEFILE} +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} + +do-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKDIR}/astyle/file/* ${STAGEDIR}${EXAMPLESDIR} diff --git a/devel/astyle/files/patch-build_clang_Makefile b/devel/astyle/files/patch-build_clang_Makefile new file mode 100644 index 000000000000..560ab96f0652 --- /dev/null +++ b/devel/astyle/files/patch-build_clang_Makefile @@ -0,0 +1,11 @@ +--- ../../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/pkg-descr b/devel/astyle/pkg-descr index 1e761decc6ad..170d4eac89d7 100644 --- a/devel/astyle/pkg-descr +++ b/devel/astyle/pkg-descr @@ -1,5 +1,24 @@ Artistic Style is a source code indenter, formatter, and beautifier for the C, -C++, C# and Java programming languages. It automatically re-indents and -re-formats source files and can be used from a command line. +C++, C++/CLI, Objective-C, C# and Java programming languages. + +When indenting source code, we as programmers have a tendency to use both spaces +and tab characters to create the wanted indentation. Moreover, some editors by +default insert spaces instead of tabs when pressing the tab key. Other editors +(Emacs for example) have the ability to "pretty up" lines by automatically +setting up the white space before the code on the line, possibly inserting +spaces in code that up to now used only tabs for indentation. + +The NUMBER of spaces for each tab character in the source code can change +between editors (unless the user sets up the number to his liking...). One of +the standard problems programmers face when moving from one editor to another is +that code containing both spaces and tabs, which was perfectly indented, +suddenly becomes a mess to look at. Even if you as a programmer take care to +ONLY use spaces or tabs, looking at other people's source code can still be +problematic. + +To address this problem, Artistic Style was created -- a filter written in C++ +that automatically re-indents and re-formats C / C++ / Objective-C / C++/CLI / C# +/ Java source files. It can be used from a command line, or it can be +incorporated as a library in another program. WWW: http://astyle.sourceforge.net/