Date: Wed, 20 Aug 2014 17:56:59 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r365494 - in head: . net-mgmt net-mgmt/send net-mgmt/send/files Message-ID: <201408201756.s7KHuxr1033527@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Wed Aug 20 17:56:58 2014 New Revision: 365494 URL: http://svnweb.freebsd.org/changeset/ports/365494 QAT: https://qat.redports.org/buildarchive/r365494/ Log: Resurrect net-mgmt/send and fix build errors. Added: head/net-mgmt/send/ - copied from r359810, head/net-mgmt/send/ head/net-mgmt/send/files/patch-Makefile.install (contents, props changed) head/net-mgmt/send/files/patch-include-cga_keyutils.h (contents, props changed) head/net-mgmt/send/files/patch-include-pkixip_ext_asn.h (contents, props changed) head/net-mgmt/send/files/patch-libs-Makefile.lib.common (contents, props changed) head/net-mgmt/send/files/patch-sendd-Makefile (contents, props changed) head/net-mgmt/send/files/sendd.in (contents, props changed) Deleted: head/net-mgmt/send/files/patch-sendd-os-sendd Modified: head/MOVED head/net-mgmt/Makefile head/net-mgmt/send/Makefile head/net-mgmt/send/files/patch-sendd-os-Makefile head/net-mgmt/send/pkg-plist Modified: head/MOVED ============================================================================== --- head/MOVED Wed Aug 20 17:53:11 2014 (r365493) +++ head/MOVED Wed Aug 20 17:56:58 2014 (r365494) @@ -6192,7 +6192,6 @@ games/sumwars||2014-06-30|Has expired: B audio/ruby-esound||2014-06-30|Has expired: Broken for more than 5 months x11-toolkits/py-pyqwt||2014-06-30|Has expired: Broken for more than 5 months net-im/ysm||2014-06-30|Has expired: Broken for more than 5 months -net-mgmt/send||2014-06-30|Has expired: Broken for more than 5 months net/p5-Jifty-Plugin-Authentication-Ldap||2014-06-30|Has expired: Broken for more than 5 months net-p2p/bittyrant||2014-06-30|Has expired: Broken for more than 5 months sysutils/gkrellm||2014-06-30|Has expired: GKrellM 1.X is no longer being developed, consider using 2.X Modified: head/net-mgmt/Makefile ============================================================================== --- head/net-mgmt/Makefile Wed Aug 20 17:53:11 2014 (r365493) +++ head/net-mgmt/Makefile Wed Aug 20 17:56:58 2014 (r365494) @@ -299,6 +299,7 @@ SUBDIR += scdp SUBDIR += scli SUBDIR += sdig + SUBDIR += send SUBDIR += sendip SUBDIR += sing SUBDIR += sipcalc Modified: head/net-mgmt/send/Makefile ============================================================================== --- head/net-mgmt/send/Makefile Mon Jun 30 08:37:29 2014 (r359810) +++ head/net-mgmt/send/Makefile Wed Aug 20 17:56:58 2014 (r365494) @@ -3,47 +3,51 @@ PORTNAME= send PORTVERSION= 0.3 +PORTREVISION= 1 CATEGORIES= net-mgmt ipv6 MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= anchie +MASTER_SITE_SUBDIR= hrs DISTNAME= ${PORTNAME}_${PORTVERSION} -MAINTAINER= anchie@FreeBSD.org +MAINTAINER= hrs@FreeBSD.org COMMENT= Secure Neighbor Discovery implementation for IPv6 -BROKEN= Fails to link -DEPRECATED= Broken for more than 5 months -EXPIRATION_DATE= 2014-06-30 +LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= dnet.1:${PORTSDIR}/net/libdnet +LIB_DEPENDS= libdnet.so:${PORTSDIR}/net/libdnet -USES= gmake +USES= gmake readline +USE_RC_SUBR= sendd SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message PORTDOCS= README UserGuide.pdf +MAKE_JOBS_UNSAFE=yes + +OPTIONS_DEFINE= DOCS -NO_STAGE= yes .include <bsd.port.pre.mk> .if ${OSVERSION} < 900042 IGNORE= is supported only on 9.0 and later .endif -post-install: - ${MKDIR} ${PREFIX}/etc/sendd/ +post-extract: ${INSTALL_DATA} ${WRKSRC}/examples/ipext/ipext_verify.conf \ - ${WRKSRC}/examples/ipext/ca/ipext.conf \ - ${WRKSRC}/examples/ + ${WRKSRC}/examples/ipext/ca/ipext.conf \ + ${WRKSRC}/examples/ ${INSTALL_DATA} ${WRKSRC}/docs/UserGuide.pdf \ - ${WRKSRC}/UserGuide.pdf + ${WRKSRC}/UserGuide.pdf + +post-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/sendd for F in sendd.conf params.conf ipext.conf ipext_verify.conf; do \ ${INSTALL_DATA} ${WRKSRC}/examples/$$F \ - ${PREFIX}/etc/sendd/$${F}-dist; \ + ${STAGEDIR}${PREFIX}/etc/sendd/$${F}-dist; \ done -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} +.if ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .endif - @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> Added: head/net-mgmt/send/files/patch-Makefile.install ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/send/files/patch-Makefile.install Wed Aug 20 17:56:58 2014 (r365494) @@ -0,0 +1,15 @@ +--- Makefile.install.orig 2010-08-28 17:58:05.000000000 +0900 ++++ Makefile.install 2014-08-20 04:27:44.000000000 +0900 +@@ -1,9 +1,9 @@ +-INSSBIN= $(PREFIXSBIN)/$(PROG) ++INSSBIN= $(DESTDIR)$(PREFIXSBIN)/$(PROG) + + $(INSSBIN): $(PROG) +- install $< $@ ++ $(BSD_INSTALL_PROGRAM) $< $@ + +-install: all $(PREFIXSBIN) $(INSSBIN) $(EXTRAINSTALL) ++install: all $(DESTDIR)$(PREFIXSBIN) $(INSSBIN) $(DESTDIR)$(EXTRAINSTALL) + + $(PREFIXSBIN): + mkdir -p $@ Added: head/net-mgmt/send/files/patch-include-cga_keyutils.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/send/files/patch-include-cga_keyutils.h Wed Aug 20 17:56:58 2014 (r365494) @@ -0,0 +1,12 @@ +--- include/cga_keyutils.h.orig 2014-08-20 04:17:35.000000000 +0900 ++++ include/cga_keyutils.h 2014-08-20 04:17:58.000000000 +0900 +@@ -36,6 +36,9 @@ + #include <openssl/x509.h> + #include <openssl/evp.h> + #include <openssl/stack.h> ++#ifndef STACK ++#define STACK _STACK ++#endif + #include <cga.h> + + extern int cga_add_key(cga_ctx_t *, EVP_PKEY *, int, uint16_t); Added: head/net-mgmt/send/files/patch-include-pkixip_ext_asn.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/send/files/patch-include-pkixip_ext_asn.h Wed Aug 20 17:56:58 2014 (r365494) @@ -0,0 +1,13 @@ +--- include/pkixip_ext_asn.h.orig 2014-08-20 04:16:53.000000000 +0900 ++++ include/pkixip_ext_asn.h 2014-08-20 04:17:09.000000000 +0900 +@@ -33,6 +33,10 @@ + #ifndef _PKIXIP_EXT_ASN_H + #define _PKIXIP_EXT_ASN_H + ++#include <openssl/stack.h> ++#ifndef STACK ++#define STACK _STACK ++#endif + #include <openssl/asn1t.h> + #include <openssl/err.h> + #include <openssl/x509v3.h> Added: head/net-mgmt/send/files/patch-libs-Makefile.lib.common ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/send/files/patch-libs-Makefile.lib.common Wed Aug 20 17:56:58 2014 (r365494) @@ -0,0 +1,9 @@ +--- libs/Makefile.lib.common.orig 2014-08-20 04:21:08.000000000 +0900 ++++ libs/Makefile.lib.common 2014-08-20 04:21:27.000000000 +0900 +@@ -1,5 +1,5 @@ + +-CFLAGS += -Wall -O3 ++CFLAGS?= -Wall -O3 + + ifeq ($(DEBUG_POLICY),DEBUG) + CPPFLAGS += -g # enable for general debugging Added: head/net-mgmt/send/files/patch-sendd-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/send/files/patch-sendd-Makefile Wed Aug 20 17:56:58 2014 (r365494) @@ -0,0 +1,13 @@ +--- sendd/Makefile.orig 2014-08-20 04:19:01.000000000 +0900 ++++ sendd/Makefile 2014-08-20 04:19:39.000000000 +0900 +@@ -6,8 +6,8 @@ + sendd.o sigmeth.o sig_rfc3971.o + INC= sendd_local.h snd_proto.h snd_config.h + +-CFLAGS= -Wall -O3 +-CPPFLAGS= -I../include -I../../src/sys ++CFLAGS?= -Wall -O3 ++CPPFLAGS+= -I../include -I../../src/sys + YFLAGS= -d -p params_ + LFLAGS= -Pparams_ + Modified: head/net-mgmt/send/files/patch-sendd-os-Makefile ============================================================================== --- head/net-mgmt/send/files/patch-sendd-os-Makefile Mon Jun 30 08:37:29 2014 (r359810) +++ head/net-mgmt/send/files/patch-sendd-os-Makefile Wed Aug 20 17:56:58 2014 (r365494) @@ -1,23 +1,18 @@ --- sendd/os/Makefile.orig 2010-08-28 17:58:04.000000000 +0900 -+++ sendd/os/Makefile 2010-12-20 15:14:58.000000000 +0900 -@@ -1,13 +1,15 @@ ++++ sendd/os/Makefile 2014-08-20 04:33:33.000000000 +0900 +@@ -1,13 +1,5 @@ OBJS += os/addr.o os/snd_freebsd.o os-linux/rand.o -CPPFLAGS += -I/usr/local/include -+CPPFLAGS += -I${LOCALBASE}/include - +- -OSLIBS= -L/usr/local/lib -l$(DNET) -+OSLIBS= -L${LOCALBASE}/lib -l$(DNET) - - OSEXTRA= os/sendd +- +-OSEXTRA= os/sendd -EXTRAINSTALL= /usr/local/etc/rc.d/sendd -+EXTRAINSTALL= ${PREFIX}/etc/rc.d/sendd - EXTRAUNINSTALL=$(EXTRAINSTALL) - - /usr/local/etc/rc.d/%: os/% -- install $< $@ +-EXTRAUNINSTALL=$(EXTRAINSTALL) - -+ touch $@ -+ chmod 0555 $@ -+ chown root:wheel $@ -+ sed -e s,%%PREFIX%%,${PREFIX},g < $< > $@ +-/usr/local/etc/rc.d/%: os/% +- install $< $@ ++CPPFLAGS += -I${LOCALBASE}/include + ++OSLIBS= -L${LOCALBASE}/lib -l$(DNET) Added: head/net-mgmt/send/files/sendd.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/send/files/sendd.in Wed Aug 20 17:56:58 2014 (r365494) @@ -0,0 +1,14 @@ +# $FreeBSD$ +# +# PROVIDE sendd +# REQUIRE NETWORKING + +. /etc/rc.subr + +name=sendd +rcvar="${name}_enable" +command="%%PREFIX%%/sbin/$name" +required_files="%%PREFIX%%/etc/${name}/${name}.conf" + +load_rc_config $name +run_rc_command "$1" Modified: head/net-mgmt/send/pkg-plist ============================================================================== --- head/net-mgmt/send/pkg-plist Mon Jun 30 08:37:29 2014 (r359810) +++ head/net-mgmt/send/pkg-plist Wed Aug 20 17:56:58 2014 (r365494) @@ -1,7 +1,6 @@ sbin/cgatool sbin/ipexttool sbin/sendd -etc/rc.d/sendd etc/sendd/sendd.conf-dist etc/sendd/params.conf-dist etc/sendd/ipext.conf-dist
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408201756.s7KHuxr1033527>