From owner-svn-ports-head@FreeBSD.ORG Fri Aug 2 05:06:27 2013 Return-Path: Delivered-To: svn-ports-head@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 ESMTP id 2758B8D5; Fri, 2 Aug 2013 05:06:27 +0000 (UTC) (envelope-from danfe@FreeBSD.org) 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 145742477; Fri, 2 Aug 2013 05:06:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7256QiA086591; Fri, 2 Aug 2013 05:06:26 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7256QJ3086587; Fri, 2 Aug 2013 05:06:26 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201308020506.r7256QJ3086587@svn.freebsd.org> From: Alexey Dokuchaev Date: Fri, 2 Aug 2013 05:06:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r324141 - in head/net/iaxmodem: . 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.14 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: Fri, 02 Aug 2013 05:06:27 -0000 Author: danfe Date: Fri Aug 2 05:06:26 2013 New Revision: 324141 URL: http://svnweb.freebsd.org/changeset/ports/324141 Log: - Unbreak the build, sort the knobs, generally cleanup Makefile - Convert pkg-plist into PLIST_FILES, PORTDOCS, and PORTEXAMPLES - Sanitize installation procedure, improve files/pkg-message.in - Reformat port description, point WWW to a more canonical URL Deleted: head/net/iaxmodem/pkg-plist Modified: head/net/iaxmodem/Makefile head/net/iaxmodem/files/pkg-message.in head/net/iaxmodem/pkg-descr Modified: head/net/iaxmodem/Makefile ============================================================================== --- head/net/iaxmodem/Makefile Fri Aug 2 04:54:11 2013 (r324140) +++ head/net/iaxmodem/Makefile Fri Aug 2 05:06:26 2013 (r324141) @@ -10,38 +10,45 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME} MAINTAINER= stucchi@gufi.org COMMENT= Software modem that connects to IAX channel -LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff +LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff -BROKEN= Does not build +USES= perl5 +USE_PERL5= patch +HAS_CONFIGURE= yes +USE_RC_SUBR= ${PORTNAME} +SUB_FILES= pkg-message -MAN1= iaxmodem.1 CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -SUB_FILES= pkg-message -USE_RC_SUBR= iaxmodem -GNU_CONFIGURE= yes +PLIST_FILES= sbin/${PORTNAME} +PORTDOCS= CHANGES FAQ README +PORTEXAMPLES= config.ttyIAX iaxmodem-cfg.ttyIAX +MAN1= ${PORTNAME}.1 + +OPTIONS_DEFINE= DOCS EXAMPLES + +.include post-patch: - @${REINPLACE_CMD} -e "s|/usr/local/etc|${PREFIX}/etc|g" ${WRKSRC}/iaxmodem.1 - @${REINPLACE_CMD} -e "s|/etc/iaxmodem|${PREFIX}/etc/iaxmodem|g" ${WRKSRC}/iaxmodem.c + @${PERL} -0pi.bak -e "s|for ac_header in tgmath\.h.*?done||s" \ + ${WRKSRC}/lib/spandsp/configure + @${REINPLACE_CMD} -e "s|/etc/iaxmodem|${PREFIX}&|" \ + ${WRKSRC}/iaxmodem.c do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/iaxmodem ${PREFIX}/sbin/ && \ - ${MKDIR} ${PREFIX}/etc/iaxmodem && \ - ${MKDIR} /var/log/iaxmodem && \ - ${MKDIR} ${EXAMPLESDIR} && \ - ${INSTALL_DATA} ${WRKSRC}/config.ttyIAX ${EXAMPLESDIR}/ && \ - ${INSTALL_DATA} ${WRKSRC}/iaxmodem-cfg.ttyIAX ${EXAMPLESDIR}/ + ${INSTALL_PROGRAM} ${WRKSRC}/iaxmodem ${PREFIX}/sbin ${INSTALL_MAN} ${WRKSRC}/iaxmodem.1 ${MAN1PREFIX}/man/man1 -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} && \ - ${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/TODO ${WRKSRC}/FAQ ${WRKSRC}/CHANGES ${DOCSDIR} +.if ${PORT_OPTIONS:MEXAMPLES} + @${MKDIR} ${EXAMPLESDIR} + ${INSTALL_DATA} ${PORTEXAMPLES:S,^,${WRKSRC}/,} ${EXAMPLESDIR} .endif - -post-install: -.if !defined(BATCH) - @${CAT} ${PKGMESSAGE} +.if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR} .endif + @${ECHO_MSG} + @${CAT} ${PKGMESSAGE} + @${ECHO_MSG} .include Modified: head/net/iaxmodem/files/pkg-message.in ============================================================================== --- head/net/iaxmodem/files/pkg-message.in Fri Aug 2 04:54:11 2013 (r324140) +++ head/net/iaxmodem/files/pkg-message.in Fri Aug 2 05:06:26 2013 (r324141) @@ -1,15 +1,13 @@ -To use iaxmodem with Hylafax: +To use IAXmodem with Hylafax: - Install and configure Hylafax -- Take a look to %%EXAMPLESDIR%%/config.ttyIAX to configure the "virtual" modem +- Take a look at %%EXAMPLESDIR%%/config.ttyIAX on how to + configure the "virtual" modem -- For accepting incoming FAX/data calls, modify /etc/ttys as below - and send SIGHUP to init process: +- For accepting incoming FAX/data calls, modify /etc/ttys as shown + below and send SIGHUP to init process: ->ttyIAX "%%PREFIX%%/sbin/faxgetty" dialup on secure + ttyIAX "%%PREFIX%%/sbin/faxgetty" dialup on secure -Additional Documentation: -%%DOCSDIR%% -%%EXAMPLESDIR%% -http://www.voip-info.org/wiki/view/Asterisk+IAXmodem +Consult documentation for additional information. Modified: head/net/iaxmodem/pkg-descr ============================================================================== --- head/net/iaxmodem/pkg-descr Fri Aug 2 04:54:11 2013 (r324140) +++ head/net/iaxmodem/pkg-descr Fri Aug 2 05:06:26 2013 (r324141) @@ -1,6 +1,5 @@ -IAXmodem is a software modem written in C that uses -an IAX channel (commonly provided by an Asterisk PBX -system) instead of a traditional phone line and uses -a DSP library instead of DSP hardware chipsets. +IAXmodem is a software modem written in C that uses an IAX channel (commonly +provided by an Asterisk PBX system) instead of a traditional phone line and +uses a DSP library instead of DSP hardware chipsets. -WWW: http://sourceforge.net/projects/iaxmodem +WWW: http://iaxmodem.sourceforge.net/