From owner-svn-ports-all@freebsd.org  Mon Sep 12 03:01:46 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@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 1A455BD75F1;
 Mon, 12 Sep 2016 03:01:46 +0000 (UTC)
 (envelope-from marino@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 C586BAFF;
 Mon, 12 Sep 2016 03:01:45 +0000 (UTC)
 (envelope-from marino@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8C31joU009894;
 Mon, 12 Sep 2016 03:01:45 GMT (envelope-from marino@FreeBSD.org)
Received: (from marino@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8C31jgU009893;
 Mon, 12 Sep 2016 03:01:45 GMT (envelope-from marino@FreeBSD.org)
Message-Id: <201609120301.u8C31jgU009893@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: marino set sender to
 marino@FreeBSD.org using -f
From: John Marino <marino@FreeBSD.org>
Date: Mon, 12 Sep 2016 03:01:45 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r421901 - head/net-im/prosody
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.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Sep 2016 03:01:46 -0000

Author: marino
Date: Mon Sep 12 03:01:44 2016
New Revision: 421901
URL: https://svnweb.freebsd.org/changeset/ports/421901

Log:
  net-im/prosody: Document SSL requirement and rework port makefile
  
  This makefile had both <pre> and <options> but only the <options>
  include was necesssary so the <pre> and <post> includes were remoed.
  Most of the variables conventionally introduced before the <options>
  include were wrapped and moved up to ensure they were defined when
  needed.  Finally SSL flags were added to support non-base SSL linkage.
  
  Approved by:	SSL blanket + general blankets

Modified:
  head/net-im/prosody/Makefile

Modified: head/net-im/prosody/Makefile
==============================================================================
--- head/net-im/prosody/Makefile	Mon Sep 12 02:41:08 2016	(r421900)
+++ head/net-im/prosody/Makefile	Mon Sep 12 03:01:44 2016	(r421901)
@@ -20,37 +20,43 @@ RUN_DEPENDS=	${LUA_MODLIBDIR}/socket/cor
 
 LIB_DEPENDS=	libidn.so:dns/libidn
 
+USES=		cpe gmake lua:51 shebangfix ssl
+SHEBANG_FILES=	prosody prosodyctl
+LUA_PREMK=	yes
+HAS_CONFIGURE=	yes
+CFLAGS+=	-I${OPENSSLINC}
+LDFLAGS+=	-L${OPENSSLLIB}
+CONFIGURE_ARGS=	--ostype=freebsd \
+		--c-compiler="${CC}" \
+		--linker="${CC}" \
+		--with-lua-include="${LUA_INCDIR}"
+CONFIGURE_ENV=	LOCALBASE="${LOCALBASE}" \
+		PREFIX="${PREFIX}" \
+		LUA_SUFFIX="-${LUA_VER}" \
+		LUA_LIBDIR="${LUA_LIBDIR}" \
+		LUA_INCDIR="${LUA_INCDIR}"
+
 USERS=		prosody
 GROUPS=		${USERS}
 
 USE_RC_SUBR=	prosody
+SUB_FILES=	pkg-deinstall
+SUB_LIST=	USERS=${USERS} GROUPS=${GROUPS}
+PLIST_SUB=	PROSODY_USER=${USERS} PROSODY_GROUP=${GROUPS}
 
 OPTIONS_DEFINE=	LUAJIT
-LUAJIT_DESC=	Run prosody using luajit
+LUAJIT_DESC=		Run prosody using luajit
 LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit
 
 .include <bsd.port.options.mk>
 
-USES=		cpe gmake lua:51 shebangfix
-SHEBANG_FILES=	prosody prosodyctl
 .if ${PORT_OPTIONS:MLUAJIT}
 lua_CMD=	${LOCALBASE}/bin/luajit
 .else
 lua_CMD=	${LOCALBASE}/bin/${LUA_CMD}
 .endif
-LUA_PREMK=	yes
-
-.include <bsd.port.pre.mk>
-
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--ostype=freebsd --c-compiler="${CC}" --linker="${CC}" --with-lua-include="${LUA_INCDIR}"
-CONFIGURE_ENV+=	LOCALBASE="${LOCALBASE}" PREFIX="${PREFIX}" LUA_SUFFIX="-${LUA_VER}" LUA_LIBDIR="${LUA_LIBDIR}" LUA_INCDIR="${LUA_INCDIR}"
-
-SUB_FILES=	pkg-deinstall
-SUB_LIST=	USERS=${USERS} GROUPS=${GROUPS}
-PLIST_SUB=	PROSODY_USER=${USERS} PROSODY_GROUP=${GROUPS}
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/prosody/util/*.so
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>