wendzelnntpd: Package builds now

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: wendzelnntpd: Package builds now
From: Michael Baeuerle (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Mon, 7 Jul 2025 11:35:28 +0000
Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Mon Jul 7 13:31:52 2025 +0200
Changeset:	3d17bb03095fa8266913d1354b5b8626a27daea4

Modified Files:
	wendzelnntpd/Makefile
	wendzelnntpd/PLIST
	wendzelnntpd/distinfo
	wendzelnntpd/patches/patch-Makefile

Log Message:
wendzelnntpd: Package builds now

- Fix PLIST and patch for Makefile
  Based on proposals from Ole Ludwig.
- Fix pkglint errors

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=3d17bb03095fa8266913d1354b5b8626a27daea4

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 wendzelnntpd/Makefile               |  7 ++--
 wendzelnntpd/PLIST                  |  3 ++
 wendzelnntpd/distinfo               |  2 +-
 wendzelnntpd/patches/patch-Makefile | 82 ++++++++++++++++++-------------------
 4 files changed, 48 insertions(+), 46 deletions(-)

diffs:
diff --git a/wendzelnntpd/Makefile b/wendzelnntpd/Makefile
index 855d02e38e..cdfa0285fc 100644
--- a/wendzelnntpd/Makefile
+++ b/wendzelnntpd/Makefile
@@ -1,13 +1,13 @@
 # $NetBSD$
 
 #DISTNAME=		v2.1.3
-#PKGNAME=		wendzelnntpd-${DISTNAME:S/v//}
 DISTNAME=		wendzelnntpd-2.2.0git
+#PKGNAME=		wendzelnntpd-${DISTNAME:S/v//}
 CATEGORIES=		news
 #MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=wendzelnntpd/}
 MASTER_SITES=		${MASTER_SITE_GITHUB:=cdpxe/}
-#GITHUB_RELEASE=	v${PKGVERSION_NOREV}
 GITHUB_TAG=		73d8e69871ff09444b6cf5aa089df5ce06112758
+#GITHUB_RELEASE=	v${PKGVERSION_NOREV}
 
 MAINTAINER=		micha%NetBSD.org@localhost
 HOMEPAGE=		https://sourceforge.net/projects/wendzelnntpd
@@ -29,7 +29,8 @@ SUBST_SED.make+=	-e 's,$$(DESTDIR),$$(DESTDIR)$$(PREFIX),g'
 # Directory for example config file
 FAKECDIR=		${DESTDIR}${PREFIX}/share/examples/wendzelnntpd
 
-INSTALLATION_DIRS=	sbin share/doc/wendzelnntpd ${PKGMANDIR}/man8
+INSTALLATION_DIRS=	sbin share/doc/wendzelnntpd ${PKGMANDIR}/man8 \
+			var/spool/news/wendzelnntpd
 SPECIAL_PERMS+=		sbin/wendzelnntpd \
 			${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755
 SPECIAL_PERMS+=		sbin/wendzelnntpadm \
diff --git a/wendzelnntpd/PLIST b/wendzelnntpd/PLIST
index ab95587017..5d0e8fb188 100644
--- a/wendzelnntpd/PLIST
+++ b/wendzelnntpd/PLIST
@@ -16,6 +16,8 @@ share/doc/wendzelnntpd/docs/docs.html
 share/doc/wendzelnntpd/docs/footnode.html
 share/doc/wendzelnntpd/docs/footnote.png
 share/doc/wendzelnntpd/docs/img1.png
+share/doc/wendzelnntpd/docs/img1.svg
+share/doc/wendzelnntpd/docs/img2.svg
 share/doc/wendzelnntpd/docs/index.html
 share/doc/wendzelnntpd/docs/index.png
 share/doc/wendzelnntpd/docs/next.png
@@ -28,3 +30,4 @@ share/doc/wendzelnntpd/docs/up_g.png
 share/doc/wendzelnntpd/mysql_db_struct.sql
 share/doc/wendzelnntpd/usenet.db_struct
 share/examples/wendzelnntpd/wendzelnntpd.conf
+var/spool/news/wendzelnntpd/usenet.db
diff --git a/wendzelnntpd/distinfo b/wendzelnntpd/distinfo
index bf32ce9a2e..2ec7f3929f 100644
--- a/wendzelnntpd/distinfo
+++ b/wendzelnntpd/distinfo
@@ -3,5 +3,5 @@ $NetBSD$
 BLAKE2s (wendzelnntpd-2.2.0git-73d8e69871ff09444b6cf5aa089df5ce06112758.tar.gz) = c012ea8fafe28b9d0260277c9a59a31f927bcd24f200c6447f3a815413bc8101
 SHA512 (wendzelnntpd-2.2.0git-73d8e69871ff09444b6cf5aa089df5ce06112758.tar.gz) = 0dc1ed9c9b9ee8b990029bbeaac3996d904d653392ce68b3d7b95f51027e0c594965dae109a7bb850a45bdcbb9db50eeb03b395f9c907c29c30d652644759c65
 Size (wendzelnntpd-2.2.0git-73d8e69871ff09444b6cf5aa089df5ce06112758.tar.gz) = 5194773 bytes
-SHA1 (patch-Makefile) = 6939a29c52fb3c8e6156fe1a7eb90051bef76452
+SHA1 (patch-Makefile) = 0745c7754a8cab59dbff29177927f63aa3f637f7
 SHA1 (patch-configure) = 545200aa618f08b72ef35e18bc212b83ae30d0b3
diff --git a/wendzelnntpd/patches/patch-Makefile b/wendzelnntpd/patches/patch-Makefile
index 13598c3224..e2225db9ad 100644
--- a/wendzelnntpd/patches/patch-Makefile
+++ b/wendzelnntpd/patches/patch-Makefile
@@ -5,45 +5,42 @@ Install man pages to "man" instead of "share/man" directory.
 
 --- Makefile.orig	2024-09-10 17:15:06.000000000 +0000
 +++ Makefile
-@@ -105,36 +105,36 @@ wendzelnntpadm : cdpnntpadm.o db_abstrac
- install : bin/wendzelnntpd bin/wendzelnntpadm
- 	if [ ! -d $(FAKECDIR) ]; then install -d -m 0755 $(FAKECDIR); fi
- 	if [ ! -d $(FAKECDIR)/etc ]; then install -d -m 0755 $(FAKECDIR)/etc; fi
--	if [ ! -d $(DESTDIR)/sbin ]; then install -d -m 0755 $(DESTDIR)/sbin; fi
--	if [ ! -d $(DESTDIR)/share ]; then install -d -m 0755 $(DESTDIR)/share; fi
--	if [ ! -d $(DESTDIR)/share/doc ]; then install -d -m 0755 $(DESTDIR)/share/doc; fi
--	if [ ! -d $(DESTDIR)/share/doc/wendzelnntpd ]; then install -d -m 0755 $(DESTDIR)/share/doc/wendzelnntpd; fi
+@@ -5,7 +5,7 @@
+ 
+ include Makefile.inc
+ 
+-UDBFILE=/var/spool/news/wendzelnntpd/usenet.db
++UDBFILE=$(DESTDIR)/var/spool/news/wendzelnntpd/usenet.db
+ DESTCFLAGS=-DCONFDIR=\"$(CONFDIR)\"
+ HEADERS=$(SRC)/include/cdpstrings.h $(SRC)/include/main.h $(SRC)/include/wendzelnntpdpath.h
+ CFLAGS= -c -Wall $(STACK_PROT) $(DESTCFLAGS)
+@@ -109,35 +109,35 @@ install : bin/wendzelnntpd bin/wendzelnn
+ 	if [ ! -d $(DESTDIR)/share ]; then install -d -m 0755 $(DESTDIR)/share; fi
+ 	if [ ! -d $(DESTDIR)/share/doc ]; then install -d -m 0755 $(DESTDIR)/share/doc; fi
+ 	if [ ! -d $(DESTDIR)/share/doc/wendzelnntpd ]; then install -d -m 0755 $(DESTDIR)/share/doc/wendzelnntpd; fi
 -	if [ ! -d $(DESTDIR)/share/man/man8 ]; then install -d -m 0755 $(DESTDIR)/share/man/man8; fi
-+	if [ ! -d $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/sbin ]; then install -d -m 0755 $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/sbin; fi
-+	if [ ! -d $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/share ]; then install -d -m 0755 $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/share; fi
-+	if [ ! -d $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/share/doc ]; then install -d -m 0755 $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/share/doc; fi
-+	if [ ! -d $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/share/doc/wendzelnntpd ]; then install -d -m 0755 $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/share/doc/wendzelnntpd; fi
-+	if [ ! -d $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/man/man8 ]; then install -d -m 0755 $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/share/man/man8; fi
++	if [ ! -d $(DESTDIR)/man/man8 ]; then install -d -m 0755 $(DESTDIR)/man/man8; fi
  	# binaries
--	cp bin/wendzelnntpd bin/wendzelnntpadm $(DESTDIR)/sbin/
+ 	cp bin/wendzelnntpd bin/wendzelnntpadm $(DESTDIR)/sbin/
 -	chown 0:0 $(DESTDIR)/sbin/wendzelnntpd $(DESTDIR)/sbin/wendzelnntpadm
 -	chmod 0755 $(DESTDIR)/sbin/wendzelnntpd $(DESTDIR)/sbin/wendzelnntpadm
-+	cp bin/wendzelnntpd bin/wendzelnntpadm $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/sbin/
-+	#chown 0:0 $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/sbin/wendzelnntpd $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/sbin/wendzelnntpadm
-+	#chmod 0755 $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/sbin/wendzelnntpd $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/sbin/wendzelnntpadm
++	#chown 0:0 $(DESTDIR)/sbin/wendzelnntpd $(DESTDIR)/sbin/wendzelnntpadm
++	#chmod 0755 $(DESTDIR)/sbin/wendzelnntpd $(DESTDIR)/sbin/wendzelnntpadm
  	# documentation and config files
--	cp $(DOCFILES_TO_INST) $(DESTDIR)/share/doc/wendzelnntpd/
--	cp -r docs/docs $(DESTDIR)/share/doc/wendzelnntpd/
--	cp docs/docs.pdf $(DESTDIR)/share/doc/wendzelnntpd/docs.pdf
+ 	cp $(DOCFILES_TO_INST) $(DESTDIR)/share/doc/wendzelnntpd/
+ 	cp -r docs/docs $(DESTDIR)/share/doc/wendzelnntpd/
+ 	cp docs/docs.pdf $(DESTDIR)/share/doc/wendzelnntpd/docs.pdf
 -	chown 0:0 $(DESTDIR)/share/doc/wendzelnntpd/*
 -	chmod 0644 $(DESTDIR)/share/doc/wendzelnntpd/*
-+	cp $(DOCFILES_TO_INST) $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/share/doc/wendzelnntpd/
-+	cp -r docs/docs $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/share/doc/wendzelnntpd/
-+	cp docs/docs.pdf $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/share/doc/wendzelnntpd/docs.pdf
-+	#chown 0:0 $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/share/doc/wendzelnntpd/*
-+	#chmod 0644 $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/share/doc/wendzelnntpd/*
++	#chown 0:0 $(DESTDIR)/share/doc/wendzelnntpd/*
++	#chmod 0644 $(DESTDIR)/share/doc/wendzelnntpd/*
  	# manpages
 -	cp $(MANPAGES) $(DESTDIR)/share/man/man8/
 -	chmod 644 $(DESTDIR)/share/man/man8/wendzelnntpd.8
 -	chmod 644 $(DESTDIR)/share/man/man8/wendzelnntpadm.8
-+	cp $(MANPAGES) $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/man/man8/
-+	#chmod 644 $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/man/man8/wendzelnntpd.8
-+	#chmod 644 $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/man/man8/wendzelnntpadm.8
++	cp $(MANPAGES) $(DESTDIR)/man/man8/
++	#chmod 644 $(DESTDIR)/man/man8/wendzelnntpd.8
++	#chmod 644 $(DESTDIR)/man/man8/wendzelnntpadm.8
  	# config
 -	@if [ -f $(FAKECDIR)/wendzelnntpd.conf ]; then cp $(FAKECDIR)/wendzelnntpd.conf $(FAKECDIR)/wendzelnntpd.conf.bkp; chmod 0644 $(FAKECDIR)/wendzelnntpd.conf.bkp; echo "***Your old wendzelnntpd.conf was backuped!***"; fi
 +	#@if [ -f $(FAKECDIR)/wendzelnntpd.conf ]; then cp $(FAKECDIR)/wendzelnntpd.conf $(FAKECDIR)/wendzelnntpd.conf.bkp; chmod 0644 $(FAKECDIR)/wendzelnntpd.conf.bkp; echo "***Your old wendzelnntpd.conf was backuped!***"; fi
@@ -53,7 +50,8 @@ Install man pages to "man" instead of "share/man" directory.
 +	#chown 0:0 $(FAKECDIR)/wendzelnntpd.conf
 +	#chmod 0644 $(FAKECDIR)/wendzelnntpd.conf
  	# nextmsgid and database/usenet.db are placed here:
- 	mkdir -p /var/spool/news/wendzelnntpd
+-	mkdir -p /var/spool/news/wendzelnntpd
++	mkdir -p $(DESTDIR)/var/spool/news/wendzelnntpd
  	# og-rwx since the passwords are stored in the database too!
 -	chmod 700 /var/spool/news/wendzelnntpd
 +	#chmod 700 /var/spool/news/wendzelnntpd
@@ -62,26 +60,26 @@ Install man pages to "man" instead of "share/man" directory.
 +	#@if [ -f $(UDBFILE) ] && [ $(CONFFILE) != *"dev"* ]; then mv $(UDBFILE) $(UDBFILE).`date +"%m-%d-%y-%H:%M"`.bkp; chmod 0600 $(UDBFILE).`date +"%m-%d-%y-%H:%M"`.bkp; echo "***Your old usenet database was backuped!***"; fi
  			
  	@# create new database, dir already exists due to earlier mkdir call
- 	install -d -m 0700 $(CMD_INSTALL_USEROPT) 0 -g 0 /var/spool/news/wendzelnntpd
-@@ -152,14 +152,14 @@ upgrade : bin/wendzelnntpd bin/wendzelnn
- 	@echo "*** Please only upgrade your WendzelNNTPd if your existing installation is WendzelNNTPd version 2.0.0 or newer. This script replaces only binaries and documentation files. Your databases and configuration files remain untouched. Press RETURN to perform an upgrade or press CTRL+C to abort. ***"
+-	install -d -m 0700 $(CMD_INSTALL_USEROPT) 0 -g 0 /var/spool/news/wendzelnntpd
++	install -d -m 0700 $(CMD_INSTALL_USEROPT) 0 -g 0 $(DESTDIR)/var/spool/news/wendzelnntpd
+ 	@#
+ 	@# create sqlite initial database if Sqlite3 is used
+ 	@# AND
+@@ -153,13 +153,13 @@ upgrade : bin/wendzelnntpd bin/wendzelnn
  	@read uselessinput
  	# binaries
--	cp bin/wendzelnntpd bin/wendzelnntpadm $(DESTDIR)/sbin/
+ 	cp bin/wendzelnntpd bin/wendzelnntpadm $(DESTDIR)/sbin/
 -	chown 0:0 $(DESTDIR)/sbin/wendzelnntpd $(DESTDIR)/sbin/wendzelnntpadm
 -	chmod 0755 $(DESTDIR)/sbin/wendzelnntpd $(DESTDIR)/sbin/wendzelnntpadm
-+	cp bin/wendzelnntpd bin/wendzelnntpadm $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/sbin/
-+	#chown 0:0 $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/sbin/wendzelnntpd $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/sbin/wendzelnntpadm
-+	#chmod 0755 $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/sbin/wendzelnntpd $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/sbin/wendzelnntpadm
++	#chown 0:0 $(DESTDIR)/sbin/wendzelnntpd $(DESTDIR)/sbin/wendzelnntpadm
++	#chmod 0755 $(DESTDIR)/sbin/wendzelnntpd $(DESTDIR)/sbin/wendzelnntpadm
  	# documentation
--	cp -r docs/docs $(DESTDIR)/share/doc/wendzelnntpd/
--	cp docs/docs.pdf $(DESTDIR)/share/doc/wendzelnntpd/docs.pdf
+ 	cp -r docs/docs $(DESTDIR)/share/doc/wendzelnntpd/
+ 	cp docs/docs.pdf $(DESTDIR)/share/doc/wendzelnntpd/docs.pdf
 -	chown 0:0 $(DESTDIR)/share/doc/wendzelnntpd/*
 -	chmod 0644 $(DESTDIR)/share/doc/wendzelnntpd/*
-+	cp -r docs/docs $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/share/doc/wendzelnntpd/
-+	cp docs/docs.pdf $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/share/doc/wendzelnntpd/docs.pdf
-+	#chown 0:0 $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/share/doc/wendzelnntpd/*
-+	#chmod 0644 $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/share/doc/wendzelnntpd/*
++	#chown 0:0 $(DESTDIR)/share/doc/wendzelnntpd/*
++	#chmod 0644 $(DESTDIR)/share/doc/wendzelnntpd/*
  	@echo "Upgrade finished. Thank you for upgrading and using this software. Have fun!"
  
  exec : bin/wendzelnntpd
Prev by Date: wendzelnntpd: Add COMMIT_MSG and TODO
Next by Date: librewolf: update to 140.0.2
Previous by Thread: wendzelnntpd: Add COMMIT_MSG and TODO
Next by Thread: librewolf: update to 140.0.2
Indexes:
Home | Main Index | Thread Index | Old Index