pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
wip/c-news -- touch-up
Module Name: pkgsrc-wip
Committed By: Hauke Fath <hauke%NetBSD.org@localhost>
Pushed By: hauke
Date: Tue Oct 28 10:46:03 2025 +0100
Changeset: c4b27ef153a3de1e563768500fee1efba9f4ed5b
Modified Files:
c-news/Makefile
c-news/Makefile.common
c-news/distinfo
Log Message:
wip/c-news -- touch-up
Update distfile hashes
Apply pkglint suggestions
Whitespace
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c4b27ef153a3de1e563768500fee1efba9f4ed5b
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
c-news/Makefile | 19 +++++++++---------
c-news/Makefile.common | 23 +++++++++++----------
c-news/distinfo | 54 +++++++++++++++++++++++++++++++++-----------------
3 files changed, 58 insertions(+), 38 deletions(-)
diffs:
diff --git a/c-news/Makefile b/c-news/Makefile
index 4aa3cd7bdb..adbbe2d014 100644
--- a/c-news/Makefile
+++ b/c-news/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2015/02/01 21:01:33 hfath Exp $
+# $NetBSD$
DISTNAME= c-news
PKGNAME= c-news-CR-7
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= news
MASTER_SITES= ftp://ftp.cs.toronto.edu/pub/c-news/ \
ftp://ftp.funet.fi/pub/unix/news/cnews/ \
@@ -32,7 +32,7 @@ LICENSE= c-news-license
LICENSE_FILE= c-news-license
# Not yet 64 bit time_t safe
-NOT_FOR_PLATFORM= NetBSD-5.99.*-* NetBSD-[6-9]*-*
+NOT_FOR_PLATFORM= NetBSD-5.99.*-* NetBSD-[6-9].*-* NetBSD-[1-9][1-9].*-*
MAKE_JOBS_SAFE= no
@@ -53,18 +53,18 @@ INSTALL_UNSTRIPPED= yes
.include "../../mk/bsd.prefs.mk"
-.if (${OPSYS} == "NetBSD" && empty(OS_VERSION:M[0123].*))
-DEPENDS+= uucp-[1-9]*:../../net/uucp
+.if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M[0123].*)
+DEPENDS+= uucp-[0-9]*:../../net/uucp
.endif
-.if !empty(PKGSRC_RUN_TEST:M[Yy][Ee][Ss])
+.if ${PKGSRC_RUN_TEST:U:tl} == yes
TEST_TARGET= regression
.endif
USE_TOOLS+= perl:run
REPLACE_PERL+= ${PGPVERIFY:Q}
-.if (${OPSYS} == "SunOS")
+.if ${OPSYS} == "SunOS"
# groff & pic
USE_TOOLS+= groff
PIC?= gpic
@@ -94,6 +94,9 @@ NOTEBOOK= locking.more makefiles.more locking.ps makefiles.ps
PGPVERIFY?= pgpverify-1.12
+INSTALLATION_DIRS+= share/doc/cnews
+INSTALLATION_DIRS+= share/examples/cnews
+
pre-patch:
${CP} ${DISTDIR}/${DIST_SUBDIR}/${PGPVERIFY:Q} ${WRKSRC}/${PGPVERIFY:Q}
@@ -148,7 +151,6 @@ do-install:
${INSTALL_MAN} ${WRKSRC}/man/${i:Q} ${PREFIX}/${PKGMANDIR}/man8/${i:R:Q}.8
.endfor
# install docs:
- ${INSTALL_MAN_DIR} ${PREFIX}/share/doc/cnews
.for i in ${DOCS}
${INSTALL_MAN} ${WRKSRC}/doc/${i:Q} ${PREFIX}/share/doc/cnews
.endfor
@@ -156,7 +158,6 @@ do-install:
${INSTALL_MAN} ${WRKSRC}/notebook/${i:Q} ${PREFIX}/share/doc/cnews
.endfor
# install sample config files
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/cnews
set -e; \
for FILE in `ls -1 ${WRKSRC}/conf/*.eg` \
${WRKSRC}/conf/cron.proto ${WRKSRC}/conf/organization; do \
diff --git a/c-news/Makefile.common b/c-news/Makefile.common
index bb789fa27b..6f48b1d6c1 100644
--- a/c-news/Makefile.common
+++ b/c-news/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2009/03/05 14:17:48 hfath Exp $
+# $NetBSD$
# used by wip/nnrpd/Makefile
CNEWSBIN?= ${PREFIX}/cnews
@@ -7,21 +7,19 @@ CNEWSCTL?= ${CNEWSDATA}/etc
CNEWSARTS?= ${CNEWSDATA}/articles
CNEWSOV?= ${CNEWSDATA}/overview
CNEWSMASTER?= usenet
+
NEWSUID?= news
NEWSGID?= news
-PLIST_SUBST+= CNEWSDATA=${CNEWSDATA:S=${PREFIX}/==}
-PLIST_SUBST+= CNEWSBIN=${CNEWSBIN:S=${PREFIX}/==}
-PLIST_SUBST+= CNEWSCTL=${CNEWSCTL:S=${PREFIX}/==}
-PLIST_SUBST+= CNEWSARTS=${CNEWSARTS:S=${PREFIX}/==}
-PLIST_SUBST+= CNEWSOV=${CNEWSOV:S=${PREFIX}/==}
+PLIST_SUBST+= CNEWSDATA=${CNEWSDATA:S=${PREFIX}/==}
+PLIST_SUBST+= CNEWSBIN=${CNEWSBIN:S=${PREFIX}/==}
+PLIST_SUBST+= CNEWSCTL=${CNEWSCTL:S=${PREFIX}/==}
+PLIST_SUBST+= CNEWSARTS=${CNEWSARTS:S=${PREFIX}/==}
+PLIST_SUBST+= CNEWSOV=${CNEWSOV:S=${PREFIX}/==}
MESSAGE_SUBST+= CNEWSARTS=${CNEWSARTS:Q}
MESSAGE_SUBST+= CNEWSCTL=${CNEWSCTL:Q}
-# Given foo=${bar}, replace @foo@ with ${bar}.
-#
-FILES_SUBST+= PREFIX=${PREFIX}
FILES_SUBST+= CNEWSCFLAGS=${CFLAGS:M*:Q}
FILES_SUBST+= CNEWSDATA=${CNEWSDATA:Q}
FILES_SUBST+= CNEWSBIN=${CNEWSBIN:Q}
@@ -31,19 +29,22 @@ FILES_SUBST+= CNEWSOV=${CNEWSOV:Q}
FILES_SUBST+= CNEWSMASTER=${CNEWSMASTER:Q}
FILES_SUBST+= CNEWSUID=${NEWSUID:Q}
FILES_SUBST+= CNEWSGID=${NEWSGID:Q}
+
.if ${OPSYS} == "SunOS"
# We want awk to be nawk, and we want uucp
FILES_SUBST+= CNEWSPATH="/usr/xpg4/bin:/usr/bin:${PREFIX}/bin"
.else
FILES_SUBST+= CNEWSPATH="/bin:/usr/bin:${PREFIX}/bin"
.endif
+
# statfs(2) or statvfs(2)? NetBSD switched to the latter in 2.0D
-.if (${OPSYS} == "NetBSD" && !(empty(OS_VERSION:M[01].*) && \
+.if ${OPSYS} == "NetBSD" && ! empty(OS_VERSION:M[01].*) && \
empty(OS_VERSION:M2.[012345678]) && \
- empty(OS_VERSION:M2.0[ABC])))
+ empty(OS_VERSION:M2.0[ABC])
FILES_SUBST+= CNEWSDFTYPE="statfs"
.else
# Make sure this suits ${YOUR_OS}...
FILES_SUBST+= CNEWSDFTYPE="statvfs"
.endif
+
FILES_SUBST_SED= ${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/-e s!@/}
diff --git a/c-news/distinfo b/c-news/distinfo
index 653ff4d4bd..c78735596d 100644
--- a/c-news/distinfo
+++ b/c-news/distinfo
@@ -1,40 +1,58 @@
$NetBSD: distinfo,v 1.8 2011/08/17 19:56:09 hfath Exp $
-RMD160 (c-news/c-news-patch-bunzip2) = 94919dcc35af671a84af726b4687938b93efe5a2
+BLAKE2s (c-news/c-news-patch-bunzip2) = fc0336e465dd9ae2cdc64c182f1b3501545b00031f4f06e2c478ba9a2806c139
+SHA512 (c-news/c-news-patch-bunzip2) = 63348126f3b21e1594ba9e2bc1dfcb828cf437be8bb56a2a498f9695e1f49c928bb5d4dc3b2b68bdb121dd69cad73bd21881ce96def8955242299809e736b8a7
Size (c-news/c-news-patch-bunzip2) = 1953 bytes
-RMD160 (c-news/c-news-patch-ctl-more) = c29da9ce50e4bfcb57a30ddd1d98fd51ffb0890b
+BLAKE2s (c-news/c-news-patch-ctl-more) = 882ad8c663f04cd9aa9eed252b4bbf4447c43935f0f83543d854cd7b5fd9c206
+SHA512 (c-news/c-news-patch-ctl-more) = 96363f84bbb72f215c8cd2f6dc1bd099dcdd97be0dcf4d0c54ba89d30cb7dbecc07ec9e695946e98a18ab4ffbbd0c503afec0332cbc3eaaf959db0057fc03f89
Size (c-news/c-news-patch-ctl-more) = 5812 bytes
-RMD160 (c-news/c-news-patch-ctl-pgp3) = cb7c490046e377c55851a2b3582af7a203b567d7
+BLAKE2s (c-news/c-news-patch-ctl-pgp3) = bb038d2d2d8036bce194528faa100445ec6acf4a4b4118570f1654453103d71d
+SHA512 (c-news/c-news-patch-ctl-pgp3) = c223f68ec8c38367a1acebca08c4351620753576c014bb777a3a300ae57318eecd59f531884f79f7f4cba7cc08b7b8b833a8194e1e5ab214ef6e825f1f593e93
Size (c-news/c-news-patch-ctl-pgp3) = 14520 bytes
-RMD160 (c-news/c-news-patch-ctl-regexp) = f6bd6c982acb6f39fc0082d2bbfa56b710ae17d5
+BLAKE2s (c-news/c-news-patch-ctl-regexp) = daee258e35116bec8a9d42da96356b9c1bd4fcfe87aea5610d7f99b2e4fe5b67
+SHA512 (c-news/c-news-patch-ctl-regexp) = f31e0f58b0892860fe8cec2d3225ff7ef51fd3b9e62c60daa26c795c5625b6cf2e5aaffe8ad478cc6b16ac9a0f4d79981b4a7ddc02252e4f93aac36eef57cb88
Size (c-news/c-news-patch-ctl-regexp) = 1207 bytes
-RMD160 (c-news/c-news-patch-ctl-underscore) = 2fe5699c63a0a1439a17ead59e40db3ec3a4557d
+BLAKE2s (c-news/c-news-patch-ctl-underscore) = 7486afb586641417345439e4fbdf9481aa4ab0ea40c0979c257467078ea3dd65
+SHA512 (c-news/c-news-patch-ctl-underscore) = 1f2f3fcc3e484609851824d625a4890d4289677e97b5424da1b8e434833e3cbd56301b5caa61a87a04f94c9b055fea98e4e4289a06350d79c561b3df5b758f62
Size (c-news/c-news-patch-ctl-underscore) = 341 bytes
-RMD160 (c-news/c-news-patch-doexpire) = 16eea18afbeeefb18e647d6d7ffa65c251de95be
+BLAKE2s (c-news/c-news-patch-doexpire) = a297947c109a6f211749d0579fb3f5ea97df6bd29abbfbdd9d0b828fcb898f9a
+SHA512 (c-news/c-news-patch-doexpire) = 8e3c7d624d06b6c280c3c735b45ac7e1a1dc17de96f2f68c5ae5a6dae99910fc4a8aeda4bfc8c06c7ac6a410bb104a4616c40074297f4edae56cf51780aac655
Size (c-news/c-news-patch-doexpire) = 1035 bytes
-RMD160 (c-news/c-news-patch-expovguts.c) = 755264f3389e12408675a192d56a1ff3230b5ede
+BLAKE2s (c-news/c-news-patch-expovguts.c) = 526fbee34783f0b9505ec3566adfc95fd81e371d08392c874f7c48da964c2080
+SHA512 (c-news/c-news-patch-expovguts.c) = 26e0f729e19f66422433e0374d81ebb6d25f6942ae56b7b5be377d8d43bfdfe1d4a1f73d4b27b69082f0736653de4a99b337eb82c74f08f1166acd50631eaa07
Size (c-news/c-news-patch-expovguts.c) = 646 bytes
-RMD160 (c-news/c-news-patch-fileart.c) = a5287e2ddfe4120d8ce7e3b88aad26013301e2de
+BLAKE2s (c-news/c-news-patch-fileart.c) = d4a760b58d9b92586c9c977ad3a4ea5ae005a6cb197c24fa6f07d098484acf3e
+SHA512 (c-news/c-news-patch-fileart.c) = 7ff8b5e26eabc50f3a509702dd768c134f88de95ab027a708295986d99a93552661a317668c09d1e36126a33f538605b536713e0c9e0af6b4fc4d15f9c239355
Size (c-news/c-news-patch-fileart.c) = 841 bytes
-RMD160 (c-news/c-news-patch-gawk3) = 820e5ca3adb022392cab250bc3bf395577dddb7c
+BLAKE2s (c-news/c-news-patch-gawk3) = 2828cd6b2c7b8c0add9f561efd402dc59e63dbefd5074b4ad297723f6e702d39
+SHA512 (c-news/c-news-patch-gawk3) = 366654cd052a4a9fcc308186bdfe44970a176fc3563f088ac51542484055cefbed220e59a94cb422386096e5b4d96e22476e53a14d064ae9771cc4c6b5595c13
Size (c-news/c-news-patch-gawk3) = 1393 bytes
-RMD160 (c-news/c-news-patch-inews-path) = 782b416d61d9faa8e52045e4ecf36a7de68c3c68
+BLAKE2s (c-news/c-news-patch-inews-path) = 9a38d849bf6840c05a519aa5f15e751ad13ac3d97ba1dd37d6452e831de830a2
+SHA512 (c-news/c-news-patch-inews-path) = 7adf5a6bb35cad097c1dae7e9f413411a65df191f014d9cad992980a6cbec6e4fdc8baa37fe13a6dc981de537386342d1487ad6696d3e64ef2fccd987b1050e0
Size (c-news/c-news-patch-inews-path) = 355 bytes
-RMD160 (c-news/c-news-patch-namecheck.awk) = 8c5a0e3668c0058d0604fe99bd9634134a069a69
+BLAKE2s (c-news/c-news-patch-namecheck.awk) = 81bc5dcf63dd94866bd4a207406be66a29f11e9c75aa8f54ad0b1ea0536806f4
+SHA512 (c-news/c-news-patch-namecheck.awk) = 2cd6d93cb0a7de1d11e5b729e8fe1b9947c138dfdb537944c3e11a93c14252a4277778a2f7a6c171dd8ec62d8c9ce329159395b1c192597dc4cb94c2201d58ae
Size (c-news/c-news-patch-namecheck.awk) = 796 bytes
-RMD160 (c-news/c-news-patch-newsrun) = 9a8561c81016dfe1000474462547b06e4ab831a1
+BLAKE2s (c-news/c-news-patch-newsrun) = d2cea1a6fb152b286b5f17b6d7ffd43a1898dcd9bb84d5e18da69d11092a8c3c
+SHA512 (c-news/c-news-patch-newsrun) = eb76d1fa58ab08c26050f01767186c9b4d0c9e094ea93d821a3e38cc5294b40dc309e63693b23d7482dee6692f83285212b115f9b628d47d6ec235cefbb905fe
Size (c-news/c-news-patch-newsrun) = 746 bytes
-RMD160 (c-news/c-news-patch-pgpverify-1.12-perl4) = 783abfe830931c7be59daef57229b250cbb650a9
+BLAKE2s (c-news/c-news-patch-pgpverify-1.12-perl4) = d510569060cb8f9bc7f16cf87450bb73eec150ddb4b9a841ea719615d1aaeb1e
+SHA512 (c-news/c-news-patch-pgpverify-1.12-perl4) = 8dc713612b04d283812d0ca7f22a2b25d8abe09e142100c082a0725ecdda9c07d0548b1f3f828e4d0d6e7b7fbb494bdcd5004e73e21b24ac8c03a8032c635c84
Size (c-news/c-news-patch-pgpverify-1.12-perl4) = 1450 bytes
-RMD160 (c-news/c-news-patch-queuelen.tay) = e3531cdc0936d13d98b587beec8ae98278948862
+BLAKE2s (c-news/c-news-patch-queuelen.tay) = 5ca19cc7bc0d819c3b2bbfed6e0e6ff31111e407310e2e1918e854b51134b228
+SHA512 (c-news/c-news-patch-queuelen.tay) = 70cc86a4c5bc9f5701452280e835c52ebe9248d024fc022aeb383ea03883954e71d60a5e885ae1a8141aa00ff240e69ffa8db61bee9b97800498fbf14b3ee6e9
Size (c-news/c-news-patch-queuelen.tay) = 942 bytes
-RMD160 (c-news/c-news-patch-sendbatches) = b146c3d7c4592b2d1276b0ec76cca25f23c971cf
+BLAKE2s (c-news/c-news-patch-sendbatches) = b0b51e2af31bcc2d0fa0804196f373727b659dfdcd4210f69deea69821d310cc
+SHA512 (c-news/c-news-patch-sendbatches) = 1b07f8eb3cafb4be97b54b37522517adca2fa936a05f238c48afa85c6e2809a98a5e1e9a17032ba7b795fda669713111887650d796f101a01f61d2f0fb8c706b
Size (c-news/c-news-patch-sendbatches) = 326 bytes
-RMD160 (c-news/c-news-patch-y2k-2) = d4e304c9c21ac4e5ff91360c3c89f42e24cb2936
+BLAKE2s (c-news/c-news-patch-y2k-2) = a3a2c6d443915be1d29142a235a3ba065b9c0e65ea1da78a2ee0e96bb976577f
+SHA512 (c-news/c-news-patch-y2k-2) = 5277945d7d185510ceca9c949df9dbf4b6ef3a949ee93ab5e21e23b9b3e912e41268012d14a5216fcbd15a2416392f6d03f17f3aae121d42f545ce9eb162d1b8
Size (c-news/c-news-patch-y2k-2) = 1459 bytes
-RMD160 (c-news/c-news.tar.Z) = 5f222302bea9c145d438fd1edd7366cd69ce5c30
+BLAKE2s (c-news/c-news.tar.Z) = 99d6606c14c48cf3dd3d93acd03fe3642739c59dff9871b68870c56fb9bedce9
+SHA512 (c-news/c-news.tar.Z) = 258320ec4e7c142c3f90649cba9d2ffa405b6c41bf313871d28e63cce781f94a8067232a29260162c013d00a0be1ee0e77c079fc0d22a969e495d2d594783862
Size (c-news/c-news.tar.Z) = 676481 bytes
-RMD160 (c-news/pgpverify-1.12) = 25b6b8181a36fa9863593c8b5c2207f8d30dff26
+BLAKE2s (c-news/pgpverify-1.12) = c6460bac7f75962d2beb58b054cd755900deab787c4db845a04ec099b01b6de3
+SHA512 (c-news/pgpverify-1.12) = 8df6ab638cbc6d4209177cb32c37d81c00bc201befb81cd78ecfca94315b255b141a1acebe7e003af321e5096d2f813e085247872c9c81c478649850f963a102
Size (c-news/pgpverify-1.12) = 16510 bytes
SHA1 (patch-aa) = d5826216b3c83d8b98fcaead5d958fd40dcae03b
SHA1 (patch-ab) = 7401dfb883f0148ea4f3d1813c87d9c0b01a6422
Home |
Main Index |
Thread Index |
Old Index