libtirpc: finish package

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: libtirpc: finish package
From: Paolo Vincenzo Olivo <vins%NetBSD.org@localhost>
Date: Tue, 29 Aug 2023 11:10:23 +0000
Module Name:	pkgsrc-wip
Committed By:	Paolo Vincenzo Olivo <vins%NetBSD.org@localhost>
Pushed By:	vms
Date:		Tue Aug 29 13:10:23 2023 +0200
Changeset:	0eb65c02db1705e5a8a4f03900b794606a488960

Modified Files:
	libtirpc/DESCR
	libtirpc/Makefile
	libtirpc/buildlink3.mk
	libtirpc/distinfo
	libtirpc/patches/patch-doc-Makefile.am
Added Files:
	libtirpc/builtin.mk
	libtirpc/patches/patch-src_svc__auth__gss.c

Log Message:
libtirpc: finish package

* Revise Makefile and buildlink3.mk
* Write builtin.mk
* Fix compile warning.

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

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

diffstat:
 libtirpc/DESCR                              |  2 --
 libtirpc/Makefile                           | 17 +++++------
 libtirpc/buildlink3.mk                      |  4 +++
 libtirpc/builtin.mk                         | 47 +++++++++++++++++++++++++++++
 libtirpc/distinfo                           |  3 +-
 libtirpc/patches/patch-doc-Makefile.am      |  5 ++-
 libtirpc/patches/patch-src_svc__auth__gss.c | 15 +++++++++
 7 files changed, 78 insertions(+), 15 deletions(-)

diffs:
diff --git a/libtirpc/DESCR b/libtirpc/DESCR
index 7b9750ee0f..befef157b6 100644
--- a/libtirpc/DESCR
+++ b/libtirpc/DESCR
@@ -1,5 +1,3 @@
-LIBTIRPC 0.1 FROM SUN'S TIRPCSRC 2.3 29 Aug 1994
-
 This package contains SunLib's implementation of transport-independent
 RPC (TI-RPC) documentation.  This library forms a piece of the base of
 Open Network Computing (ONC), and is derived directly from the Solaris
diff --git a/libtirpc/Makefile b/libtirpc/Makefile
index 1000946660..7d17d9e8bd 100644
--- a/libtirpc/Makefile
+++ b/libtirpc/Makefile
@@ -2,7 +2,7 @@
 
 DISTNAME=	libtirpc-1.3.3
 CATEGORIES=	devel
-MASTER_SITES=	https://downloads.sourceforge.net/libtirpc/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libtirpc/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	als%thangorodrim.ch@localhost
@@ -12,23 +12,22 @@ LICENSE=	original-bsd
 
 ONLY_FOR_PLATFORM=	Linux-*-*
 
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+USE_TOOLS+=	pkg-config autoconf autoreconf automake
+
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/examples/${PKGBASE}
 
 EGDIR=		${PREFIX}/share/examples/${PKGBASE}
-CONF_FILES=	${EGDIR}/bindresvport.blacklist ${PKG_SYSCONFDIR}/bindresvport.blacklist
+CONF_FILES=	${EGDIR}/bindresvport.blacklist \
+		${PKG_SYSCONFDIR}/bindresvport.blacklist
 CONF_FILES+=	${EGDIR}/netconfig ${PKG_SYSCONFDIR}/netconfig
 
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config autoconf autoreconf automake
-
 PKGCONFIG_OVERRIDE+=	libtirpc.pc.in
 
 pre-configure:
-	cd ${WRKSRC} && sh ./autogen.sh
-
-.include "../../mk/bsd.prefs.mk"
+	set -e; cd ${WRKSRC} && autoreconf -fiv
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/krb5.buildlink3.mk"
diff --git a/libtirpc/buildlink3.mk b/libtirpc/buildlink3.mk
index d48fdec6d1..a5917c31e8 100644
--- a/libtirpc/buildlink3.mk
+++ b/libtirpc/buildlink3.mk
@@ -7,6 +7,10 @@ LIBTIRPC_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libtirpc+=	libtirpc>=1.3.3
 BUILDLINK_PKGSRCDIR.libtirpc?=		../../devel/libtirpc
+
+BUILDLINK_CFLAGS.libtirpc+=	-I${BUILDLINK_PREFIX.libtirpc}/include/tiprc
+BUILDLINK_LDFLAGS.libtirpc+=	-ltirpc
+
 .endif	# LIBTIRPC_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libtirpc
diff --git a/libtirpc/builtin.mk b/libtirpc/builtin.mk
new file mode 100644
index 0000000000..69512b6c42
--- /dev/null
+++ b/libtirpc/builtin.mk
@@ -0,0 +1,47 @@
+# $NetBSD: builtin.mk,v 1.1 2022/12/19 15:08:04 vins Exp $
+
+BUILTIN_PKG:=	libtirpc
+
+BUILTIN_FIND_HEADERS_VAR:=		H_LIBTIRPC
+BUILTIN_FIND_HEADERS.H_LIBTIRPC=	rpc/rpc.h
+BUILTIN_FIND_GREP.H_LIBTIRPC=		\#define[ 	]*_TIRPC_RPC_H
+
+.include "../../mk/buildlink3/bsd.builtin.mk"
+
+###
+### Determine if there is a built-in implementation of the package and
+### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
+###
+.if !defined(IS_BUILTIN.libtirpc)
+IS_BUILTIN.libtirpc=	no
+.  if empty(H_LIBTIRPC:M__nonexistent__) && empty(H_LIBTIRPC:M${LOCALBASE}/*)
+IS_BUILTIN.libtirpc=	yes
+.  endif
+.endif
+MAKEVARS+=		IS_BUILTIN.libtirpc
+
+###
+### Determine whether we should use the built-in implementation.
+###
+.if !defined(USE_BUILTIN.libtirpc)
+.  if ${PREFER.libtirpc} == "pkgsrc"
+USE_BUILTIN.libtirpc=	no
+.  else
+USE_BUILTIN.libtirpc=	${IS_BUILTIN.libtirpc}
+.    if defined(BUILTIN_PKG.libtirpc) && \
+        ${IS_BUILTIN.libtirpc:tl} == yes
+USE_BUILTIN.libtirpc=	yes
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.libtirpc}
+.        if ${USE_BUILTIN.libtirpc:tl} == yes
+USE_BUILTIN.libtirpc!=							\
+	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.libtirpc:Q}; then \
+		${ECHO} yes;						\
+	else								\
+		${ECHO} no;						\
+	fi
+.        endif
+.      endfor
+.    endif
+.  endif  # PREFER.libtirpc
+.endif
+MAKEVARS+=		USE_BUILTIN.libtirpc
diff --git a/libtirpc/distinfo b/libtirpc/distinfo
index 72c610111e..e6e731aa14 100644
--- a/libtirpc/distinfo
+++ b/libtirpc/distinfo
@@ -3,4 +3,5 @@ $NetBSD$
 BLAKE2s (libtirpc-1.3.3.tar.bz2) = 0e04d88695974121081c792bc227f87c305f63c182727d4c0855e30104a3b82a
 SHA512 (libtirpc-1.3.3.tar.bz2) = df0781a74ff9ded2d3c4f5eb7e05496b9f58eac8060c02c68331dc14c4a00304dcd19f46836f5756fe0d9d27095fd463d42dd696fcdff891516711b7d63deabe
 Size (libtirpc-1.3.3.tar.bz2) = 562812 bytes
-SHA1 (patch-doc-Makefile.am) = e473cd47ffce7e33674e8555236f467c91d6ec2d
+SHA1 (patch-doc-Makefile.am) = 641ce7aac7651486cf93049d494f016b72644865
+SHA1 (patch-src_svc__auth__gss.c) = 4cb968ac90d26302813ec6c8a36e9c673825a9ab
diff --git a/libtirpc/patches/patch-doc-Makefile.am b/libtirpc/patches/patch-doc-Makefile.am
index 713527fec0..18a6ee8928 100644
--- a/libtirpc/patches/patch-doc-Makefile.am
+++ b/libtirpc/patches/patch-doc-Makefile.am
@@ -1,8 +1,7 @@
 $NetBSD$
 
-Move to config files via the data mechanism out of /etc and
-into share/examples (where they will be copied to etc/
-during pkg install).
+Move config files /etc and into share/examples
+(use CONF_FILES instead).
 
 --- doc/Makefile.am.orig	2023-03-16 21:19:58.827408077 +0100
 +++ doc/Makefile.am	2023-03-16 21:20:56.494030533 +0100
diff --git a/libtirpc/patches/patch-src_svc__auth__gss.c b/libtirpc/patches/patch-src_svc__auth__gss.c
new file mode 100644
index 0000000000..1e0c57a5c0
--- /dev/null
+++ b/libtirpc/patches/patch-src_svc__auth__gss.c
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Replace deprecated gss_sign().
+
+--- src/svc_auth_gss.c.orig	2022-08-02 18:55:33.000000000 +0000
++++ src/svc_auth_gss.c
+@@ -349,7 +349,7 @@ svcauth_gss_accept_sec_context(struct sv
+ 		seqbuf.value = &seq;
+ 		seqbuf.length = sizeof(seq);
+ 
+-		maj_stat = gss_sign(&min_stat, gd->ctx, GSS_C_QOP_DEFAULT,
++		maj_stat = gss_get_mic(&min_stat, gd->ctx, GSS_C_QOP_DEFAULT,
+ 				    &seqbuf, &checksum);
+ 
+ 		if (maj_stat != GSS_S_COMPLETE)
Prev by Date: joker: added generate to pre-build, successful building
Next by Date: *: remove three packages for which newer/same versions exist in pkgsrc
Previous by Thread: joker: added generate to pre-build, successful building
Next by Thread: *: remove three packages for which newer/same versions exist in pkgsrc
Indexes:
Home | Main Index | Thread Index | Old Index