Re: net/uucp on linux

[adr%SDF.ORG@localhost]

Hello,

I change the modidications I made to uucp to use nbcompat. Any
pkgsrc developer could take a quick look and see if it is ok?

Regards,
adr.
===================================================================
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/uucp/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- Makefile	3 Nov 2019 11:45:57 -0000	1.21
+++ Makefile	20 Jun 2020 22:24:45 -0000
@@ -10,7 +10,7 @@
 COMMENT=	Taylor UUCP
 
 USE_TOOLS+=	mkdir:run pwd:run rmdir:run
-USE_FEATURES+=	cdefs
+USE_FEATURES=	nbcompat # Linux has an incompatible cdefs
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -71,15 +71,11 @@
 # platform-specific.
 #
 UUCPD_CPPFLAGS.${OPSYS}=	# empty
-.if exists(/usr/include/utmp.h)
-UUCPD_CPPFLAGS.${OPSYS}+=	-DSUPPORT_UTMP
-.endif
-.if exists(/usr/include/utmpx.h)
-UUCPD_CPPFLAGS.${OPSYS}+=	-DSUPPORT_UTMPX
-.endif
-UUCPD_CPPFLAGS.Darwin=		-DSUPPORT_UTMP
-UUCPD_CPPFLAGS.*=		# empty
+UUCPD_CPPFLAGS.NetBSD+=		-DSUPPORT_UTMP -DSUPPORT_UTMPX
+UUCPD_CPPFLAGS.Darwin+=		-DSUPPORT_UTMP
+UUCPD_CPPFLAGS.DragonFly+=	-D__DragonFly__
 UUCPD_LIBS.Darwin=		# empty
+UUCPD_LIBS.Linux=		-lcrypt
 UUCPD_LIBS.*=			-lcrypt -lutil
 OPSYSVARS+=			UUCPD_CPPFLAGS UUCPD_LIBS
 
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/net/uucp/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo	8 Nov 2015 23:19:22 -0000	1.7
+++ distinfo	20 Jun 2020 22:24:45 -0000
@@ -23,5 +23,3 @@
 SHA1 (patch-aq) = bb6bcaa133ddda48ad24a94ed690afb5934b96d0
 SHA1 (patch-ar) = d71d7e016d840d06c52bd88c507450111cf02e2c
 SHA1 (patch-as) = 76773cbfccec131b3eb0adfad43c6d4e9d54a99b
-SHA1 (patch-rmail_rmail.c) = 3010f4dcc2ef05b1563658b3c2ec769229a253bb
-SHA1 (patch-uucpd_uucpd.c) = 42278c73d5f3f6c95a64896168dcdb2ead425f26
Index: files/rmail/rmail.c
===================================================================
RCS file: /cvsroot/pkgsrc/net/uucp/files/rmail/rmail.c,v
retrieving revision 1.2
diff -u -r1.2 rmail.c
--- files/rmail/rmail.c	16 Mar 2007 23:09:02 -0000	1.2
+++ files/rmail/rmail.c	20 Jun 2020 22:24:45 -0000
@@ -29,7 +29,12 @@
  * SUCH DAMAGE.
  */
 
+#if defined(HAVE_NBCOMPAT_H)
+#include <nbcompat/config.h>
+#include <nbcompat/cdefs.h>
+#else
 #include <sys/cdefs.h>
+#endif
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1988, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n");
@@ -70,7 +75,11 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <paths.h>
+#if defined(HAVE_NBCOMPAT_H)
+#include <nbcompat/stdio.h>
+#else
 #include <stdio.h>
+#endif
 #include <stdlib.h>
 #include <string.h>
 #include <sysexits.h>
Index: files/uucpd/uucpd.c
===================================================================
RCS file: /cvsroot/pkgsrc/net/uucp/files/uucpd/uucpd.c,v
retrieving revision 1.2
diff -u -r1.2 uucpd.c
--- files/uucpd/uucpd.c	30 Jun 2007 19:30:50 -0000	1.2
+++ files/uucpd/uucpd.c	20 Jun 2020 22:24:45 -0000
@@ -32,7 +32,12 @@
  * SUCH DAMAGE.
  */
 
+#if defined(HAVE_NBCOMPAT_H)
+#include <nbcompat/config.h>
+#include <nbcompat/cdefs.h>
+#else
 #include <sys/cdefs.h>
+#endif
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1985 The Regents of the University of California.\n\
  All rights reserved.\n");
@@ -72,6 +77,8 @@
 #include <unistd.h>
 #if defined(__DragonFly__)
 #include <libutil.h>
+#elif defined(HAVE_NBCOMPAT_H)
+#include <nbcompat/util.h>
 #else
 #include <util.h>
 #endif