From c97254b75be473959b0520989644e5dc4a3a87db Mon Sep 17 00:00:00 2001 From: "C. McEnroe" Date: Mon, 28 Dec 2020 02:19:59 +0000 Subject: Replace cgit-patched with cgit-causal-agency --- Makefile | 2 +- devel/cgit-causal-agency/Makefile | 73 +++++++++++++++++++++++++++ devel/cgit-causal-agency/distinfo | 5 ++ devel/cgit-causal-agency/files/pkg-message.in | 18 +++++++ devel/cgit-causal-agency/pkg-descr | 4 ++ devel/cgit-causal-agency/pkg-plist | 21 ++++++++ devel/cgit-patched/Makefile | 71 -------------------------- devel/cgit-patched/distinfo | 5 -- devel/cgit-patched/files/pkg-message.in | 18 ------- devel/cgit-patched/pkg-descr | 4 -- devel/cgit-patched/pkg-plist | 21 -------- 11 files changed, 122 insertions(+), 120 deletions(-) create mode 100644 devel/cgit-causal-agency/Makefile create mode 100644 devel/cgit-causal-agency/distinfo create mode 100644 devel/cgit-causal-agency/files/pkg-message.in create mode 100644 devel/cgit-causal-agency/pkg-descr create mode 100644 devel/cgit-causal-agency/pkg-plist delete mode 100644 devel/cgit-patched/Makefile delete mode 100644 devel/cgit-patched/distinfo delete mode 100644 devel/cgit-patched/files/pkg-message.in delete mode 100644 devel/cgit-patched/pkg-descr delete mode 100644 devel/cgit-patched/pkg-plist diff --git a/Makefile b/Makefile index b80e429..d3bcbc6 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ PORTSDIR = /usr/ports -PORTS += devel/cgit-patched +PORTS += devel/cgit-causal-agency PORTS += irc/catgirl PORTS += irc/litterbox PORTS += irc/pounce diff --git a/devel/cgit-causal-agency/Makefile b/devel/cgit-causal-agency/Makefile new file mode 100644 index 0000000..bc112ea --- /dev/null +++ b/devel/cgit-causal-agency/Makefile @@ -0,0 +1,73 @@ +# $FreeBSD: head/devel/cgit/Makefile 523699 2020-01-21 01:37:59Z meta $ + +PORTNAME= cgit-causal-agency +PORTVERSION= 1.2.3 +CONFLICTS_INSTALL= cgit +CATEGORIES= devel www +MASTER_SITES= https://git.causal.agency/src/snapshot/:src \ + KERNEL_ORG/software/scm/git:git +DISTFILES= src-${SRC_VERSION}${EXTRACT_SUFX}:src \ + git-${GIT_VERSION}${EXTRACT_SUFX}:git +DISTNAME= src-${SRC_VERSION} + +MAINTAINER= june@causal.agency +COMMENT= Fast, lightweight web frontend for Git repositories + +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + +TEST_DEPENDS= msgfmt:devel/gettext-tools + +SRC_VERSION= db652695744cc54584296b54289166b4b21ac407 +GIT_VERSION= 2.25.1 +WRKSRC_SUBDIR= www/git.causal.agency/cgit + +USES= cpe gmake iconv perl5 python:3.2+,env shebangfix ssl +CPE_VENDOR= lars_hjemli +USE_PERL5= test +SHEBANG_FILES= filters/email-gravatar.py \ + filters/html-converters/md2html \ + filters/html-converters/rst2html \ + filters/syntax-highlighting.py +WWWDIR= ${PREFIX}/www/cgit + +CFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} +MAKE_ARGS+= CGIT_SCRIPT_PATH=${WWWDIR} CGIT_CONFIG=${PREFIX}/etc/cgitrc \ + prefix=${PREFIX} NO_GETTEXT=1 NO_LUA=1 NO_R_TO_GCC_LINKER=1 V=1 + +SUB_FILES= pkg-message + +PORTDOCS= cgitrc.5.txt + +OPTIONS_DEFINE= DOCS ASCIIDOC +OPTIONS_DEFAULT= ASCIIDOC +OPTIONS_SUB= yes + +ASCIIDOC_DESC= Use asciidoc to preprocess man page +ASCIIDOC_BUILD_DEPENDS= a2x:textproc/asciidoc + +post-extract: + @${MV} ${WRKDIR}/git-${GIT_VERSION} ${WRKSRC}/git + +post-patch: + @${REINPLACE_CMD} -e 's/^\(GIT_VER =\).*$$/\1 ${GIT_VERSION}/' \ + ${WRKSRC}/Makefile + + @${REINPLACE_CMD} -e 's/-liconv/${ICONV_LIB}/' \ + -e "s|\(ALL_CFLAGS =\)|\1 -I${OPENSSLINC}|g" \ + -e "s|\(ALL_LDFLAGS =\)|\1 -L${OPENSSLLIB}|g" \ + ${WRKSRC}/git/Makefile + +post-install: + ${STRIP_CMD} ${STAGEDIR}${WWWDIR}/cgit.cgi + +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} + +post-install-ASCIIDOC-on: + a2x --doctype manpage --format manpage ${WRKSRC}/cgitrc.5.txt + ${INSTALL_MAN} ${WRKSRC}/cgitrc.5 ${STAGEDIR}${PREFIX}/man/man5 + +.include diff --git a/devel/cgit-causal-agency/distinfo b/devel/cgit-causal-agency/distinfo new file mode 100644 index 0000000..f0c91aa --- /dev/null +++ b/devel/cgit-causal-agency/distinfo @@ -0,0 +1,5 @@ +TIMESTAMP = 1609119689 +SHA256 (src-db652695744cc54584296b54289166b4b21ac407.tar.gz) = 73778c2a6d544fea181c976aa392d90df735cb5c9cbd916c4b03aa60fa9c6fdc +SIZE (src-db652695744cc54584296b54289166b4b21ac407.tar.gz) = 757713 +SHA256 (git-2.25.1.tar.gz) = 4999ae0ee6cc7dfb280d7051e39a82a5630b00c1d8cd54890f07b4b7193d25aa +SIZE (git-2.25.1.tar.gz) = 9026631 diff --git a/devel/cgit-causal-agency/files/pkg-message.in b/devel/cgit-causal-agency/files/pkg-message.in new file mode 100644 index 0000000..0190639 --- /dev/null +++ b/devel/cgit-causal-agency/files/pkg-message.in @@ -0,0 +1,18 @@ +[ +{ type: install + message: < + AllowOverride None + Options +ExecCGI + Require all granted + + +Documentation and sample configuration can be found +in %%DOCSDIR%%/cgitrc.5.txt. +EOM +} +] diff --git a/devel/cgit-causal-agency/pkg-descr b/devel/cgit-causal-agency/pkg-descr new file mode 100644 index 0000000..1a9d828 --- /dev/null +++ b/devel/cgit-causal-agency/pkg-descr @@ -0,0 +1,4 @@ +cgit is a fast web interface for the Git SCM, using a built-in cache to +decrease server I/O pressure. + +WWW: https://git.zx2c4.com/cgit/about/ diff --git a/devel/cgit-causal-agency/pkg-plist b/devel/cgit-causal-agency/pkg-plist new file mode 100644 index 0000000..765565f --- /dev/null +++ b/devel/cgit-causal-agency/pkg-plist @@ -0,0 +1,21 @@ +lib/cgit/filters/about-formatting.sh +lib/cgit/filters/commit-links.sh +lib/cgit/filters/email-gravatar.lua +lib/cgit/filters/email-gravatar.py +lib/cgit/filters/email-libravatar.lua +lib/cgit/filters/file-authentication.lua +lib/cgit/filters/gentoo-ldap-authentication.lua +lib/cgit/filters/html-converters/man2html +lib/cgit/filters/html-converters/md2html +lib/cgit/filters/html-converters/rst2html +lib/cgit/filters/html-converters/txt2html +lib/cgit/filters/owner-example.lua +lib/cgit/filters/simple-authentication.lua +lib/cgit/filters/syntax-highlighting.py +lib/cgit/filters/syntax-highlighting.sh +%%ASCIIDOC%%man/man5/cgitrc.5.gz +%%WWWDIR%%/cgit.cgi +%%WWWDIR%%/cgit.css +%%WWWDIR%%/cgit.png +%%WWWDIR%%/favicon.ico +%%WWWDIR%%/robots.txt diff --git a/devel/cgit-patched/Makefile b/devel/cgit-patched/Makefile deleted file mode 100644 index 670897e..0000000 --- a/devel/cgit-patched/Makefile +++ /dev/null @@ -1,71 +0,0 @@ -# $FreeBSD: head/devel/cgit/Makefile 523699 2020-01-21 01:37:59Z meta $ - -PORTNAME= cgit-patched -PORTVERSION= 1.2.3p3 -CONFLICTS_INSTALL= cgit -CATEGORIES= devel www -MASTER_SITES= https://git.causal.agency/cgit/snapshot/:cgit \ - KERNEL_ORG/software/scm/git:git -DISTFILES= cgit-${PORTVERSION}${EXTRACT_SUFX}:cgit \ - git-${GIT_VERSION}${EXTRACT_SUFX}:git -DISTNAME= cgit-${DISTVERSION} - -MAINTAINER= june@causal.agency -COMMENT= Fast, lightweight web frontend for Git repositories - -LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING - -TEST_DEPENDS= msgfmt:devel/gettext-tools - -GIT_VERSION= 2.25.0 -USES= cpe gmake iconv perl5 python:3.2+,env shebangfix ssl -CPE_VENDOR= lars_hjemli -USE_PERL5= test -SHEBANG_FILES= filters/email-gravatar.py \ - filters/html-converters/md2html \ - filters/html-converters/rst2html \ - filters/syntax-highlighting.py -WWWDIR= ${PREFIX}/www/cgit - -CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} -MAKE_ARGS+= CGIT_SCRIPT_PATH=${WWWDIR} CGIT_CONFIG=${PREFIX}/etc/cgitrc \ - prefix=${PREFIX} NO_GETTEXT=1 NO_LUA=1 NO_R_TO_GCC_LINKER=1 V=1 - -SUB_FILES= pkg-message - -PORTDOCS= cgitrc.5.txt - -OPTIONS_DEFINE= DOCS ASCIIDOC -OPTIONS_DEFAULT= ASCIIDOC -OPTIONS_SUB= yes - -ASCIIDOC_DESC= Use asciidoc to preprocess man page -ASCIIDOC_BUILD_DEPENDS= a2x:textproc/asciidoc - -post-extract: - @${RMDIR} ${WRKSRC}/git - @${MV} ${WRKDIR}/git-${GIT_VERSION} ${WRKSRC}/git - -post-patch: - @${REINPLACE_CMD} -e 's/^\(GIT_VER =\).*$$/\1 ${GIT_VERSION}/' \ - ${WRKSRC}/Makefile - - @${REINPLACE_CMD} -e 's/-liconv/${ICONV_LIB}/' \ - -e "s|\(ALL_CFLAGS =\)|\1 -I${OPENSSLINC}|g" \ - -e "s|\(ALL_LDFLAGS =\)|\1 -L${OPENSSLLIB}|g" \ - ${WRKSRC}/git/Makefile - -post-install: - ${STRIP_CMD} ${STAGEDIR}${WWWDIR}/cgit.cgi - -post-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} - -post-install-ASCIIDOC-on: - a2x --doctype manpage --format manpage ${WRKSRC}/cgitrc.5.txt - ${INSTALL_MAN} ${WRKSRC}/cgitrc.5 ${STAGEDIR}${PREFIX}/man/man5 - -.include diff --git a/devel/cgit-patched/distinfo b/devel/cgit-patched/distinfo deleted file mode 100644 index 0a951b5..0000000 --- a/devel/cgit-patched/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -TIMESTAMP = 1595538673 -SHA256 (cgit-1.2.3p3.tar.gz) = ef8859b47c150ceeff27d577a3ff1d2dc5644468f532bc4e660d47feae26a646 -SIZE (cgit-1.2.3p3.tar.gz) = 111767 -SHA256 (git-2.25.0.tar.gz) = a98c9b96d91544b130f13bf846ff080dda2867e77fe08700b793ab14ba5346f6 -SIZE (git-2.25.0.tar.gz) = 9023390 diff --git a/devel/cgit-patched/files/pkg-message.in b/devel/cgit-patched/files/pkg-message.in deleted file mode 100644 index 0190639..0000000 --- a/devel/cgit-patched/files/pkg-message.in +++ /dev/null @@ -1,18 +0,0 @@ -[ -{ type: install - message: < - AllowOverride None - Options +ExecCGI - Require all granted - - -Documentation and sample configuration can be found -in %%DOCSDIR%%/cgitrc.5.txt. -EOM -} -] diff --git a/devel/cgit-patched/pkg-descr b/devel/cgit-patched/pkg-descr deleted file mode 100644 index 1a9d828..0000000 --- a/devel/cgit-patched/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -cgit is a fast web interface for the Git SCM, using a built-in cache to -decrease server I/O pressure. - -WWW: https://git.zx2c4.com/cgit/about/ diff --git a/devel/cgit-patched/pkg-plist b/devel/cgit-patched/pkg-plist deleted file mode 100644 index 765565f..0000000 --- a/devel/cgit-patched/pkg-plist +++ /dev/null @@ -1,21 +0,0 @@ -lib/cgit/filters/about-formatting.sh -lib/cgit/filters/commit-links.sh -lib/cgit/filters/email-gravatar.lua -lib/cgit/filters/email-gravatar.py -lib/cgit/filters/email-libravatar.lua -lib/cgit/filters/file-authentication.lua -lib/cgit/filters/gentoo-ldap-authentication.lua -lib/cgit/filters/html-converters/man2html -lib/cgit/filters/html-converters/md2html -lib/cgit/filters/html-converters/rst2html -lib/cgit/filters/html-converters/txt2html -lib/cgit/filters/owner-example.lua -lib/cgit/filters/simple-authentication.lua -lib/cgit/filters/syntax-highlighting.py -lib/cgit/filters/syntax-highlighting.sh -%%ASCIIDOC%%man/man5/cgitrc.5.gz -%%WWWDIR%%/cgit.cgi -%%WWWDIR%%/cgit.css -%%WWWDIR%%/cgit.png -%%WWWDIR%%/favicon.ico -%%WWWDIR%%/robots.txt -- cgit 1.4.1