svn commit: r348595 - in head/net-im/prosody: . files

Ashish SHUKLA ashish at FreeBSD.org
Wed Mar 19 02:54:46 UTC 2014


Hi David,

I updated my ports tree few minutes ago, and noticed couple of issues with
this commit.

On Tue, 18 Mar 2014 20:19:34 +0000 (UTC), David Thiel <lx at FreeBSD.org> said:
> Author: lx
> Date: Tue Mar 18 20:19:34 2014
> New Revision: 348595
> URL: http://svnweb.freebsd.org/changeset/ports/348595
> QAT: https://qat.redports.org/buildarchive/r348595/

> Log:
>   Stageify and modernize.
  
>   PR:		ports/187703
>   Submitted by:	Scot Hetzel
>   Reviewed by:	me

> Deleted:
>   head/net-im/prosody/files/pkg-install.in
> Modified:
>   head/net-im/prosody/Makefile
>   head/net-im/prosody/files/patch-Makefile
>   head/net-im/prosody/files/pkg-deinstall.in
>   head/net-im/prosody/pkg-plist

> Modified: head/net-im/prosody/Makefile
> ==============================================================================
> --- head/net-im/prosody/Makefile	Tue Mar 18 20:14:23 2014	(r348594)
> +++ head/net-im/prosody/Makefile	Tue Mar 18 20:19:34 2014	(r348595)
> @@ -17,29 +17,28 @@ RUN_DEPENDS=	${LUA_MODLIBDIR}/socket/cor
>  		${LUA_MODLIBDIR}/lxp.so:${PORTSDIR}/textproc/luaexpat \
>  		${LUA_MODLIBDIR}/lfs.so:${PORTSDIR}/devel/luafilesystem \
 
> -LIB_DEPENDS=	idn:${PORTSDIR}/dns/libidn
> +LIB_DEPENDS=	libidn:${PORTSDIR}/dns/libidn

I don't think change was needed, as with this, it tries to install libidn even
when it is already installed.

> +
> +USERS=		prosody
> +GROUPS=		${USERS}
 
>  USE_RC_SUBR=	prosody
> -MAN1=	prosodyctl.1
>  MANCOMPRESSED=	no
 
> +USES=	gmake shebangfix
>  USE_LUA=	5.1
>  WANT_LUA_VER=	5.1
> -USE_GMAKE=	yes
> +SHEBANG_LANG=	lua
> +SHEBANG_FILES=	prosody prosodyctl
> +lua_OLD_CMD=	${SETENV} lua
> +lua_CMD=	${LUA_CMD}
 
>  HAS_CONFIGURE=	yes
>  CONFIGURE_ARGS+=	--ostype=freebsd --c-compiler="${CC}" --linker="${LD}"
>  CONFIGURE_ENV+=	LOCALBASE="${LOCALBASE}" PREFIX="${PREFIX}" LUA_SUFFIX="-${LUA_VER}" LUA_LIBDIR="${LUA_LIBDIR}" LUA_INCDIR="${LUA_INCDIR}"
 
> -SUB_FILES=	pkg-install pkg-deinstall
> -
> -NO_STAGE=	yes
> -pre-install:
> -	${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
> -	${REINPLACE_CMD} -e 's|/usr/bin/env lua|${LUA_CMD}|' ${WRKSRC}/prosody.install ${WRKSRC}/prosodyctl.install
> -
> -post-install:
> -	${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
> -	@${CAT} ${PKGMESSAGE}
> +SUB_FILES=	deinstall

s/deinstall/pkg-deinstall/

HTH
-- 
Ashish SHUKLA      | GPG: F682 CDCC 39DC 0FEA E116  20B6 C746 CFA9 E74F A4B0
Sent from my Emacs
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-all/attachments/20140319/6da3a21a/attachment.sig>


More information about the svn-ports-all mailing list