From owner-freebsd-ports  Mon Dec  4 10: 0:24 2000
From owner-freebsd-ports@FreeBSD.ORG  Mon Dec  4 10:00:15 2000
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
Delivered-To: freebsd-ports@hub.freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id BC92937B402
	for <freebsd-ports@hub.freebsd.org>; Mon,  4 Dec 2000 10:00:14 -0800 (PST)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.11.1/8.11.1) id eB4I0E756099;
	Mon, 4 Dec 2000 10:00:14 -0800 (PST)
	(envelope-from gnats)
Resent-Date: Mon, 4 Dec 2000 10:00:14 -0800 (PST)
Resent-Message-Id: <200012041800.eB4I0E756099@freefall.freebsd.org>
Resent-From: gnats-admin@FreeBSD.org (GNATS Management)
Resent-To: freebsd-ports@FreeBSD.org
Resent-Reply-To: gnats-admin@FreeBSD.org, tkato@prontomail.ne.jp
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id CB3C337B400
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  4 Dec 2000 09:59:43 -0800 (PST)
Received: (from nobody@localhost)
	by freefall.freebsd.org (8.11.1/8.11.1) id eB4HxhS55966;
	Mon, 4 Dec 2000 09:59:43 -0800 (PST)
	(envelope-from nobody)
Message-Id: <200012041759.eB4HxhS55966@freefall.freebsd.org>
Date: Mon, 4 Dec 2000 09:59:43 -0800 (PST)
From: tkato@prontomail.ne.jp
Sender: nobody@FreeBSD.org
To: freebsd-gnats-submit@FreeBSD.org
X-Send-Pr-Version: www-1.0
Subject: ports/23271: Update port: comms/mserver (fix ports/21336)
Resent-Sender: gnats@FreeBSD.org
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         23271
>Category:       ports
>Synopsis:       Update port: comms/mserver (fix ports/21336)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 04 10:00:12 PST 2000
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.2-RELEASE i386
>Organization:
>Environment:
>Description:
- Support CC/CFLAGS properly
- Support NOPORTDOCS

Remove file:
files/patch-aa

This PR supersedes ports/21336.

No response from maintainer.

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/comms/mserver/Makefile comms/mserver/Makefile
--- /usr/ports/comms/mserver/Makefile	Thu Nov  2 19:33:34 2000
+++ comms/mserver/Makefile	Sat Nov 18 09:28:21 2000
@@ -12,13 +12,17 @@
 
 MAINTAINER=	sobomax@FreeBSD.org
 
+MAKE_ARGS=	CC="${CC}" CCOPTS="${CFLAGS}"
+
 do-install:
-	${MKDIR} ${PREFIX}/share/doc/mserver
 	${INSTALL_PROGRAM} ${WRKSRC}/mserver ${PREFIX}/sbin
 	${INSTALL_PROGRAM} ${WRKSRC}/tcpconn ${PREFIX}/sbin
 	${INSTALL_DATA} ${WRKSRC}/mserver.conf ${PREFIX}/etc/mserver.conf.default
 	${INSTALL_SCRIPT} ${WRKSRC}/mserver.sh.sample ${PREFIX}/etc/rc.d/mserver.sh.sample
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${PREFIX}/share/doc/mserver
 	${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/mserver
 	${INSTALL_MAN} ${WRKSRC}/README.tcpconn ${PREFIX}/share/doc/mserver
+.endif
 
 .include <bsd.port.mk>
diff -urN /usr/ports/comms/mserver/files/patch-aa comms/mserver/files/patch-aa
--- /usr/ports/comms/mserver/files/patch-aa	Thu Jul  8 14:11:38 1999
+++ comms/mserver/files/patch-aa	Thu Jan  1 09:00:00 1970
@@ -1,30 +0,0 @@
-diff -ruN mserver-0.23a.orig/Makefile mserver-0.23a/Makefile
---- Makefile.orig	Thu Jan 15 21:12:33 1998
-+++ Makefile	Fri May 21 11:10:30 1999
-@@ -1,8 +1,7 @@
- #
- # Makefile for mserver
- #
--CC	= gcc
--CCOPTS	= -O2
-+CC	= cc
- LIBS	= 
- 
- INCLUDES	= config.h stty.h
-@@ -16,13 +15,13 @@
- 		$(CC) tcpconn.o stty.o -o tcpconn $(LIBS)
- 
- mserver.o:	mserver.c $(INCLUDES)
--		$(CC) $(CCOPTS) -c -o mserver.o mserver.c
-+		$(CC) $(CFLAGS) -c -o mserver.o mserver.c
- 
- tcpconn.o:	tcpconn.c $(INCLUDES)
--		$(CC) $(CCOPTS) -c -o tcpconn.o tcpconn.c
-+		$(CC) $(CFLAGS) -c -o tcpconn.o tcpconn.c
- 
- stty.o:		stty.c $(INCLUDES)
--		$(CC) $(CCOPTS) -c -o stty.o stty.c
-+		$(CC) $(CFLAGS) -c -o stty.o stty.c
- 
- clean:
- 		rm -f mserver tcpconn *.o core


>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message