Date: Sun, 13 Nov 2005 20:44:35 +0900 From: Norikatsu Shigemura <nork@FreeBSD.org> To: Vasil Dimov <vd@datamax.bg> Cc: ports@FreeBSD.org, Norikatsu Shigemura <nork@FreeBSD.org> Subject: Fix pkg-plist WITH_SYSCALL_HARD on devel/pth Message-ID: <20051113204435.551e8b73.nork@FreeBSD.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20051113204435.551e8b73.nork>