From owner-svn-ports-all@FreeBSD.ORG Fri Feb 14 16:25:02 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 69DC0DE8; Fri, 14 Feb 2014 16:25:02 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 566501AA9; Fri, 14 Feb 2014 16:25:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1EGP2HK022020; Fri, 14 Feb 2014 16:25:02 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1EGP2xp022019; Fri, 14 Feb 2014 16:25:02 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201402141625.s1EGP2xp022019@svn.freebsd.org> From: Mathieu Arnold Date: Fri, 14 Feb 2014 16:25:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r344279 - head/devel/pwlib 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.17 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: Fri, 14 Feb 2014 16:25:02 -0000 Author: mat Date: Fri Feb 14 16:25:01 2014 New Revision: 344279 URL: http://svnweb.freebsd.org/changeset/ports/344279 QAT: https://qat.redports.org/buildarchive/r344279/ Log: - Convert to staging - Convert to new options knobs. Sponsored by: Absolight Modified: head/devel/pwlib/Makefile Modified: head/devel/pwlib/Makefile ============================================================================== --- head/devel/pwlib/Makefile Fri Feb 14 16:23:59 2014 (r344278) +++ head/devel/pwlib/Makefile Fri Feb 14 16:25:01 2014 (r344279) @@ -6,14 +6,14 @@ PORTVERSION= 1.12.0 PORTREVISION= 8 PORTEPOCH= 1 CATEGORIES= devel -MASTER_SITES= SF/openh323/${PORTNAME}/${PORTVERSION} +MASTER_SITES= SF/openh323/${PORTNAME}/${PORTVERSION} DISTNAME= ptlib-v${PORTVERSION:S/./_/g}-src DIST_SUBDIR= openh323 MAINTAINER= ports@FreeBSD.org COMMENT= Cross platform C++ library, used by OpenH323 -LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 +LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 CONFLICTS= ptlib-2.* @@ -27,74 +27,45 @@ USE_OPENSSL= yes USE_LDCONFIG= yes MAKE_JOBS_UNSAFE= yes -NO_STAGE= yes -.include +OPTIONS_DEFINE= SDL PLUGINS LDAP ESOUND V4L +OPTIONS_DEFAULT= PLUGINS LDAP +OPTIONS_SUB= yes +LDAP_DESC= OpenLDAP support -.if ${ARCH} == "arm" -BROKEN= Does not install on arm: mtree -.endif +BROKEN_armv6= Does not install on arm: mtree -CFLAGS= -O1 +CFLAGS+= -O1 MAKE_ENV= STDCCFLAGS+="-I${LOCALBASE}" CPPFLAGS+= -O1 -I${WRKSRC}/include -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV+= ATOMICITY_H="" -# if explicitely asked for, depend upon it -.if defined(WITH_SDL) -USE_SDL+= sdl -CONFIGURE_ENV+= SDLLIBDIR="${LOCALBASE}/lib" -MAKE_ENV+= SDLLIBDIR="${LOCALBASE}/lib" -.endif +SDL_USE= SDL=sdl +SDL_CONFIGURE_ENV= SDLLIBDIR="${LOCALBASE}/lib" +SDL_MAKE_ENV= SDLLIBDIR="${LOCALBASE}/lib" +SDL_CONFIGURE_ENABLE= sdl + +PLUGINS_CONFIGURE_ENABLE= plugins + +LDAP_CONFIGURE_ENABLE= openldap +LDAP_USE= OPENLDAP=yes +LDAP_CONFIGURE_ENV= OPENLDAPLIBDIR="${LOCALBASE}/lib" +LDAP_MAKE_ENV= OPENLDAPLIBDIR="${LOCALBASE}/lib" -# if explicitely disabled, do not depend upon it -.if defined(WITHOUT_SDL) -CONFIGURE_ARGS+= --disable-sdl -.endif +ESOUND_USE= GNOME=esound +ESOUND_CONFIGURE_ENABLE= esd -# if nobody cares, use it if it is installed already -.if !defined(WITHOUT_SDL) && !defined(WITH_SDL) -.if ${HAVE_SDL:Msdl} -USE_SDL+= sdl -CONFIGURE_ENV+= SDLLIBDIR="${LOCALBASE}/lib" -MAKE_ENV+= SDLLIBDIR="${LOCALBASE}/lib" -.else -CONFIGURE_ARGS+= --disable-sdl -.endif -.endif - -.if !defined(WITHOUT_PLUGINS) -CONFIGURE_ARGS+= --enable-plugins -.endif +V4L_CONFIGURE_ENABLE= v4l +V4L_BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat #explicity build OSS CONFIGURE_ARGS+= --enable-oss - -#disable OpenLDAP support in PWLIB -.if defined(WITHOUT_LDAP) -CONFIGURE_ARGS+= --disable-openldap -.else -USE_OPENLDAP= yes -CONFIGURE_ENV+= OPENLDAPLIBDIR="${LOCALBASE}/lib" -MAKE_ENV+= OPENLDAPLIBDIR="${LOCALBASE}/lib" -.endif - #disable OBDC support... it doesn't compile and nothing _seems_ to #actually use it. If you do have something that requires this please #send patches! CONFIGURE_ARGS+= --disable-odbc -#enable esound support -.if defined(WITH_ESOUND) && ${HAVE_GNOME:Mesound}!="" -USE_GNOME+= esound -CONFIGURE_ARGS+= --enable-esd -PLIST_SUB+= ESD="" -.else -CONFIGURE_ARGS+= --disable-esd -PLIST_SUB+= ESD="@comment " -.endif - # ONLY FOR THE BRAVE! # If someone owns a firewire(4) video device and wants to use it for # video-conferencing purposes, please download the files: @@ -123,6 +94,8 @@ CONFIGURE_ARGS+= --disable-dc PLIST_SUB+= DC1394="@comment " #.endif +.include + .if (${ARCH} == "amd64") || (${ARCH} == "ia64") || (${ARCH} == "powerpc") || (${ARCH} == "sparc64") CFLAGS+= -fPIC .endif @@ -133,14 +106,4 @@ PLIST_SUB+= BSDVIDEO="" PLIST_SUB+= BSDVIDEO="@comment " .endif -.if defined(WITH_V4L) || ( exists(${LOCALBASE}/include/linux/videodev.h) && \ - !defined(WITHOUT_V4L) ) -CONFIGURE_ARGS+=--enable-v4l -PLIST_SUB+= V4L="" -BUILD_DEPENDS+= ${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat -.else -CONFIGURE_ARGS+=--disable-v4l -PLIST_SUB+= V4L="@comment " -.endif - .include