From owner-svn-ports-all@FreeBSD.ORG Sun Jul 6 00:17:50 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 9381155C; Sun, 6 Jul 2014 00:17:50 +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 80B9A2CE6; Sun, 6 Jul 2014 00:17:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s660Hoqo062773; Sun, 6 Jul 2014 00:17:50 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s660HnSR062770; Sun, 6 Jul 2014 00:17:49 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201407060017.s660HnSR062770@svn.freebsd.org> From: John Marino Date: Sun, 6 Jul 2014 00:17:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360852 - head/net/linphone-base 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: Sun, 06 Jul 2014 00:17:50 -0000 Author: marino Date: Sun Jul 6 00:17:49 2014 New Revision: 360852 URL: http://svnweb.freebsd.org/changeset/ports/360852 QAT: https://qat.redports.org/buildarchive/r360852/ Log: net/linphone-base: stage, convert to use ports readline Modified: head/net/linphone-base/Makefile head/net/linphone-base/pkg-plist head/net/linphone-base/pkg-plist.gui Modified: head/net/linphone-base/Makefile ============================================================================== --- head/net/linphone-base/Makefile Sun Jul 6 00:08:26 2014 (r360851) +++ head/net/linphone-base/Makefile Sun Jul 6 00:17:49 2014 (r360852) @@ -18,12 +18,14 @@ LIB_DEPENDS= libgsm.so:${PORTSDIR}/audio CONFLICTS= ortp-[0-9]* USE_GNOME= glib20 intlhack -USES= gmake pathfix pkgconfig +USES= gmake pathfix pkgconfig readline:port USE_AUTOTOOLS= libtool LIBTOOLFILES= configure oRTP/configure mediastreamer2/configure CONFIGURE_ARGS= --disable-ipv6 --disable-manual --disable-ewarning \ --disable-strict --disable-video --disable-external-ortp \ - --with-osip=${LOCALBASE} --with-gsm=${LOCALBASE} + --with-osip=${LOCALBASE} --with-gsm=${LOCALBASE} \ + --with-readline=${LOCALBASE} +CONFIGURE_ENV+= ac_cv_lib_readline_readline=yes MAKE_ENV= SUBDIRS="${SUBDIRS}" USE_LDCONFIG= yes @@ -31,16 +33,14 @@ CPPFLAGS+= -I${LOCALBASE}/include ${PTHR LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} OPTIONS_DEFINE= NLS +OPTIONS_SUB= yes + +NLS_CONFIGURE_ENABLE= nls -NO_STAGE= yes .include .if ${PORT_OPTIONS:MNLS} USES+= gettext -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+= --disable-nls -PLIST_SUB+= NLS="@comment " .endif .if defined(LINPHONE_GUI) @@ -49,17 +49,13 @@ RUN_DEPENDS+= linphone-base>=${PORTVERSI DESCR= ${PKGDIR}/pkg-descr.gui PLIST= ${PKGDIR}/pkg-plist.gui USE_GNOME+= libglade2 -MAN1= linphone.1 SUBDIRS= pixmaps gtk-glade .else PKGNAMESUFFIX= -base CONFIGURE_ARGS+= --enable-gtk_ui=no -MAN1= linphonec.1 linphonecsh.1 sipomatic.1 SUBDIRS= po oRTP mediastreamer2 coreapi console .endif -.include - .if ${ARCH} == "powerpc" BROKEN= Does not compile on powerpc .endif @@ -77,19 +73,25 @@ post-patch: post-install: .if defined(LINPHONE_GUI) - @${LN} -sf linphone-3 ${PREFIX}/bin/linphone - ${INSTALL_MAN} ${WRKSRC}/share/C/linphone.1 ${MANPREFIX}/man/man1 + cd ${STAGEDIR}${PREFIX}/bin && \ + ${LN} -sf linphone-3 linphone + ${INSTALL_MAN} ${WRKSRC}/share/C/linphone.1 \ + ${STAGEDIR}${MANPREFIX}/man/man1 ${INSTALL_DATA} ${WRKSRC}/share/linphone.desktop \ - ${PREFIX}/share/applications + ${STAGEDIR}${PREFIX}/share/applications .else - ${INSTALL_MAN} ${WRKSRC}/share/C/linphonec.1 ${MANPREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/share/C/linphonecsh.1 ${MANPREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/share/C/sipomatic.1 ${MANPREFIX}/man/man1 - ${INSTALL_DATA} ${WRKSRC}/share/linphone.pc ${PREFIX}/libdata/pkgconfig - @${MKDIR} ${DATADIR}/sounds - ${INSTALL_DATA} ${WRKSRC}/share/*.wav ${DATADIR}/sounds - @${MKDIR} ${DATADIR}/sounds/rings - ${INSTALL_DATA} ${WRKSRC}/share/rings/*.wav ${DATADIR}/sounds/rings + @${MKDIR} ${STAGEDIR}${DATADIR}/sounds/rings + ${INSTALL_MAN} \ + ${WRKSRC}/share/C/linphonec.1 \ + ${WRKSRC}/share/C/linphonecsh.1 \ + ${WRKSRC}/share/C/sipomatic.1 \ + ${STAGEDIR}${MANPREFIX}/man/man1 + ${INSTALL_DATA} ${WRKSRC}/share/linphone.pc \ + ${STAGEDIR}${PREFIX}/libdata/pkgconfig + ${INSTALL_DATA} ${WRKSRC}/share/*.wav \ + ${STAGEDIR}${DATADIR}/sounds + ${INSTALL_DATA} ${WRKSRC}/share/rings/*.wav \ + ${STAGEDIR}${DATADIR}/sounds/rings .endif -.include +.include Modified: head/net/linphone-base/pkg-plist ============================================================================== --- head/net/linphone-base/pkg-plist Sun Jul 6 00:08:26 2014 (r360851) +++ head/net/linphone-base/pkg-plist Sun Jul 6 00:17:49 2014 (r360852) @@ -59,6 +59,9 @@ libdata/pkgconfig/linphone.pc libdata/pkgconfig/mediastreamer.pc libdata/pkgconfig/ortp.pc libexec/mediastream +man/man1/linphonec.1.gz +man/man1/linphonecsh.1.gz +man/man1/sipomatic.1.gz %%DATADIR%%/sounds/hello16000.wav %%DATADIR%%/sounds/hello8000.wav %%DATADIR%%/sounds/ringback.wav Modified: head/net/linphone-base/pkg-plist.gui ============================================================================== --- head/net/linphone-base/pkg-plist.gui Sun Jul 6 00:08:26 2014 (r360851) +++ head/net/linphone-base/pkg-plist.gui Sun Jul 6 00:17:49 2014 (r360852) @@ -1,5 +1,6 @@ bin/linphone bin/linphone-3 +man/man1/libphone.1.gz share/applications/linphone.desktop %%DATADIR%%/COPYING %%DATADIR%%/about.glade