summaryrefslogtreecommitdiff
path: root/comms
diff options
context:
space:
mode:
authorSteve Price <steve@FreeBSD.org>2000-12-11 02:47:38 +0000
committerSteve Price <steve@FreeBSD.org>2000-12-11 02:47:38 +0000
commit1574c6ec514c7065cd301174be830069f6363bc2 (patch)
tree2b6dccaecc5d7393907f29025417bb37118a6db0 /comms
parent- Fix MASTER_SITES (diff)
- Support CC/CFLAGS properly
- Support NOPORTDOCS PR: 23271 Submitted by: KATO Tsuguru <tkato@prontomail.ne.jp>
Notes
Notes: svn path=/head/; revision=35864
Diffstat (limited to 'comms')
-rw-r--r--comms/mserver/Makefile6
-rw-r--r--comms/mserver/files/patch-aa30
2 files changed, 5 insertions, 31 deletions
diff --git a/comms/mserver/Makefile b/comms/mserver/Makefile
index b10286cf8d3f..b4552e2fc31b 100644
--- a/comms/mserver/Makefile
+++ b/comms/mserver/Makefile
@@ -12,13 +12,17 @@ MASTER_SITES= ftp://ftp.innet.be/pub/staff/carl/
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 --git a/comms/mserver/files/patch-aa b/comms/mserver/files/patch-aa
deleted file mode 100644
index b3d793e161af..000000000000
--- a/comms/mserver/files/patch-aa
+++ /dev/null
@@ -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