pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Geomyidae-git: Sync with net/Geomyidae



Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Mon Oct 10 10:06:55 2022 +0200
Changeset:	fecfafe8218a595ec802601eadc8cb5f04f1588b

Modified Files:
	Geomyidae-git/Makefile
	Geomyidae-git/PLIST
	Geomyidae-git/files/geomyidae.sh

Log Message:
Geomyidae-git: Sync with net/Geomyidae

Reduce as much as possible diff with net/Geomyidae and bump version to
reflect likely next upstream one.

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

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

diffstat:
 Geomyidae-git/Makefile           | 16 ++++++----------
 Geomyidae-git/PLIST              |  4 ++--
 Geomyidae-git/files/geomyidae.sh |  2 +-
 3 files changed, 9 insertions(+), 13 deletions(-)

diffs:
diff --git a/Geomyidae-git/Makefile b/Geomyidae-git/Makefile
index e429b36b99..c7d76340e0 100644
--- a/Geomyidae-git/Makefile
+++ b/Geomyidae-git/Makefile
@@ -1,24 +1,19 @@
 # $NetBSD: Makefile,v 1.11 2018/09/21 17:10:57 leot Exp $
 
-DISTNAME=	geomyidae-v0.34
+DISTNAME=	geomyidae-v0.52
 PKGNAME=	${DISTNAME:S/-v/-/}
 CATEGORIES=	net
 MASTER_SITES=	ftp://bitreich.org/releases/geomyidae/
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	leot%NetBSD.org@localhost
 HOMEPAGE=	gopher://bitreich.org/1/scm/geomyidae
-COMMENT=	Gopher daemon for Linux/BSD
+COMMENT=	Gopher daemon
 LICENSE=	mit
 
 GIT_REPOSITORIES=	geomyidae
 GIT_REPO.geomyidae=	git://bitreich.org/geomyidae
 WRKSRC=			${WRKDIR}/geomyidae
 
-# Disable TLS support (avoids libressl dependency)
-MAKE_FLAGS+=	TLS_CFLAGS=
-MAKE_FLAGS+=	TLS_LDFLAGS=
-
 BUILD_DEFS+=	VARBASE GEOMYIDAE_USER GEOMYIDAE_GROUP GEOMYIDAE_ROOTDIR
 FILES_SUBST+=	GEOMYIDAE_USER=${GEOMYIDAE_USER} GEOMYIDAE_GROUP=${GEOMYIDAE_GROUP}
 FILES_SUBST+=	GEOMYIDAE_ROOTDIR=${GEOMYIDAE_ROOTDIR}
@@ -44,16 +39,17 @@ SUBST_STAGE.rootdir=	pre-configure
 SUBST_FILES.rootdir=	main.c
 SUBST_SED.rootdir=	-e 's;/var/gopher;${GEOMYIDAE_ROOTDIR};'
 
-INSTALLATION_DIRS=	sbin ${PKGMANDIR}/man8 ${EGDIR} ${DOCDIR}
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man8 ${EGDIR} ${DOCDIR}
 
 LDFLAGS.SunOS+=		-lsocket -lnsl
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/geomyidae ${DESTDIR}${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/geomyidae ${DESTDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/geomyidae.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
 	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/CGI ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/CGI.md ${DESTDIR}${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/index.gph ${DESTDIR}${EGDIR}
 
+.include "../../security/libretls/buildlink3.mk"
 .include "../../wip/mk/git-package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/Geomyidae-git/PLIST b/Geomyidae-git/PLIST
index 25f3a7dc6b..d34fce0c96 100644
--- a/Geomyidae-git/PLIST
+++ b/Geomyidae-git/PLIST
@@ -1,6 +1,6 @@
 @comment $NetBSD: PLIST,v 1.5 2018/08/10 10:41:20 leot Exp $
+bin/geomyidae
 man/man8/geomyidae.8
-sbin/geomyidae
-share/doc/geomyidae/CGI
+share/doc/geomyidae/CGI.md
 share/doc/geomyidae/README
 share/examples/geomyidae/index.gph
diff --git a/Geomyidae-git/files/geomyidae.sh b/Geomyidae-git/files/geomyidae.sh
index 44439beb8b..d7eb6b2703 100755
--- a/Geomyidae-git/files/geomyidae.sh
+++ b/Geomyidae-git/files/geomyidae.sh
@@ -9,7 +9,7 @@ fi
 
 name="geomyidae"
 rcvar=$name
-command="@PREFIX@/sbin/geomyidae"
+command="@PREFIX@/bin/geomyidae"
 
 geomyidae_flags=${geomyidae_flags-"-u @GEOMYIDAE_USER@ -g @GEOMYIDAE_GROUP@ -b @GEOMYIDAE_ROOTDIR@"}
 


Home | Main Index | Thread Index | Old Index