From owner-svn-ports-head@freebsd.org Sun Oct 11 15:13:54 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 14EFCA111BD; Sun, 11 Oct 2015 15:13:54 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 DDAC065D; Sun, 11 Oct 2015 15:13:53 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9BFDq1o081379; Sun, 11 Oct 2015 15:13:52 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9BFDqtZ081378; Sun, 11 Oct 2015 15:13:52 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201510111513.t9BFDqtZ081378@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Sun, 11 Oct 2015 15:13:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r399091 - in head/security/ipsec-tools: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Oct 2015 15:13:54 -0000 Author: amdmi3 Date: Sun Oct 11 15:13:52 2015 New Revision: 399091 URL: https://svnweb.freebsd.org/changeset/ports/399091 Log: - Switch to options helpers - Drop 8.x support Approved by: portmgr blanket Deleted: head/security/ipsec-tools/files/patch8-utmp.diff Modified: head/security/ipsec-tools/Makefile Modified: head/security/ipsec-tools/Makefile ============================================================================== --- head/security/ipsec-tools/Makefile Sun Oct 11 15:03:16 2015 (r399090) +++ head/security/ipsec-tools/Makefile Sun Oct 11 15:13:52 2015 (r399091) @@ -55,113 +55,30 @@ WCPSKEY_DESC= Allow wildcard matching fo PORTDOCS= * PORTEXAMPLES= * -.include - -.if ${OSVERSION} < 900007 -EXTRA_PATCHES= ${FILESDIR}/patch8-utmp.diff -.endif - -.if ${PORT_OPTIONS:MDEBUG} -CONFIGURE_ARGS+= --enable-debug -.else -CONFIGURE_ARGS+= --disable-debug -.endif - -.if ${PORT_OPTIONS:MIPV6} -CONFIGURE_ARGS+= --enable-ipv6 -.else -CONFIGURE_ARGS+= --disable-ipv6 -.endif - -.if ${PORT_OPTIONS:MADMINPORT} -CONFIGURE_ARGS+= --enable-adminport -.else -CONFIGURE_ARGS+= --disable-adminport -.endif - -.if ${PORT_OPTIONS:MSTATS} -CONFIGURE_ARGS+= --enable-stats -.else -CONFIGURE_ARGS+= --disable-stats -.endif - -.if ${PORT_OPTIONS:MDPD} -CONFIGURE_ARGS+= --enable-dpd -.else -CONFIGURE_ARGS+= --disable-dpd -.endif - -.if ${PORT_OPTIONS:MNATT} -. if ${PORT_OPTIONS:MNATTF} -CONFIGURE_ARGS+= --enable-natt=yes -. else -CONFIGURE_ARGS+= --enable-natt=kernel -. endif -.else -CONFIGURE_ARGS+= --disable-natt -.endif - -.if ${PORT_OPTIONS:MFRAG} -CONFIGURE_ARGS+= --enable-frag -.else -CONFIGURE_ARGS+= --disable-frag -.endif - -.if ${PORT_OPTIONS:MHYBRID} -CONFIGURE_ARGS+= --enable-hybrid -.else -CONFIGURE_ARGS+= --disable-hybrid -.endif - -.if ${PORT_OPTIONS:MPAM} -CONFIGURE_ARGS+= --with-libpam -.else -CONFIGURE_ARGS+= --without-libpam -.endif - -.if ${PORT_OPTIONS:MGSSAPI} -USES+= iconv -CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ARGS+= --enable-gssapi -.else -CONFIGURE_ARGS+= --disable-gssapi -.endif - -.if ${PORT_OPTIONS:MRADIUS} -CONFIGURE_ARGS+= --with-libradius -.else -CONFIGURE_ARGS+= --without-libradius -.endif - -.if ${PORT_OPTIONS:MLDAP} -USE_OPENLDAP= YES -CONFIGURE_ARGS+= --with-libldap=${LOCALBASE} -.else -CONFIGURE_ARGS+= --without-libldap -.endif - -.if ${PORT_OPTIONS:MSAUNSPEC} -CONFIGURE_ARGS+= --enable-samode-unspec -.else -CONFIGURE_ARGS+= --disable-samode-unspec -.endif - -.if ${PORT_OPTIONS:MRC5} -CONFIGURE_ARGS+= --enable-rc5 -.else -CONFIGURE_ARGS+= --disable-rc5 -.endif - -.if ${PORT_OPTIONS:MIDEA} -CONFIGURE_ARGS+= --enable-idea -.else -CONFIGURE_ARGS+= --disable-idea -.endif - -.if ${PORT_OPTIONS:MWCPSKEY} -EXTRA_PATCHES= ${FILESDIR}/wildcard-psk.diff -.endif +DEBUG_CONFIGURE_ENABLE= debug +IPV6_CONFIGURE_ENABLE= ipv6 +ADMINPORT_CONFIGURE_ENABLE=adminport +STATS_CONFIGURE_ENABLE= stats +DPD_CONFIGURE_ENABLE= dpd +NATTF_VARS= NATT=yes +NATTF_VARS_OFF= NATT=kernel +NATT_CONFIGURE_ON= --enable-natt=${NATT} +NATT_CONFIGURE_OFF= --disable-natt +FRAG_CONFIGURE_ENABLE= frag +HYBRID_CONFIGURE_ENABLE=hybrid +PAM_CONFIGURE_WITH= libpam +GSSAPI_USES= iconv +GSSAPI_CFLAGS= -I${LOCALBASE}/include +GSSAPI_LDFLAGS= -L${LOCALBASE}/lib +GSSAPI_CONFIGURE_ENABLE=gssapi +RADIUS_CONFIGURE_WITH= libradius +LDAP_USE= OPENLDAP=yes +LDAP_CONFIGURE_ON= --with-libldap=${LOCALBASE} +LDAP_CONFIGURE_OFF= --without-libldap +SAUNSPEC_CONFIGURE_ENABLE= samode-unspec +RC5_CONFIGURE_ENABLE= rc5 +IDEA_CONFIGURE_ENABLE= idea +WCPSKEY_EXTRA_PATCHES= ${FILESDIR}/wildcard-psk.diff post-patch: @${REINPLACE_CMD} -e "s/-Werror//g ; s/-R$$libdir/-Wl,-rpath=$$libdir/g" ${WRKSRC}/configure @@ -172,10 +89,14 @@ post-install: ${ECHO_MSG} "WARNING: IPsec feature is disabled on this host"; \ ${ECHO_MSG} " You must build the kernel if you want to run racoon on the host"; \ fi ; + +post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}/${EXAMPLESDIR} @${RM} -f ${WRKSRC}/src/racoon/samples/*.in @${CP} -r ${WRKSRC}/src/racoon/samples/* ${STAGEDIR}/${EXAMPLESDIR} + +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}/${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/src/racoon/doc/* ${STAGEDIR}/${DOCSDIR} -.include +.include