From e88f3d28e71f994d6e608e9a709bb3c10867e745 Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Sat, 21 Sep 1996 05:29:55 +0000
Subject: Ack, last commit was bogus.  Serves me right for making "just one
 tiny change" after I tested it. Sigh.

While here, make a tweakable hook to change the name from rdist6 to rdist.
---
 net/rdist6/Makefile       | 13 +++++++++----
 net/rdist6/files/patch-ad |  4 ++--
 2 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'net')

diff --git a/net/rdist6/Makefile b/net/rdist6/Makefile
index 70a0fd007821..7c8d6d119dc2 100644
--- a/net/rdist6/Makefile
+++ b/net/rdist6/Makefile
@@ -3,7 +3,7 @@
 # Date created:		19 August 1995
 # Whom:			peter
 #
-# $Id: Makefile,v 1.6 1996/05/17 11:14:53 peter Exp $
+# $Id: Makefile,v 1.7 1996/09/21 05:12:01 peter Exp $
 #
 
 DISTNAME=	rdist-6.1.3
@@ -12,13 +12,18 @@ MASTER_SITES=	ftp://usc.edu/pub/rdist/
 
 MAINTAINER=	peter@FreeBSD.org
 
-INSTALL_TARGET+=install.man
+# To avoid confusion with /usr/bin/rdist, you may prefer otherwise.
+# Do not forget to deal with pkg/PLIST if you change this.
+RDIST_NAME=	rdist6
+
+INSTALL_TARGET=	install install.man
+MAKE_ENV+=	BUILD_OPT="${CFLAGS}" BUILD_CLIENT=${RDIST_NAME}
 
 post-install:
-	strip ${PREFIX}/bin/rdist6
+	strip ${PREFIX}/bin/${RDIST_NAME}
 	strip ${PREFIX}/bin/rdistd
 .if !defined(NOMANCOMPRESS)
-	gzip -9nf ${PREFIX}/man/man1/rdist6.1
+	gzip -9nf ${PREFIX}/man/man1/${RDIST_NAME}.1
 	gzip -9nf ${PREFIX}/man/man8/rdistd.8
 .endif
 
diff --git a/net/rdist6/files/patch-ad b/net/rdist6/files/patch-ad
index 5083cdacfea1..7c54833ef8cc 100644
--- a/net/rdist6/files/patch-ad
+++ b/net/rdist6/files/patch-ad
@@ -14,8 +14,8 @@
   # or add your own line.
   #
 ! BIN_DIR       =       $(PREFIX)/bin
-! OPT =         -O -s
-! CLIENT =      rdist6
+! OPT =         $(BUILD_OPT)
+! CLIENT =      $(BUILD_CLIENT)
   
   #
   # Add any local definitions you want pass to the compiler to DEFS_LOCAL
-- 
cgit v1.2.3