netmask: cleanup and Makefile refactor

[Francisco J. Tsao Santín <tsao%disroot.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Francisco J. Tsao Santín <tsao%disroot.org@localhost>
Pushed By:	tsao
Date:		Fri Nov 5 11:46:00 2021 +0100
Changeset:	4e0722d8f749a3f9ac20b0032155d1bbf96295d2

Modified Files:
	netmask/DESCR
	netmask/Makefile
	netmask/distinfo

Log Message:
netmask: cleanup and Makefile refactor

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

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

diffstat:
 netmask/DESCR    | 17 +++++------------
 netmask/Makefile | 22 +++++++++-------------
 netmask/distinfo |  8 ++++----
 3 files changed, 18 insertions(+), 29 deletions(-)

diffs:
diff --git a/netmask/DESCR b/netmask/DESCR
index 1ba4e3fe90..0dbfe6556c 100644
--- a/netmask/DESCR
+++ b/netmask/DESCR
@@ -1,12 +1,5 @@
-This is a handy tool for generating terse netmasks in several common formats.
-If you've ever maintained a firewall with more than a few rules in it, you
-might use netmask to clean up and generalize sloppy rules left by the netadmin
-before you.  It will also convert netmasks from one format to another for the
-day you change your firewall software.
-
-See the file INSTALL for building and installation instructions.
-
-Please send all bug reports by electronic mail to:
-    netmask-bug%trap.mtview.ca.us@localhost
-
-Netmask is free software.  See the file COPYING for copying conditions.
+Tool for generating terse netmasks in several common formats.  If you've ever
+maintained a firewall with more than a few rules in it, you might use netmask
+to clean up and generalize sloppy rules left by the netadmin before you.  It
+will also convert netmasks from one format to another for the day you change
+your firewall software.
diff --git a/netmask/Makefile b/netmask/Makefile
index c01875ca69..452c89c08e 100644
--- a/netmask/Makefile
+++ b/netmask/Makefile
@@ -1,24 +1,20 @@
 # $NetBSD$
 
-GITHUB_PROJECT=	netmask
-GITHUB_TAG=	refs/tags/v2.4.4
-DISTNAME=	v2.4.4
-PKGNAME=	${GITHUB_PROJECT}-${DISTNAME:S,^v,,}
-CATEGORIES=	sysutils	
+DISTNAME=	netmask-2.4.4
+CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GITHUB:=tlby/}
-DIST_SUBDIR=	${GITHUB_PROJECT}
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	tsao%disroot.org@localhost
 HOMEPAGE=	https://github.com/tlby/netmask/
-COMMENT=	Handy tool for generating terse netmasks in several common formats
+COMMENT=	Tool for generating terse netmasks in several common formats
 LICENSE=	gnu-gpl-v2
 
-WRKSRC=		${WRKDIR}/netmask-2.4.4
-
-USE_TOOLS+=     autoreconf autoconf automake awk gmake digest makeinfo
-GNU_CONFIGURE=  yes
+USE_TOOLS+=	autoreconf autoconf automake awk gmake digest makeinfo
+GNU_CONFIGURE=	yes
 INFO_FILES=	yes
+
 pre-configure:
-	cd ${WRKSRC}; \
-	./autogen
+	cd ${WRKSRC} && ./autogen
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/netmask/distinfo b/netmask/distinfo
index 90aa4b2dc0..03bbe2e86f 100644
--- a/netmask/distinfo
+++ b/netmask/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (netmask/v2.4.4.tar.gz) = 6553e883c09351694cbb52dc6b21746b407302fe
-RMD160 (netmask/v2.4.4.tar.gz) = 2cbdf361c445f2bff4d633975005a50741b5cebb
-SHA512 (netmask/v2.4.4.tar.gz) = 57beddd0671dfa8102a68a2e8194d04405358b188b10da215768580f022d040ab990089013816500aafe2090eba8a79aef1fafbd160526c985fbbf09ff69ffce
-Size (netmask/v2.4.4.tar.gz) = 45775 bytes
+SHA1 (netmask-2.4.4.tar.gz) = 6553e883c09351694cbb52dc6b21746b407302fe
+RMD160 (netmask-2.4.4.tar.gz) = 2cbdf361c445f2bff4d633975005a50741b5cebb
+SHA512 (netmask-2.4.4.tar.gz) = 57beddd0671dfa8102a68a2e8194d04405358b188b10da215768580f022d040ab990089013816500aafe2090eba8a79aef1fafbd160526c985fbbf09ff69ffce
+Size (netmask-2.4.4.tar.gz) = 45775 bytes