Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 29 Nov 2017 16:13:16 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r455119 - head/net-im/jabber
Message-ID:  <201711291613.vATGDGRV063674@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.options.mk>
+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 <bsd.port.options.mk>
+
 .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 <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201711291613.vATGDGRV063674>