Date: Wed, 27 Feb 2013 17:14:42 +0100 From: Baptiste Daroussin <bapt@FreeBSD.org> To: Michael Scheidell <scheidell@FreeBSD.org> Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org Subject: Re: svn commit: r313059 - in head/net/yate: . files Message-ID: <20130227161442.GJ16178@ithaqua.etoilebsd.net> In-Reply-To: <201302271453.r1RErNSc090629@svn.freebsd.org> References: <201302271453.r1RErNSc090629@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--KZLWU/9q3evlN4nQ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable See remarks below On Wed, Feb 27, 2013 at 02:53:23PM +0000, Michael Scheidell wrote: > Author: scheidell > Date: Wed Feb 27 14:53:22 2013 > New Revision: 313059 > URL: http://svnweb.freebsd.org/changeset/ports/313059 >=20 > Log: > - Update to 4.3.0 > - Update Makefile header to new format > =20 > PR: ports/176159 >=20 > Modified: > head/net/yate/Makefile (contents, props changed) > head/net/yate/distinfo (contents, props changed) > head/net/yate/files/extra-patch-noportdocs (contents, props changed) > head/net/yate/files/patch-Makefile.in (contents, props changed) > head/net/yate/files/patch-conf.d__Makefile.in (contents, props change= d) > head/net/yate/files/patch-configure.in (contents, props changed) > head/net/yate/files/patch-modules__Makefile.in (contents, props chang= ed) > head/net/yate/files/patch-modules__h323chan.cpp (contents, props chan= ged) > head/net/yate/pkg-plist (contents, props changed) >=20 > Modified: head/net/yate/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/net/yate/Makefile Wed Feb 27 14:37:43 2013 (r313058) > +++ head/net/yate/Makefile Wed Feb 27 14:53:22 2013 (r313059) > @@ -1,14 +1,11 @@ > -# New ports collection makefile for: yate > -# Date created: 2011-04-05 > -# Whom: Valery Komarov <komarov@valerka.net> > -# > +# Created by: Valery Komarov <komarov@valerka.net> > # $FreeBSD$ > =20 > PORTNAME=3D yate > -PORTVERSION=3D 4.0.0.p1 > +PORTVERSION=3D 4.3.0.p1 > CATEGORIES=3D net > MASTER_SITES=3D http://yate.null.ro/tarballs/yate4/ > -DISTNAME=3D yate-4.0.0-1 > +DISTNAME=3D yate-4.3.0-1 > =20 > MAINTAINER=3D komarov@valerka.net > COMMENT=3D Yet Another Telephony Engine > @@ -40,16 +37,30 @@ MAKE_ENV=3D PTHREAD_CFLAGS=3D"${PTHREAD_CFLA > =20 > MAN8=3D yate-config.8 yate.8 > =20 > -OPTIONS=3D MYSQL "MySQL Database support" off \ > - PGSQL "PostgreSQL Database support" off \ > - SCTP "Stream Control Transmission Protocol" on \ > - AMR_NB "AMR Narrow Band encoder (opencore)" off \ > - ILBC "Enable iLBC codec" off \ > - SPANDSP "Enable Spandsp faxing support" off \ > - DAHDI "Dahdi driver" off \ > - H323 "H323 software channel/protocol support" off \ > - SSL "Enable SSL support" off \ > - ALSA "Enable ALSA channel support" off > +OPTIONS_DEFINE=3D \ > + MYSQL \ > + PGSQL \ > + SCTP \ > + AMR_NB \ > + ILBC \ > + SPANDSP \ > + DAHDI \ > + H323 \ > + SSL \ > + ALSA The above is just a matter of taste but I do prefer when inlined :) > + > +MYSQL_DESC=3D MySQL Database support > +PGSQL_DESC=3D PostgreSQL Database support > +SCTP_DESC=3D Stream Control Transmission Protocol > +AMR_NB_DESC=3D AMR Narrow Band encoder (opencore) > +ILBC_DESC=3D Enable iLBC codec > +SPANDSP_DESC=3D Enable Spandsp faxing support > +DAHDI_DESC=3D Dahdi driver > +H323_DESC=3D H323 software channel/protocol support > +SSL_DESC=3D Enable SSL support > +ALSA_DESC=3D Enable ALSA channel support Why not reusing the generic descriptions when they match? I'm thinking of M= YSQL PGSQL ALSA SSL > + > @@ -59,7 +70,7 @@ GROUPS=3D yate > =20 > .include <bsd.port.pre.mk> Should be =2Einclude <bsd.port.options.mk> pre.mk is useless here and finish by a simple .include <bsd.port.mk> Here pre/post seems useless (at least I don't what needs the pre/post > =20 > -.if !defined(WITHOUT_MYSQL) > +.if ${PORT_OPTIONS:MMYSQL} > CONFIGURE_ARGS+=3D --with-mysql > MAKE_ENV+=3D WITH_MYSQL=3D1 > PLIST_SUB+=3D WITH_MYSQL=3D"" > @@ -69,7 +80,7 @@ CONFIGURE_ARGS+=3D --without-mysql > PLIST_SUB+=3D WITH_MYSQL=3D"@comment " > .endif > =20 > -.if !defined(WITHOUT_PGSQL) > +.if ${PORT_OPTIONS:MPGSQL} > CONFIGURE_ARGS+=3D --with-libpq=3D${LOCALBASE} > MAKE_ENV+=3D WITH_PGSQL=3D1 > PLIST_SUB+=3D WITH_PGSQL=3D"" > @@ -79,7 +90,7 @@ CONFIGURE_ARGS+=3D --without-libpq > PLIST_SUB+=3D WITH_PGSQL=3D"@comment " > .endif > =20 > -.if !defined(WITHOUT_SCTP) > +.if ${PORT_OPTIONS:MSCTP} > CONFIGURE_ARGS+=3D --enable-sctp > MAKE_ENV+=3D WITH_SCTP=3D1 > PLIST_SUB+=3D WITH_SCTP=3D"" > @@ -87,7 +98,7 @@ PLIST_SUB+=3D WITH_SCTP=3D"" > PLIST_SUB+=3D WITH_SCTP=3D"@comment " > .endif > =20 > -.if !defined(WITHOUT_AMR_NB) > +.if ${PORT_OPTIONS:MAMR_NB} > LIB_DEPENDS+=3D opencore-amrnb.0:${PORTSDIR}/audio/opencore-amr > CONFIGURE_ARGS+=3D --with-amrnb=3D${LOCALBASE} > PLIST_SUB+=3D WITH_AMR_NB=3D"" > @@ -96,7 +107,7 @@ CONFIGURE_ARGS+=3D --without-amrnb > PLIST_SUB+=3D WITH_AMR_NB=3D"@comment " > .endif > =20 > -.if !defined(WITHOUT_ILBC) > +.if ${PORT_OPTIONS:MILBC} > LIB_DEPENDS+=3D ilbc.0:${PORTSDIR}/net/ilbc > CONFIGURE_ARGS+=3D --enable-ilbc > PLIST_SUB+=3D WITH_ILBC=3D"" > @@ -105,7 +116,7 @@ CONFIGURE_ARGS+=3D --disable-ilbc > PLIST_SUB+=3D WITH_ILBC=3D"@comment " > .endif > =20 > -.if !defined(WITHOUT_SPANDSP) > +.if ${PORT_OPTIONS:MSPANDSP} > CONFIGURE_ARGS+=3D --with-spandsp=3D${LOCALBASE}/include > LIB_DEPENDS+=3D spandsp.2:${PORTSDIR}/comms/spandsp-devel > MAKE_ENV+=3D WITH_SPANDSP=3D1 > @@ -115,7 +126,7 @@ CONFIGURE_ARGS+=3D --without-spandsp > PLIST_SUB+=3D WITH_SPANDSP=3D"@comment " > .endif > =20 > -.if !defined(WITHOUT_DAHDI) > +.if ${PORT_OPTIONS:MDAHDI} > CONFIGURE_ARGS+=3D --enable-dahdi --enable-wpcard --enable-tdmcard > BUILD_DEPENDS+=3D ${LOCALBASE}/include/dahdi/user.h:${PORTSDIR}/misc/dah= di > MAKE_ENV+=3D WITH_DAHDI=3D1 > @@ -125,7 +136,7 @@ CONFIGURE_ARGS+=3D --disable-dahdi > PLIST_SUB+=3D WITH_DAHDI=3D"@comment " > .endif > =20 > -.if !defined(WITHOUT_H323) > +.if ${PORT_OPTIONS:MH323} > CONFIGURE_ARGS+=3D --with-pwlib=3D${LOCALBASE} \ > --with-openh323=3D${LOCALBASE} > LIB_DEPENDS+=3D pt_r.1:${PORTSDIR}/devel/pwlib \ > @@ -137,7 +148,7 @@ CONFIGURE_ARGS+=3D --without-openh323 > PLIST_SUB+=3D WITH_H323=3D"@comment " > .endif > =20 > -.if !defined(WITHOUT_SSL) > +.if ${PORT_OPTIONS:MSSL} > .include "${PORTSDIR}/Mk/bsd.openssl.mk" > CONFIGURE_ARGS+=3D --with-openssl=3D${OPENSSLBASE} > MAKE_ENV+=3D WITH_SSL=3D1 > @@ -147,7 +158,7 @@ CONFIGURE_ARGS+=3D --without-openssl > PLIST_SUB+=3D WITH_SSL=3D"@comment " > .endif > =20 > -.if defined(WITH_ALSA) > +.if ${PORT_OPTIONS:MALSA} > LIB_DEPENDS+=3D asound.2:${PORTSDIR}/audio/alsa-lib > MAKE_ENV+=3D WITH_ALSA=3D1 > PLIST_SUB+=3D WITH_ALSA=3D"" > @@ -156,7 +167,7 @@ EXTRA_PATCHES+=3D ${FILESDIR}/extra-patch- > PLIST_SUB+=3D WITH_ALSA=3D"@comment " > .endif > =20 > -.if defined(NOPORTDOCS) > +.if ${PORT_OPTIONS:MDOCS} Here this should be .if ! ${PORT_OPTIONS:MDOCS} > EXTRA_PATCHES+=3D ${FILESDIR}/extra-patch-noportdocs > .endif > =20 >=20 =20 [...] > @dirrm lib/pkgconfig [...] > @exec mkdir -p %D/lib/pkgconfig Why does the plist create and destroy a directory which is totally unused? = is it is to match upstream Makefile that does creates during make install then the upstream Makefile should be fixed --KZLWU/9q3evlN4nQ Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iEYEARECAAYFAlEuMPIACgkQ8kTtMUmk6ExTfQCfYgiJuM9XvsOOCAh/HPicVmEa yzIAn1StBx/V4EjLxcgesoFyJJBJJDlA =S7cX -----END PGP SIGNATURE----- --KZLWU/9q3evlN4nQ--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130227161442.GJ16178>