Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 8 Jul 2014 14:52:46 +0000
From:      Steve Wills <swills@freebsd.org>
To:        Alexey Dokuchaev <danfe@freebsd.org>
Cc:        svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org
Subject:   Re: svn commit: r361162 - head/games/quake2lnx
Message-ID:  <20140708145246.GB17378@mouf.net>
In-Reply-To: <201407080323.s683NB00084374@svn.freebsd.org>
References:  <201407080323.s683NB00084374@svn.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help

--1LKvkjL3sHcu1TtY
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi,

Slight issue here:

https://jenkins.freebsd.org/pci/head-amd64/poudriere/data/headamd64-default=
/568/logs/errors/quake2lnx-0.16.2_11.log
https://jenkins.freebsd.org/pci/head-i386/poudriere/data/headi386-default/5=
68/logs/errors/quake2lnx-0.16.2_11.log

=3D=3D=3D> Checking for items in STAGEDIR missing from pkg-plist
Error: Orphaned: %%LIBDIR%%

=3D=3D=3D> Checking for items in pkg-plist which are not in STAGEDIR
Error: Missing: %%LIBDIR%%/ref_glx.so
Error: Missing: %%LIBDIR%%/ref_softx.so
Error: Missing: @dirrmtry %%LIBDIR%%/baseq2
Error: Missing: @dirrmtry %%LIBDIR%%

Should be easy to fix.

Thanks,
Steve

On Tue, Jul 08, 2014 at 03:23:11AM +0000, Alexey Dokuchaev wrote:
> Author: danfe
> Date: Tue Jul  8 03:23:11 2014
> New Revision: 361162
> URL: http://svnweb.freebsd.org/changeset/ports/361162
> QAT: https://qat.redports.org/buildarchive/r361162/
>=20
> Log:
>   Stagify and reclaim.
>=20
> Modified:
>   head/games/quake2lnx/Makefile
>=20
> Modified: head/games/quake2lnx/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/games/quake2lnx/Makefile	Tue Jul  8 03:02:46 2014	(r361161)
> +++ head/games/quake2lnx/Makefile	Tue Jul  8 03:23:11 2014	(r361162)
> @@ -11,7 +11,7 @@ DISTFILES=3D	${DISTNAME}${EXTRACT_SUFX}
>  DIST_SUBDIR=3D	${PORTNAME}
>  EXTRACT_ONLY=3D	${DISTNAME}${EXTRACT_SUFX}
> =20
> -MAINTAINER=3D	ports@FreeBSD.org
> +MAINTAINER=3D	danfe@FreeBSD.org
>  COMMENT=3D	Icculus.org version of the original Quake II
> =20
>  LICENSE=3D	GPLv2
> @@ -21,7 +21,7 @@ WANT_SDL=3D	yes
>  ALL_TARGET=3D	build_release
> =20
>  LIBDIR=3D		${PREFIX}/lib/${PORTNAME}
> -PLIST_SUB+=3D	LIBDIR=3D"${LIBDIR:S/${PREFIX}\///}"
> +PLIST_SUB+=3D	LIBDIR=3D"${LIBDIR:S|${PREFIX}/||}"
> =20
>  OPTIONS_DEFINE=3D		X11 GLX EYECANDY SOFTSDL SDLGL SDLCLIENT AA CLIENT \
>  			SERVER GAME CTF RETEXTURE JOYSTICK REDBLUE IPV6 \
> @@ -46,7 +46,6 @@ RETEXTURE_DESC=3D		Retextured graphics sup
>  JOYSTICK_DESC=3D		Joystick support
>  REDBLUE_DESC=3D		Enable 3D glasses rendering
> =20
> -NO_STAGE=3D	yes
>  .include <bsd.port.options.mk>
> =20
>  ###                       #
> @@ -206,29 +205,32 @@ post-patch: .SILENT
> =20
>  do-install:
>  .for tgt in ${EXE_TARGETS}
> -	${INSTALL_PROGRAM} ${WRKSRC}/release/${tgt} ${PREFIX}/bin
> +	${INSTALL_PROGRAM} ${WRKSRC}/release/${tgt} ${STAGEDIR}${PREFIX}/bin
>  .endfor
>  	@${MKDIR} ${LIBDIR}/baseq2
>  .for tgt in ${REF_TARGETS}
> -	${INSTALL_PROGRAM} ${WRKSRC}/release/ref_${tgt}.so ${LIBDIR}
> +	${INSTALL_PROGRAM} ${WRKSRC}/release/ref_${tgt}.so \
> +		${STAGEDIR}${LIBDIR}
>  .endfor
>  .if ${PORT_OPTIONS:MCTF}
>  	@${MKDIR} ${LIBDIR}/ctf
> -	${INSTALL_PROGRAM} ${WRKSRC}/release/ctf/game.so ${LIBDIR}/ctf
> +	${INSTALL_PROGRAM} ${WRKSRC}/release/ctf/game.so \
> +		${STAGEDIR}${LIBDIR}/ctf
>  .endif
>  .if ${PORT_OPTIONS:MEYECANDY}
> -	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/maxpak.pak ${LIBDIR}/baseq2
> +	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/maxpak.pak \
> +		${STAGEDIR}${LIBDIR}/baseq2
>  .endif
>  .if ${PORT_OPTIONS:MGAME}
> -	${INSTALL_PROGRAM} ${WRKSRC}/release/game.so ${LIBDIR}/baseq2
> -.endif
> -.if ${PORT_OPTIONS:MDOCS}
> -	@${MKDIR} ${DOCSDIR}
> -	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
> -	${INSTALL_DATA} ${WRKSRC}/src/docs/README ${DOCSDIR}/README.320
> -	${INSTALL_DATA} ${WRKSRC}/src/docs/joystick.txt ${DOCSDIR}
> -	${INSTALL_DATA} ${WRKSRC}/src/docs/quake2.3dfxgl ${DOCSDIR}
> +	${INSTALL_PROGRAM} ${WRKSRC}/release/game.so \
> +		${STAGEDIR}${LIBDIR}/baseq2
>  .endif
> +	@${MKDIR} ${STAGEDIR}${DOCSDIR}
> +	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
> +	${INSTALL_DATA} ${WRKSRC}/src/docs/README \
> +		${STAGEDIR}${DOCSDIR}/README.320
> +	${INSTALL_DATA} ${WRKSRC}/src/docs/joystick.txt ${STAGEDIR}${DOCSDIR}
> +	${INSTALL_DATA} ${WRKSRC}/src/docs/quake2.3dfxgl ${STAGEDIR}${DOCSDIR}
> =20
>  .include "${.CURDIR}/../quake2-data/Makefile.include"
>  .include <bsd.port.mk>

--1LKvkjL3sHcu1TtY
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQEcBAEBAgAGBQJTvAW9AAoJEPXPYrMgexuhycQH/2iHWgsu+hkL8sz/C7GopLaV
L+CqgRoi8bk6G7yh0E2Hj4cK377+RhyoEeS4nkm7+bca1aPE1e1MRLQtS/k5fDq1
KFnHQylKOEvZtdArxJ7PZSpJV7Qe0aMcLH2pjoPzYqJ0UPYxoguMGwDCeesFJz1u
PrdSEpLlevZDl2Oq1xjHRDo/wIVwjIZWIAsDOw30jVaF89A3SUSBG1ZXXwumRQtP
jiB3LXFa8EWqVmUyKzLtKmEWt+AO+ARN4unYnzqhRiG197029LvvAJu0PuQyPF+G
Obl/cZmtiZnXxdIToj1G1rI6FJs8ZGgTRoabpppKDmjWGU8YvTFy21QQYGIBmmo=
=UUVY
-----END PGP SIGNATURE-----

--1LKvkjL3sHcu1TtY--



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