From owner-svn-ports-all@FreeBSD.ORG Tue Jun 24 09:52:09 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 99E2A13F; Tue, 24 Jun 2014 09:52:09 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 86F492511; Tue, 24 Jun 2014 09:52:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5O9q9Xp020715; Tue, 24 Jun 2014 09:52:09 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5O9q98f020714; Tue, 24 Jun 2014 09:52:09 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201406240952.s5O9q98f020714@svn.freebsd.org> From: Alexey Dokuchaev Date: Tue, 24 Jun 2014 09:52:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r359066 - head/net/openospfd X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Jun 2014 09:52:09 -0000 Author: danfe Date: Tue Jun 24 09:52:09 2014 New Revision: 359066 URL: http://svnweb.freebsd.org/changeset/ports/359066 QAT: https://qat.redports.org/buildarchive/r359066/ Log: - Simplify MASTER_SITES, optimize away MASTER_SITE_SUBDIR - Modernize LIB_DEPENDS syntax, convert pkg-install to USERS/GROUPS - Correct OSVERSION check and provide more meaningful BROKEN message - Define LICENSE (ISC), use NO_WRKSUBDIR, cleanup, and stagify Deleted: head/net/openospfd/pkg-install Modified: head/net/openospfd/Makefile Modified: head/net/openospfd/Makefile ============================================================================== --- head/net/openospfd/Makefile Tue Jun 24 09:06:17 2014 (r359065) +++ head/net/openospfd/Makefile Tue Jun 24 09:52:09 2014 (r359066) @@ -4,9 +4,8 @@ PORTNAME= openospfd PORTVERSION= 4.3 PORTREVISION= 1 CATEGORIES= net -MASTER_SITES= ${MASTER_SITE_OPENBSD:S/$/:openbsd/g} \ - ${MASTER_SITE_LOCAL:S/$/:freebsd/g} -MASTER_SITE_SUBDIR= flz/openospfd/:freebsd OpenBGPD/:openbsd +MASTER_SITES= OPENBSD/OpenBGPD:openbsd \ + LOCAL/flz/openospfd/:freebsd DISTFILES= ${PORTNAME}-${PORTVERSION}.tgz:openbsd \ if_media.h:freebsd DIST_SUBDIR= ${PORTNAME} @@ -15,34 +14,33 @@ EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION} MAINTAINER= rea@FreeBSD.org COMMENT= Free implementation of the Open Shortest Path First Protocol -LIB_DEPENDS= event-1.4:${PORTSDIR}/devel/libevent +LICENSE= ISCL CONFLICTS= zebra-0* quagga-0* -WRKSRC= ${WRKDIR} -MANCOMPRESSED= yes -USE_RC_SUBR= openospfd +LIB_DEPENDS= libevent-1.4.so:${PORTSDIR}/devel/libevent + MAKE_ENV= BINDIR="${PREFIX}/sbin" \ MANDIR="${PREFIX}/man/man" COPTS= -I${LOCALBASE}/include -DMD5_DIGEST_LENGTH=16 LDADD= -L${LOCALBASE}/lib -levent -lmd +NO_WRKSUBDIR= yes +USE_RC_SUBR= ${PORTNAME} +USERS= _ospfd +GROUPS= _ospfd + +PLIST_FILES= sbin/ospfctl \ + sbin/ospfd \ + man/man5/ospfd.conf.5.gz \ + man/man8/ospfctl.8.gz \ + man/man8/ospfd.8.gz -PLIST_FILES= sbin/ospfctl \ - sbin/ospfd - -MAN5= ospfd.conf.5 -MAN8= ospfctl.8 \ - ospfd.8 - -SUBDIRS= ospfd \ - ospfctl - -NO_STAGE= yes post-extract: @${CP} ${DISTDIR}/${DIST_SUBDIR}/if_media.h ${WRKSRC}/ospfctl/ post-patch: - @${REINPLACE_CMD} -e "s||\"if_media.h\"|" ${WRKSRC}/ospfctl/ospfctl.c + @${REINPLACE_CMD} -e "s||\"if_media.h\"|" \ + ${WRKSRC}/ospfctl/ospfctl.c @${REINPLACE_CMD} -e "/rc.conf.local/d" ${WRKSRC}/ospfd/ospfd.conf.5 @${REINPLACE_CMD} -e "s|SIMPLEQ|STAILQ|" ${WRKSRC}/ospfd/*.[chy] @${REINPLACE_CMD} -e "s|/etc|${PREFIX}/etc|g" \ @@ -54,23 +52,24 @@ post-patch: ${WRKSRC}/ospfd/ospfd.c \ ${WRKSRC}/ospfctl/ospfctl.c +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000003 +BROKEN= requires old CARP implementation (interface layer) +.endif + do-build: -.for i in ${SUBDIRS} - cd ${WRKSRC}/$i; make COPTS="${COPTS}" LDADD="${LDADD}" +.for subdir in ospfd ospfctl + ${MAKE_CMD} -C ${WRKSRC}/${subdir} COPTS="${COPTS}" LDADD="${LDADD}" .endfor do-install: -.for i in ${SUBDIRS} - cd ${WRKSRC}/$i; make install ${MAKE_ENV} LOCALBASE=${LOCALBASE} -.endfor - -post-install: - @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - -.include - -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000 -BROKEN= Does not build on FreeBSD 10+ -.endif + ${INSTALL_PROGRAM} ${WRKSRC}/ospfctl/ospfctl ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_MAN} ${WRKSRC}/ospfctl/ospfctl.8 \ + ${STAGEDIR}${PREFIX}/man/man8 + ${INSTALL_PROGRAM} ${WRKSRC}/ospfd/ospfd ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_MAN} ${WRKSRC}/ospfd/ospfd.conf.5 \ + ${STAGEDIR}${PREFIX}/man/man5 + ${INSTALL_MAN} ${WRKSRC}/ospfd/ospfd.8 ${STAGEDIR}${PREFIX}/man/man8 .include