From 4556761de0e5eefcf3b72ce824fe751cc0b7e5bd Mon Sep 17 00:00:00 2001 From: kim Date: Mon, 20 Sep 1999 21:43:32 +0000 Subject: Make this work on Solaris. NOTE: It is nice to have "make extract" just unpack and not overwrite any files, so it can be used to investigate pkg problems. This is why I chose to not use "post-extract" to patch files. I use "post-patch" instead. I'll need to test this on NetBSD now... --- news/nn/Makefile | 33 +++++++++++++++++----- news/nn/files/patch-sum | 8 +++--- news/nn/files/s-netbsd.h | 7 ++--- news/nn/patches/patch-aa | 13 +++++++-- news/nn/patches/patch-ai | 72 ++++++++++++++++++++++++++++++++---------------- news/nn/patches/patch-aq | 10 +++---- 6 files changed, 96 insertions(+), 47 deletions(-) diff --git a/news/nn/Makefile b/news/nn/Makefile index ed03d785361..d9a8e8563c2 100644 --- a/news/nn/Makefile +++ b/news/nn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 1999/09/14 14:07:43 tron Exp $ +# $NetBSD: Makefile,v 1.12 1999/09/20 21:43:32 kim Exp $ # FreeBSD Id: Makefile,v 1.14 1997/07/30 18:17:48 adam Exp # @@ -18,11 +18,30 @@ DEPENDS= inn-2.2:../inn DEPENDS= nntpclnt-1.6.1:../nntpclnt .endif -post-extract: - @${MV} ${WRKSRC}/config.h-dist ${WRKSRC}/config.h - @${SED} -e 's#@@PREFIX@@#${PREFIX}#; \ - s#@@BINOWN@@#${BINOWN}#; \ - s#@@BINGRP@@#${BINGRP}#' \ - <${FILESDIR}/s-netbsd.h >${WRKSRC}/conf/s-netbsd.h +.if ${OPSYS} == "SunOS" +SFILE= s-sunos5.h +.elif ${OPSYS} == "Linux" +SFILE= s-linux.h +.else +SFILE= s-netbsd.h +.endif + +.if ${LOWER_ARCH} == "i386" +MFILE= m-i80386.h +.else +MFILE= m-${LOWER_ARCH}.h +.endif + +MAKE_ENV+= CC="${CC}" + +post-patch: + @${SED} -e ' \ + s#@PREFIX@#${PREFIX}#; \ + s#@BINOWN@#${BINOWN}#; \ + s#@BINGRP@#${BINGRP}#; \ + s#@MFILE@#${MFILE}#; \ + s#@SFILE@#${SFILE}#' \ + <${WRKSRC}/config.h-dist >${WRKSRC}/config.h + @${CP} ${FILESDIR}/s-netbsd.h ${WRKSRC}/conf/s-netbsd.h .include "../../mk/bsd.pkg.mk" diff --git a/news/nn/files/patch-sum b/news/nn/files/patch-sum index 479dbd17b9f..4901039621b 100644 --- a/news/nn/files/patch-sum +++ b/news/nn/files/patch-sum @@ -1,6 +1,6 @@ -$NetBSD: patch-sum,v 1.5 1999/08/23 11:19:28 tron Exp $ +$NetBSD: patch-sum,v 1.6 1999/09/20 21:43:33 kim Exp $ -MD5 (patch-aa) = 77dd8dfa6af2c829995236be1ba07c6b +MD5 (patch-aa) = 484c0c2ee06c7e507a09ba11dcedc7aa MD5 (patch-ab) = bb054068ebdbe26eb6f9d3928881a040 MD5 (patch-ac) = c6636066ce812fdd07c254f8c0be747c MD5 (patch-ad) = f2d79425b4d086e3aae3459e4d8ac2c8 @@ -8,7 +8,7 @@ MD5 (patch-ae) = c34f531bda131227034abc77f7566462 MD5 (patch-af) = ecafb60c9a95a6a111769469770acbe4 MD5 (patch-ag) = bdf9d3dc7322b1e019f4d5715e659831 MD5 (patch-ah) = 9856d63280d2869d3b35a763b4d0048e -MD5 (patch-ai) = febe6b85ec279dfe4a108f53f8af5f5f +MD5 (patch-ai) = 8a9453ebffb13f863a13dc6af7d7f4d0 MD5 (patch-aj) = e4c6355e820ab3998df0c5825e1655cc MD5 (patch-ak) = be82a315a25ae6498e9afe2cf395948a MD5 (patch-al) = 90d15ac44ae2b6efd1e316ff45f00bf5 @@ -16,7 +16,7 @@ MD5 (patch-am) = 3eb94051b0e17dd57ce3078a6913e92b MD5 (patch-an) = 7fd66a470489eeb2a3359fc4d9f492f8 MD5 (patch-ao) = 44e632364ed3e60b0970b05c3b75fa65 MD5 (patch-ap) = c6a15db066784f0c667b05376b6885b8 -MD5 (patch-aq) = 7bd3be6e14a9d687a44a526da70c16b4 +MD5 (patch-aq) = e79890e3047e12238d63c60c4ab5e963 MD5 (patch-ar) = 429e06b80f39a6e584ba8719924518e6 MD5 (patch-as) = ed7a235ed962463e77dd4aecc4b678f8 MD5 (patch-at) = 3ffeb8a418622ed6dc18e805ba4953b4 diff --git a/news/nn/files/s-netbsd.h b/news/nn/files/s-netbsd.h index a607f62b1b5..0938ffe83e8 100644 --- a/news/nn/files/s-netbsd.h +++ b/news/nn/files/s-netbsd.h @@ -1,4 +1,4 @@ -/* $NetBSD: s-netbsd.h,v 1.2 1998/08/07 11:11:10 agc Exp $ */ +/* $NetBSD: s-netbsd.h,v 1.3 1999/09/20 21:43:34 kim Exp $ */ /* * This version is for FreeBSD 2.1 @@ -15,6 +15,7 @@ #include #include /* for S_IFREG */ #include /* for O_RDONLY */ +#include /* for _PATH_SENDMAIL */ #define HAVE_STDLIB_H #define HAVE_STRING_H @@ -158,7 +159,3 @@ typedef struct dirent Direntry; /* POSIX */ #define HAVE_8BIT_CTYPE #define HAVE_WORKING_COLLATE - -#define PREFIX "@@PREFIX@@" -#define BINOWN "@@BINOWN@@" -#define BINGRP "@@BINGRP@@" diff --git a/news/nn/patches/patch-aa b/news/nn/patches/patch-aa index 8ec79089587..841b43d8f88 100644 --- a/news/nn/patches/patch-aa +++ b/news/nn/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.6 1999/08/22 22:55:45 kim Exp $ +$NetBSD: patch-aa,v 1.7 1999/09/20 21:43:34 kim Exp $ --- Makefile.orig Sat Jun 5 00:07:14 1999 -+++ Makefile Sun Aug 22 17:48:44 1999 ++++ Makefile Mon Sep 20 17:30:05 1999 @@ -18,7 +18,7 @@ # # Use /lib/cpp or /usr/ccs/lib/cpp for CPP on Solaris or SVR4 machines. @@ -11,6 +11,15 @@ $NetBSD: patch-aa,v 1.6 1999/08/22 22:55:45 kim Exp $ CPP = $(CC) -E #CPP = /lib/cpp #CFLAGS = -O2 # -g # -I/usr/local/lib/malloc-debug -DMALLOC_FUNC_CHECK +@@ -28,7 +28,7 @@ + #-Wpointer-arith -Wcast-qual -Wcast-align -Wconversion \ + #-Waggregate-return -Wmissing-prototypes -Wnested-externs + #LDFLAGS = -s # -lmalloc # /usr/local/lib/malloc-debug/libmalloc.a +-MAKE = make ++#MAKE = make + + + SHELL = /bin/sh @@ -97,3 +97,5 @@ man/nn.1.D: man/nn.1 sh SPLITNN1 diff --git a/news/nn/patches/patch-ai b/news/nn/patches/patch-ai index 3a88024af98..1f38c648f61 100644 --- a/news/nn/patches/patch-ai +++ b/news/nn/patches/patch-ai @@ -1,8 +1,26 @@ -$NetBSD: patch-ai,v 1.3 1999/08/22 22:55:46 kim Exp $ +$NetBSD: patch-ai,v 1.4 1999/09/20 21:43:34 kim Exp $ ---- config.h.orig Sun Jun 6 18:22:28 1999 -+++ config.h Sun Aug 22 17:57:00 1999 -@@ -107,7 +107,7 @@ +--- config.h-dist.orig Sun Jun 6 18:22:28 1999 ++++ config.h-dist Mon Sep 20 17:18:32 1999 +@@ -13,6 +13,8 @@ + + #define RELEASE "6.5" + ++#define PREFIX "@PREFIX@" ++ + #include + #include + +@@ -71,7 +73,7 @@ + * ascii files. (Thank you Geoff!) + */ + +-/* #define NETWORK_DATABASE */ ++#define NETWORK_DATABASE + + + /********************************** NNTP ********************************* +@@ -107,7 +109,7 @@ * NOTE: If you plan to use the included inews, it MUST be a full pathname */ @@ -11,27 +29,36 @@ $NetBSD: patch-ai,v 1.3 1999/08/22 22:55:46 kim Exp $ /* * Define NNTP_POST if you want nn to reject attempts to post via -@@ -149,7 +149,7 @@ +@@ -149,7 +151,7 @@ * conf/s-template.h as a starting point for writing you own. */ -#include "s-hpux9-0.h" -+#include "s-netbsd.h" ++#include "@SFILE@" /* * Define DEFAULT_PAGER as the initial value of the 'pager' variable. -@@ -227,8 +227,8 @@ +@@ -210,7 +212,7 @@ + * conf/m-template.h as a starting point for writing you own. + */ + +-#include "m-hp9000.h" ++#include "@MFILE@" + + + /***************************** OWNERSHIP *************************** +@@ -227,8 +229,8 @@ * Common choices are: (news, news) and (your uid, your gid) */ -#define OWNER "news" -#define GROUP "news" -+#define OWNER BINOWN -+#define GROUP BINGRP ++#define OWNER "@BINOWN@" ++#define GROUP "@BINGRP@" /**************************** LOCALIZATION **************************** -@@ -261,9 +261,9 @@ +@@ -261,9 +263,12 @@ * (= LIB_DIRECTORY/Log if undefined). */ @@ -40,11 +67,14 @@ $NetBSD: patch-ai,v 1.3 1999/08/22 22:55:46 kim Exp $ - +#define BIN_DIRECTORY PREFIX "/bin" +#define LIB_DIRECTORY PREFIX "/lib/nn" -+#define TMP_DIRECTORY "/var/tmp" ++#ifndef _PATH_VARTMP ++# define _PATH_VARTMP "/var/tmp" ++#endif ++#define TMP_DIRECTORY _PATH_VARTMP /**************************** DATABASE LOCATION ************************** * -@@ -318,7 +318,7 @@ +@@ -318,7 +323,7 @@ /* #define NEWS_DIRECTORY "/usr/spool/news" */ /* #define NEWS_LIB_DIRECTORY "/usr/lib/news" */ @@ -53,16 +83,19 @@ $NetBSD: patch-ai,v 1.3 1999/08/22 22:55:46 kim Exp $ /* -@@ -341,7 +341,7 @@ +@@ -341,7 +346,10 @@ */ /* #define REC_MAIL "/usr/lib/news/recmail" */ /* non-sendmail */ -#define REC_MAIL "/usr/lib/sendmail -t" /* sendmail */ -+#define REC_MAIL "/usr/sbin/sendmail -t" /* sendmail */ ++#ifndef _PATH_SENDMAIL ++# define _PATH_SENDMAIL "/usr/lib/sendmail" ++#endif ++#define REC_MAIL _PATH_SENDMAIL " -t" /* sendmail */ /* -@@ -403,13 +403,13 @@ +@@ -403,13 +411,13 @@ * DAEMON_MAN - nnmaster */ @@ -80,12 +113,3 @@ $NetBSD: patch-ai,v 1.3 1999/08/22 22:55:46 kim Exp $ #define DAEMON_MAN_SECTION "8" -@@ -481,7 +481,7 @@ - * via some sort of NNTP. - */ - --#define SYNCHRONOUS_POSTING /* comment out for C-News */ -+#define SYNCHRONOUS_POSTING /* comment out for C-News */ - - /* - * PUT_TIMESTAMP_IN_SCRIPTS diff --git a/news/nn/patches/patch-aq b/news/nn/patches/patch-aq index aadd559ec72..89d09eca3f7 100644 --- a/news/nn/patches/patch-aq +++ b/news/nn/patches/patch-aq @@ -1,15 +1,15 @@ -$NetBSD: patch-aq,v 1.1 1999/07/26 21:19:30 tron Exp $ +$NetBSD: patch-aq,v 1.2 1999/09/20 21:43:34 kim Exp $ ---- inst.sh.orig Mon Sep 13 19:42:25 1993 -+++ inst.sh Mon Jul 26 23:11:39 1999 +--- inst.sh.orig Sat Apr 29 01:34:49 1995 ++++ inst.sh Mon Sep 20 17:07:28 1999 @@ -1,8 +1,8 @@ # (Large) prefix inserted above by Make -# BSD systems keep chown in /etc -PATH="$PATH:/etc" -+# BSD systems keep chown in /usr/sbin -+PATH="$PATH:/usr/sbin" ++# BSD systems keep chown in different places ++PATH="$PATH:/usr/bin:/usr/sbin:/etc" case "$1" in mkdir) -- cgit v1.2.3