svn commit: r311855 - in head/net-mgmt/wide-dhcp: . files

[Martin Wilke]

Author: miwi
Date: Thu Feb  7 14:43:48 2013
New Revision: 311855
URL: http://svnweb.freebsd.org/changeset/ports/311855

Log:
  - Fix build with clang
  - Trim header
  
  PR:		175039
  Submitted by:	Ports Fury

Added:
  head/net-mgmt/wide-dhcp/files/patch-relay.c   (contents, props changed)
Modified:
  head/net-mgmt/wide-dhcp/Makefile   (contents, props changed)

Modified: head/net-mgmt/wide-dhcp/Makefile
==============================================================================
--- head/net-mgmt/wide-dhcp/Makefile	Thu Feb  7 14:42:20 2013	(r311854)
+++ head/net-mgmt/wide-dhcp/Makefile	Thu Feb  7 14:43:48 2013	(r311855)
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for:  dhcp
-# Date created:			  21 November 1995
-# Whom:				  Yoshiro MIHIRA <sanpei at yy.cs.keio.ac.jp>
-#
+# Created by: Yoshiro MIHIRA <sanpei at yy.cs.keio.ac.jp>
 # $FreeBSD$
-#
 
 PORTNAME=	wide-dhcp
 PORTVERSION=	1.4.0.7
@@ -13,12 +8,12 @@ MASTER_SITES=	ftp://sh.wide.ad.jp/WIDE/f
 		ftp://ftp.st.ryukoku.ac.jp/pub/network/dhcp/wide/
 DISTNAME=	dhcp-${PORTVERSION:R}p${PORTVERSION:E}
 
-LICENSE=	BSD
-LICENSE_FILE=	${WRKSRC}/Copyright
-
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Dynamic Host Configuration Protocol, WIDE Implementation
 
+LICENSE=	BSD
+LICENSE_FILE=	${WRKSRC}/Copyright
+
 MAKE_ENV=	OSTYPE="${OPSYS}"
 MAKE_JOBS_SAFE=	yes
 
@@ -27,6 +22,8 @@ MAN8=		dhcpc.8 dhcps.8 relay.8 dhcpm.8
 DOCS=		README README.jis db_sample/intro.dhcp db_sample/intro.dhcp.jis
 EXAMPLES=	dhcpdb.pool dhcpdb.relay dhcpdb.server
 
+.include <bsd.port.options.mk>
+
 post-patch:
 .for dir in client relay server tools
 	@${REINPLACE_CMD} -e \
@@ -39,11 +36,11 @@ post-patch:
 
 post-install:
 	${INSTALL_SCRIPT} ${FILESDIR}/wide-dhcps.sh.sample ${PREFIX}/etc/rc.d
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	@cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}
 	@cd ${WRKSRC}/db_sample && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR}
 .endif

Added: head/net-mgmt/wide-dhcp/files/patch-relay.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-mgmt/wide-dhcp/files/patch-relay.c	Thu Feb  7 14:43:48 2013	(r311855)
@@ -0,0 +1,11 @@
+--- relay/relay.c.orig	1999-01-01 19:28:04.000000000 +0900
++++ relay/relay.c	2012-10-25 18:05:55.000000000 +0900
+@@ -123,7 +123,7 @@
+ static void forwarding();
+ int open_if();
+ 
+-void
++int
+ main(argc, argv)
+   int argc;
+   char **argv;