From owner-svn-ports-head@freebsd.org Wed Nov 29 16:13:18 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 10117E57EF3; Wed, 29 Nov 2017 16:13:18 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 DB66B7A597; Wed, 29 Nov 2017 16:13:17 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vATGDGdB063675; Wed, 29 Nov 2017 16:13:16 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vATGDGRV063674; Wed, 29 Nov 2017 16:13:16 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201711291613.vATGDGRV063674@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 29 Nov 2017 16:13:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r455119 - head/net-im/jabber X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: head/net-im/jabber X-SVN-Commit-Revision: 455119 X-SVN-Commit-Repository: ports 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.25 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: Wed, 29 Nov 2017 16:13:18 -0000 Author: amdmi3 Date: Wed Nov 29 16:13:16 2017 New Revision: 455119 URL: https://svnweb.freebsd.org/changeset/ports/455119 Log: - Fix LICENSE - Add LICENSE_FILE - Switch to USES=localbase - Switch to options helpers Modified: head/net-im/jabber/Makefile Modified: head/net-im/jabber/Makefile ============================================================================== --- head/net-im/jabber/Makefile Wed Nov 29 16:06:40 2017 (r455118) +++ head/net-im/jabber/Makefile Wed Nov 29 16:13:16 2017 (r455119) @@ -14,7 +14,8 @@ DIST_SUBDIR= jabber MAINTAINER= ports@FreeBSD.org COMMENT= XMPP/Jabber server daemon -LICENSE= GPLv2 +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpopt.so:devel/popt \ libpth.so:devel/pth-hard \ @@ -22,23 +23,19 @@ LIB_DEPENDS= libpopt.so:devel/popt \ libgnutls.so:security/gnutls \ libexpat.so:textproc/expat2 -OPTIONS_DEFINE= IPV6 MYSQL PGSQL DOCS - +USES= gettext gmake iconv libtool localbase:ldflags pkgconfig GNU_CONFIGURE= yes -INSTALL_TARGET= install-strip -USES= gettext gmake iconv libtool pkgconfig USE_RC_SUBR= jabber CONFIGURE_ARGS= --localstatedir=/var \ --sysconfdir=${JABBER_ETCDIR} \ --includedir=${PREFIX}/include/jabber \ --libdir=${PREFIX}/lib/jabber +INSTALL_TARGET= install-strip USE_LDCONFIG= ${PREFIX}/lib/jabber MAKE_JOBS_UNSAFE= yes -CPPFLAGS+= $$(pth-config --cflags) \ - -I${LOCALBASE}/include -LDFLAGS+= $$(pth-config --ldflags) \ - -L${LOCALBASE}/lib +CPPFLAGS+= $$(pth-config --cflags) +LDFLAGS+= $$(pth-config --ldflags) SUB_FILES= pkg-message SUB_LIST= JABBER_USER=${JABBER_USER} \ @@ -63,22 +60,18 @@ JABBER_RUNDIR= /var/run/jabberd JABBER_SPOOLDIR=/var/spool/jabberd JABBER_LOGDIR= /var/log/jabberd -.include +OPTIONS_DEFINE= IPV6 MYSQL PGSQL DOCS -.if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= yes -CONFIGURE_ARGS+= --with-mysql=${LOCALBASE} -.endif +MYSQL_USES= mysql +MYSQL_CONFIGURE_ON= --with-mysql=${LOCALBASE} -.if ${PORT_OPTIONS:MPGSQL} -USES+= pgsql -CONFIGURE_ARGS+= --with-postgresql=${LOCALBASE} -.endif +PGSQL_USES= pgsql +PGSQL_CONFIGURE_ON= --with-postgresql=${LOCALBASE} -.if ${PORT_OPTIONS:MIPV6} -CONFIGURE_ARGS+= --enable-ipv6 -.endif +IPV6_CONFIGURE_ON= --enable-ipv6 +.include + .if exists(${LOCALBASE}/include/pth/pthread.h) IGNORE= pth with soft syscalls is installed, please reinstall pth from devel/pth-hard .endif @@ -110,10 +103,12 @@ post-install: @${TOUCH} ${STAGEDIR}${PREFIX}/include/jabber/platform-settings (cd ${WRKSRC} && ${INSTALL_DATA} jabber.xml.dist \ ${STAGEDIR}${PREFIX}/etc/jabber.xml.sample) + +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in AUTHORS ChangeLog INSTALL NEWS README README.SQL README.config \ README.filespool README.karma README.protocols TODO UPGRADE mysql.sql - (cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR}) + ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor .include