From mharo@patrol.area51.fremont.ca.us Thu Mar 18 01:57:51 1999
Return-Path: <mharo@patrol.area51.fremont.ca.us>
Received: from patrol.area51.fremont.ca.us (d60-054.leach.ucdavis.edu [169.237.60.54])
	by hub.freebsd.org (Postfix) with ESMTP id 1FE02152A6
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 18 Mar 1999 01:57:49 -0800 (PST)
	(envelope-from mharo@patrol.area51.fremont.ca.us)
Received: (from mharo@localhost)
	by patrol.area51.fremont.ca.us (8.9.2/8.9.2) id BAA50734;
	Thu, 18 Mar 1999 01:58:43 -0800 (PST)
	(envelope-from mharo)
Message-Id: <199903180958.BAA50734@patrol.area51.fremont.ca.us>
Date: Thu, 18 Mar 1999 01:58:43 -0800 (PST)
From: mharo@area51.fremont.ca.us
Sender: mharo@patrol.area51.fremont.ca.us
Reply-To: mharo@area51.fremont.ca.us
To: FreeBSD-gnats-submit@freebsd.org
Subject: Update: net/bnc
X-Send-Pr-Version: 3.2

>Number:         10648
>Category:       ports
>Synopsis:       Update: net/bnc
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    mharo
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Mar 18 02:00:01 PST 1999
>Closed-Date:    Sun May 16 16:13:14 PDT 1999
>Last-Modified:  Sun May 16 16:13:49 PDT 1999
>Originator:     Michael Haro
>Release:        FreeBSD 3.1-STABLE i386
>Organization:
>Environment:

	

>Description:

new version of BNC.  passed portlint.  Tested with 2.2.8, compiles with 3.1.
one new patch file.  I'm not really sure if the sed stuff in post-build
is right, or if it should be under the post-build section, so let me know
so I can learn from my mistakes.

>How-To-Repeat:

	

>Fix:
	
Index: Makefile
===================================================================
RCS file: /host/trang.nuxi.com/FBSD/CVS-repository/ports/net/bnc/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile	1998/12/29 18:22:58	1.2
+++ Makefile	1999/03/18 09:55:44
@@ -6,20 +6,24 @@
 # $Id: Makefile,v 1.2 1998/12/29 18:22:58 billf Exp $
 #
 
-DISTNAME=	bnc-web
-PKGNAME=	bnc-2.4.3
+DISTNAME=	bnc2.4.8
+PKGNAME=	bnc-2.4.8
 CATEGORIES=	net
-MASTER_SITES=	http://www.bridgenet.net/bnc/
+MASTER_SITES=	http://bnc.refract.com/download/
 
 MAINTAINER=	billf@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/bnc2.4.3
-HAS_CONFIGURE=	YES
 GNU_CONFIGURE=	YES
 
+post-build:
+	${SED} 's,@PREFIX@,${PREFIX},g' ${WRKSRC}/bncsetup > ${WRKSRC}/bncsetup.new
+	${MV} ${WRKSRC}/bncsetup.new ${WRKSRC}/bncsetup
+
 do-install:
-	${CP} ${WRKSRC}/bnc ${PREFIX}/bin
-	${CP} ${WRKSRC}/bncchk ${PREFIX}/bin
-	${CP} ${WRKSRC}/example.conf ${PREFIX}/etc/bnc.conf
+	${INSTALL_PROGRAM} ${WRKSRC}/bnc ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/bncchk ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/bncsetup ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/mkpasswd ${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/example.conf ${PREFIX}/etc/bnc.conf.sample
 
 .include <bsd.port.mk>
Index: files/md5
===================================================================
RCS file: /host/trang.nuxi.com/FBSD/CVS-repository/ports/net/bnc/files/md5,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 md5
--- md5	1998/07/11 18:32:07	1.1.1.1
+++ md5	1999/03/18 09:07:46
@@ -1 +1 @@
-MD5 (bnc-web.tar.gz) = eee6dcba1cb1ad42f576b46f9bf0c4a7
+MD5 (bnc2.4.8.tar.gz) = e3210098b6e0d2a5827df9afbbdf21ec
Index: patches/patch-aa
===================================================================
RCS file: /host/trang.nuxi.com/FBSD/CVS-repository/ports/net/bnc/patches/patch-aa,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-aa
--- patch-aa	1998/07/11 18:32:08	1.1.1.1
+++ patch-aa	1999/03/18 09:09:42
@@ -1,11 +1,11 @@
---- Makefile.in.old     Mon Jul  6 16:56:21 1998
-+++ Makefile.in Mon Jul  6 17:06:25 1998
+--- Makefile.in.orig	Thu Mar 18 01:09:25 1999
++++ Makefile.in	Thu Mar 18 01:09:31 1999
 @@ -4,7 +4,7 @@
- CFLAGS = -DVERSION='"v2.4.3"' -O6
+ CFLAGS = -DVERSION='"v2.4.8"' -O6
  CC = gcc
  
--ALL: bnc
-+all: bnc
+-ALL: bnc mkpasswd
++all: bnc mkpasswd
+ 	@echo "*** Done compiling required files"
+ 	@echo "Please read the README.TXT file included"
  
- bnc.o: config.h common.h bnc.c Makefile
-        ${CC} ${CFLAGS} -c bnc.c
Index: pkg/PLIST
===================================================================
RCS file: /host/trang.nuxi.com/FBSD/CVS-repository/ports/net/bnc/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- PLIST	1998/07/11 18:32:06	1.1.1.1
+++ PLIST	1999/03/18 09:15:18
@@ -1,3 +1,5 @@
 bin/bnc
 bin/bncchk
-etc/bnc.conf
+bin/bncsetup
+bin/mkpasswd
+etc/bnc.conf.sample


-=-=-=-=-=-=-=-=-=-
patch-ab:
-=-=-=-=-=-=-=-=-=-
--- bncsetup.orig	Wed Mar 17 07:31:19 1999
+++ bncsetup	Thu Mar 18 01:51:47 1999
@@ -12,15 +12,9 @@
   exit $1
 }
 
-if ! [ -e ./mkpasswd ]
-then
-  echo "You need to Make the package before you can use this script"
-  echo "(required ./mkpasswd)"
-  bsclean 0
-fi
 
 echo "BAD\$" > $TMPFILE
-echo "Test" | ./mkpasswd -s >> $TMPFILE
+echo "Test" | mkpasswd -s >> $TMPFILE
 CRCYS=$(cat $TMPFILE | grep '\$' | tail -1 )
 
 
@@ -149,13 +143,13 @@
 
 if [ x$ERRORLEVEL = x0 ]
 then 
-  if [ -x ./mkpasswd ]
+  if [ -x @PREFIX@/bin/mkpasswd ]
   then
-    SUPERPASS="+"$(echo "$SUPERPASS" | ./mkpasswd -s)
-    BNCPASS="+"$(echo "$BNCPASS" | ./mkpasswd -s)
+    SUPERPASS="+"$(echo "$SUPERPASS" | mkpasswd -s)
+    BNCPASS="+"$(echo "$BNCPASS" | mkpasswd -s)
   else
     clear
-    echo "You have not did ./configure and make so there is no ./mkpasswd"
+    echo "You have not did ./configure and make so there is no mkpasswd"
     echo "This program is required to produce the encryption"
     bsclean 0
   fi

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports->billf 
Responsible-Changed-By: billf 
Responsible-Changed-When: Thu Mar 18 11:46:02 PST 1999 
Responsible-Changed-Why:  
This is my port. 
State-Changed-From-To: open->analyzed 
State-Changed-By: billf 
State-Changed-When: Sat Apr 24 20:30:09 PDT 1999 
State-Changed-Why:  
The only change I'd make to this patch is I'd move your 
post-build: target to post-patch:, other then that looks good 
CFLAGS looks like it may need to be fixed too. 


Responsible-Changed-From-To: billf->mharo 
Responsible-Changed-By: billf 
Responsible-Changed-When: Sat Apr 24 20:30:09 PDT 1999 
Responsible-Changed-Why:  
This is my port, but the submitter is now a committer. 
Perhaps I'm lazy, but I'm hoping that he could just commit 
these, considering he probably still has these patches on his system. 
State-Changed-From-To: analyzed->closed 
State-Changed-By: mharo 
State-Changed-When: Sun May 16 16:13:14 PDT 1999 
State-Changed-Why:  
committed 
>Unformatted:
