Date: Mon, 13 Mar 2006 10:26:52 +0800 (CST) From: Rong-En Fan <rafan@infor.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: eric+fbports@vangyzen.net Subject: ports/94399: [PATCH] math/R: fix pkg-plist when some WITHOUT_* are defined Message-ID: <200603130226.k2D2QqLF071659@svm.csie.ntu.edu.tw> Resent-Message-ID: <200603130230.k2D2UKP6058519@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 94399
>Category: ports
>Synopsis: [PATCH] math/R: fix pkg-plist when some WITHOUT_* are defined
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Mar 13 02:30:20 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Rong-En Fan
>Release: FreeBSD 6.0-RELEASE i386
>Organization:
NTU CSIE
>Environment:
>Description:
Some files are installed only if proper knob is defined.
But these files are unconditionally listed in pkg-plist.
Port maintainer (eric+fbports@vangyzen.net) is cc'd.
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
The first hunk is to keep portlint quite.
--- R-2.2.1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/math/R/Makefile /home/rafan/tmp/ports/R/Makefile
--- /usr/ports/math/R/Makefile Wed Jan 11 03:52:02 2006
+++ /home/rafan/tmp/ports/R/Makefile Mon Mar 13 10:15:11 2006
@@ -1,5 +1,5 @@
# vim: tabstop=8 softtabstop=0 noexpandtab
-# Ports Makefile for: R
+# New ports collection makefile for: R
# Date created: Fri Feb 9 10:50:25 EST 2001
# Whom: Maurice Castro <maurice@serc.rmit.edu.au>
#
@@ -68,17 +68,21 @@
.if defined(WITH_ATLAS)
LIB_DEPENDS+= f77blas.1:${PORTSDIR}/math/atlas
CONFIGURE_ARGS+=--with-lapack="-lalapack -lcblas" --with-blas="-lf77blas"
+PLIST_SUB+= BLAS='@comment '
.else
LIB_DEPENDS+= blas.1:${PORTSDIR}/math/blas
CONFIGURE_ARGS+=--with-blas="-lblas"
+PLIST_SUB+= BLAS=''
.endif
.if defined(WITHOUT_TCLTK)
CONFIGURE_ARGS+=--without-tcltk
+PLIST_SUB+= TCLTK='@comment '
.else
LIB_DEPENDS+= tcl84:${PORTSDIR}/lang/tcl84 \
tk84:${PORTSDIR}/x11-toolkits/tk84
CONFIGURE_ARGS+=--with-tcltk
+PLIST_SUB+= TCLTK=''
.endif
.if defined(WITHOUT_JPEG)
@@ -97,9 +101,11 @@
.if defined(WITHOUT_X11)
CONFIGURE_ARGS+=--without-x
+PLIST_SUB+= X11='@comment '
.else
CONFIGURE_ARGS+=--with-x
USE_XLIB= yes
+PLIST_SUB+= X11=''
.endif
.if !defined(WITHOUT_GHOSTSCRIPT)
diff -ruN --exclude=CVS /usr/ports/math/R/pkg-plist /home/rafan/tmp/ports/R/pkg-plist
--- /usr/ports/math/R/pkg-plist Wed Jan 11 03:52:02 2006
+++ /home/rafan/tmp/ports/R/pkg-plist Mon Mar 13 10:14:49 2006
@@ -73,7 +73,7 @@
lib/R/include/Rversion.h
lib/R/include/S.h
lib/R/lib/libR.so
-lib/R/lib/libRlapack.so
+%%BLAS%%lib/R/lib/libRlapack.so
lib/R/library/KernSmooth/CONTENTS
lib/R/library/KernSmooth/DESCRIPTION
lib/R/library/KernSmooth/INDEX
@@ -7714,17 +7714,17 @@
lib/R/library/tcltk/Meta/Rd.rds
lib/R/library/tcltk/Meta/demo.rds
lib/R/library/tcltk/Meta/hsearch.rds
-lib/R/library/tcltk/Meta/nsInfo.rds
+%%TCLTK%%lib/R/library/tcltk/Meta/nsInfo.rds
lib/R/library/tcltk/Meta/package.rds
-lib/R/library/tcltk/NAMESPACE
+%%TCLTK%%lib/R/library/tcltk/NAMESPACE
lib/R/library/tcltk/R-ex/TclInterface.R
lib/R/library/tcltk/R-ex/TkCommands.R
lib/R/library/tcltk/R-ex/TkWidgetcmds.R
lib/R/library/tcltk/R-ex/TkWidgets.R
lib/R/library/tcltk/R-ex/tclServiceMode.R
lib/R/library/tcltk/R/tcltk
-lib/R/library/tcltk/R/tcltk.rdb
-lib/R/library/tcltk/R/tcltk.rdx
+%%TCLTK%%lib/R/library/tcltk/R/tcltk.rdb
+%%TCLTK%%lib/R/library/tcltk/R/tcltk.rdx
lib/R/library/tcltk/demo/tkcanvas.R
lib/R/library/tcltk/demo/tkdensity.R
lib/R/library/tcltk/demo/tkfaq.R
@@ -7769,7 +7769,7 @@
lib/R/library/tcltk/latex/tkStartGUI.tex
lib/R/library/tcltk/latex/tk_select.list.tex
lib/R/library/tcltk/latex/tkpager.tex
-lib/R/library/tcltk/libs/tcltk.so
+%%TCLTK%%lib/R/library/tcltk/libs/tcltk.so
lib/R/library/tcltk/man/tcltk.Rd.gz
lib/R/library/tcltk/po/en@quot/LC_MESSAGES/R-tcltk.mo
lib/R/library/tcltk/po/fr/LC_MESSAGES/R-tcltk.mo
@@ -8224,7 +8224,7 @@
lib/R/library/utils/po/fr/LC_MESSAGES/R-utils.mo
lib/R/library/utils/po/ko/LC_MESSAGES/R-utils.mo
lib/R/library/utils/po/zh_CN/LC_MESSAGES/R-utils.mo
-lib/R/modules/R_X11.so
+%%X11%%lib/R/modules/R_X11.so
lib/R/modules/internet.so
lib/R/modules/lapack.so
lib/R/modules/vfonts.so
@@ -8433,7 +8433,7 @@
@dirrm lib/R/library/tcltk/po/en@quot
@dirrm lib/R/library/tcltk/po
@dirrm lib/R/library/tcltk/man
-@dirrm lib/R/library/tcltk/libs
+%%TCLTK%%@dirrm lib/R/library/tcltk/libs
@dirrm lib/R/library/tcltk/latex
@dirrm lib/R/library/tcltk/html
@dirrm lib/R/library/tcltk/help
--- R-2.2.1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200603130226.k2D2QqLF071659>