From owner-freebsd-ports@FreeBSD.ORG  Sun Nov 13 11:45:35 2005
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
X-Original-To: ports@FreeBSD.org
Delivered-To: freebsd-ports@FreeBSD.ORG
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 54E8516A41F;
	Sun, 13 Nov 2005 11:45:35 +0000 (GMT)
	(envelope-from nork@FreeBSD.org)
Received: from sakura.ninth-nine.com (sakura.ninth-nine.com [219.127.74.120])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C840143D46;
	Sun, 13 Nov 2005 11:45:34 +0000 (GMT)
	(envelope-from nork@FreeBSD.org)
Received: from nadesico.ninth-nine.com (nadesico.ninth-nine.com
	[219.127.74.122]) by sakura.ninth-nine.com
	(8.13.3/8.13.3/NinthNine) with ESMTP id jADBiZgd059815;
	Sun, 13 Nov 2005 20:44:37 +0900 (JST) (envelope-from nork@FreeBSD.org)
Date: Sun, 13 Nov 2005 20:44:35 +0900
From: Norikatsu Shigemura <nork@FreeBSD.org>
To: Vasil Dimov <vd@datamax.bg>
Message-Id: <20051113204435.551e8b73.nork@FreeBSD.org>
X-Mailer: Sylpheed version 2.1.6 (GTK+ 2.8.6; i386-portbld-freebsd7.0)
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-2.0
	(sakura.ninth-nine.com [219.127.74.121]);
	Sun, 13 Nov 2005 20:44:37 +0900 (JST)
Cc: ports@FreeBSD.org, Norikatsu Shigemura <nork@FreeBSD.org>
Subject: Fix pkg-plist WITH_SYSCALL_HARD on devel/pth
X-BeenThere: freebsd-ports@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Porting software to FreeBSD <freebsd-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports>
List-Post: <mailto:freebsd-ports@freebsd.org>
List-Help: <mailto:freebsd-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 13 Nov 2005 11:45:35 -0000

Hi Vasil.

	devel/pth's pkg-plist is not correct with WITH_SYSCALL_HARD knob.
	May I commit following patch?

Index: Makefile
===================================================================
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 @@
 
 PORTNAME=	pth
 PORTVERSION=	2.0.5
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	pth
@@ -25,8 +26,8 @@
 
 USE_REINPLACE=	yes
 
-MAN1=		pth-config.1 pthread-config.1
-MAN3=		pth.3 pthread.3
+MAN1=		pth-config.1
+MAN3=		pth.3
 
 OPTIONS=	OPTIMIZED_CFLAGS "Build with optimized CFLAGS" on \
 		SYSCALL_HARD "Build with hard syscalls" off
@@ -35,8 +36,12 @@
 
 .if defined(WITH_SYSCALL_HARD)
 CONFIGURE_ARGS+=	--enable-syscall-hard --disable-syscall-soft
+PLIST_SUB=	PTHREAD="@comment "
 .else
 CONFIGURE_ARGS+=	--enable-syscall-soft --enable-pthread
+PLIST_SUB=	PTHREAD=""
+MAN1+=		pthread-config.1
+MAN3+=		pthread.3
 .endif
 
 post-patch:
Index: pkg-plist
===================================================================
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