Date: Mon, 14 Nov 2005 12:37:33 +0200 From: Vasil Dimov <vd@datamax.bg> To: Norikatsu Shigemura <nork@FreeBSD.org> Cc: ports@FreeBSD.org Subject: Re: Fix pkg-plist WITH_SYSCALL_HARD on devel/pth Message-ID: <20051114103733.GA10416@qlovarnika.bg.datamax> In-Reply-To: <20051113204435.551e8b73.nork@FreeBSD.org> References: <20051113204435.551e8b73.nork@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--DocE+STaALJfprDB
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Sun, Nov 13, 2005 at 08:44:35PM +0900, Norikatsu Shigemura wrote:
> Hi Vasil.
>=20
> devel/pth's pkg-plist is not correct with WITH_SYSCALL_HARD knob.
> May I commit following patch?
>=20
> Index: 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
> RCS file: /home/ncvs/ports/devel/pth/Makefile,v
> retrieving revision 1.75
> diff -u -r1.75 Makefile
> --- Makefile 26 Oct 2005 18:59:25 -0000 1.75
> +++ Makefile 13 Nov 2005 11:38:51 -0000
> @@ -7,6 +7,7 @@
> =20
> PORTNAME=3D pth
> PORTVERSION=3D 2.0.5
> +PORTREVISION=3D 1
> CATEGORIES=3D devel
> MASTER_SITES=3D ${MASTER_SITE_GNU}
> MASTER_SITE_SUBDIR=3D pth
> @@ -25,8 +26,8 @@
> =20
> USE_REINPLACE=3D yes
> =20
> -MAN1=3D pth-config.1 pthread-config.1
> -MAN3=3D pth.3 pthread.3
> +MAN1=3D pth-config.1
> +MAN3=3D pth.3
> =20
> OPTIONS=3D OPTIMIZED_CFLAGS "Build with optimized CFLAGS" on \
> SYSCALL_HARD "Build with hard syscalls" off
> @@ -35,8 +36,12 @@
> =20
> .if defined(WITH_SYSCALL_HARD)
> CONFIGURE_ARGS+=3D --enable-syscall-hard --disable-syscall-soft
> +PLIST_SUB=3D PTHREAD=3D"@comment "
> .else
> CONFIGURE_ARGS+=3D --enable-syscall-soft --enable-pthread
> +PLIST_SUB=3D PTHREAD=3D""
> +MAN1+=3D pthread-config.1
> +MAN3+=3D pthread.3
> .endif
> =20
> post-patch:
> Index: pkg-plist
> =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
> RCS file: /home/ncvs/ports/devel/pth/pkg-plist,v
> retrieving revision 1.13
> diff -u -r1.13 pkg-plist
> --- pkg-plist 17 Feb 2003 11:15:32 -0000 1.13
> +++ pkg-plist 13 Nov 2005 11:35:54 -0000
> @@ -1,14 +1,14 @@
> bin/pth-config
> -bin/pthread-config
> +%%PTHREAD%%bin/pthread-config
> etc/rc.d/000.pth.sh
> include/pth/pth.h
> -include/pth/pthread.h
> +%%PTHREAD%%include/pth/pthread.h
> lib/pth/libpth.a
> lib/pth/libpth.so
> lib/pth/libpth.so.20
> -lib/pth/libpthread.a
> -lib/pth/libpthread.so
> -lib/pth/libpthread.so.20
> +%%PTHREAD%%lib/pth/libpthread.a
> +%%PTHREAD%%lib/pth/libpthread.so
> +%%PTHREAD%%lib/pth/libpthread.so.20
> share/aclocal/pth.m4
> @dirrm include/pth
> @dirrm lib/pth
Yes, go ahead.
Thanks.
--=20
Vasil Dimov
--DocE+STaALJfprDB
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
iD8DBQFDeGjsFw6SP/bBpCARAraCAJ9aIBHZ2dIYJu2ffUT42XN4/cuOJACdHIUl
FIEvcwaf7YRQuYKU/WcPyTM=
=I6Rs
-----END PGP SIGNATURE-----
--DocE+STaALJfprDB--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20051114103733.GA10416>