From owner-svn-ports-head@FreeBSD.ORG Sun Sep 29 10:46:22 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 9DBC7D9; Sun, 29 Sep 2013 10:46:22 +0000 (UTC) (envelope-from madpilot@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 8A3142109; Sun, 29 Sep 2013 10:46:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8TAkMOM002268; Sun, 29 Sep 2013 10:46:22 GMT (envelope-from madpilot@svn.freebsd.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8TAkMuR002266; Sun, 29 Sep 2013 10:46:22 GMT (envelope-from madpilot@svn.freebsd.org) Message-Id: <201309291046.r8TAkMuR002266@svn.freebsd.org> From: Guido Falsi Date: Sun, 29 Sep 2013 10:46:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r328668 - head/comms/gnokii 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: Sun, 29 Sep 2013 10:46:22 -0000 Author: madpilot Date: Sun Sep 29 10:46:21 2013 New Revision: 328668 URL: http://svnweb.freebsd.org/changeset/ports/328668 Log: - Support staging - Convert to new LIB_DEPENDS format - Use options helpers Modified: head/comms/gnokii/Makefile head/comms/gnokii/pkg-plist (contents, props changed) Modified: head/comms/gnokii/Makefile ============================================================================== --- head/comms/gnokii/Makefile Sun Sep 29 10:45:44 2013 (r328667) +++ head/comms/gnokii/Makefile Sun Sep 29 10:46:21 2013 (r328668) @@ -36,8 +36,6 @@ LDFLAGS+= -L${LOCALBASE}/lib SUB_FILES+= pkg-message PORTDOCS= * -MAN1= gnokii.1 sendsms.1 xgnokii.1 -MAN8= gnokiid.8 mgnokiidev.8 CONFLICTS= smstools-[0-9]* sendsms-[0-9]* @@ -53,24 +51,13 @@ SMSD_DESC= Enable smsd daemon (includes SMSDDB_DESC= Enable database support in smsd (select one or more) X11_DESC= Build graphical version (xgnokii) -NO_STAGE= yes -.include +ICAL_CONFIGURE_ENABLE= libical +ICAL_LIB_DEPENDS= libical.so:${PORTSDIR}/devel/libical +USB_CONFIGURE_ENABLE= libusb +PCSC_CONFIGURE_ENABLE= libpcsclite +PCSC_LIB_DEPENDS= libpcsclite.so:${PORTSDIR}/devel/pcsc-lite -.if ${PORT_OPTIONS:MICAL} -LIB_DEPENDS+= ical:${PORTSDIR}/devel/libical -.else -CONFIGURE_ARGS+= --disable-libical -.endif - -. if ! ${PORT_OPTIONS:MUSB} -CONFIGURE_ARGS+= --disable-libusb -.endif - -.if ${PORT_OPTIONS:MPCSC} -LIB_DEPENDS+= pcsclite:${PORTSDIR}/devel/pcsc-lite -.else -CONFIGURE_ARGS+= --disable-libpcsclite -.endif +.include .if empty(PORT_OPTIONS:MSMSD) PLIST_SUB+= SMSD='@comment ' MSM='@comment ' PGM='@comment ' SQLT='@comment ' @@ -78,7 +65,6 @@ CONFIGURE_ARGS+= --disable-smsd .else PLIST_SUB+= SMSD='' USE_GNOME+= glib20 -MAN8+= smsd.8 . if ${PORT_OPTIONS:MMYSQL} USE_MYSQL= yes PLIST_SUB+= MSM='' @@ -132,29 +118,25 @@ post-patch: @${MV} ${WRKSRC}/Docs/man/xgnokii.1x ${WRKSRC}/Docs/man/xgnokii.1 post-install: - ${INSTALL_DATA} ${WRKSRC}/xgnokii/xgnokii.pc ${PREFIX}/libdata/pkgconfig - @${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + ${INSTALL_DATA} ${WRKSRC}/xgnokii/xgnokii.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig .if ${PORT_OPTIONS:MDOCS} - ${GMAKE} install -C ${WRKSRC}/Docs + ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install -C ${WRKSRC}/Docs .else - ${GMAKE} install -C ${WRKSRC}/Docs/man + ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install -C ${WRKSRC}/Docs/man .endif ${INSTALL_DATA} ${WRKSRC}/Docs/sample/gnokiirc \ - ${PREFIX}/etc/gnokiirc.sample + ${STAGEDIR}${PREFIX}/etc/gnokiirc.sample .if ${PORT_OPTIONS:MSMSD} - @cd ${WRKSRC}/smsd && ${GMAKE} install - ${MKDIR} ${PREFIX}/share/smsd - ${INSTALL_SCRIPT} ${WRKSRC}/smsd/action ${PREFIX}/share/smsd - ${INSTALL_DATA} ${WRKSRC}/smsd/README ${PREFIX}/share/smsd + @cd ${WRKSRC}/smsd && ${SETENV} ${MAKE_ENV} ${GMAKE} install + ${MKDIR} ${STAGEDIR}${PREFIX}/share/smsd + ${INSTALL_SCRIPT} ${WRKSRC}/smsd/action ${STAGEDIR}${PREFIX}/share/smsd + ${INSTALL_DATA} ${WRKSRC}/smsd/README ${STAGEDIR}${PREFIX}/share/smsd . if ${PORT_OPTIONS:MMYSQL} - ${INSTALL_DATA} ${WRKSRC}/smsd/sms.tables.mysql.sql ${PREFIX}/share/smsd + ${INSTALL_DATA} ${WRKSRC}/smsd/sms.tables.mysql.sql ${STAGEDIR}${PREFIX}/share/smsd . endif . if ${PORT_OPTIONS:MPGSQL} - ${INSTALL_DATA} ${WRKSRC}/smsd/sms.tables.pq.sql ${PREFIX}/share/smsd + ${INSTALL_DATA} ${WRKSRC}/smsd/sms.tables.pq.sql ${STAGEDIR}${PREFIX}/share/smsd . endif .endif - @${ECHO_MSG} - @${CAT} ${PKGMESSAGE} - @${ECHO_MSG} .include Modified: head/comms/gnokii/pkg-plist ============================================================================== --- head/comms/gnokii/pkg-plist Sun Sep 29 10:45:44 2013 (r328667) +++ head/comms/gnokii/pkg-plist Sun Sep 29 10:46:21 2013 (r328668) @@ -24,6 +24,12 @@ lib/libgnokii.so lib/libgnokii.so.7 libdata/pkgconfig/gnokii.pc libdata/pkgconfig/xgnokii.pc +man/man1/gnokii.1.gz +man/man1/sendsms.1.gz +man/man1/xgnokii.1.gz +man/man8/gnokiid.8.gz +man/man8/mgnokiidev.8.gz +%%SMSD%%man/man8/smsd.8.gz sbin/gnokiid sbin/mgnokiidev %%SMSD%%sbin/smsd