pkgsrc-Users archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: pari requiring fltk???? (proposing to stop)
On 05.11.12 00:39, Greg Troxel wrote:
math/pari requires fltk by default, via the x11 option.
pari is required by p5-Math-Pari, which is required by
p5-Crypt-Random-1.25nb3
p5-Crypt-Primes-0.50nb5
p5-Crypt-RSA-1.99nb2
p5-Module-Signature-0.68
which is required by
p5-PAR-Dist-0.47nb2
which is required by
p5-Module-Install-1.06
which seems to be needed quite often.
Module::Install should be not a requirement anymore - I hope
I replaced all dependencies by the distribution bundled
Module::Install.
Anyway - I agree that p5-Module-Signature shouldn't depend
on all possible Crypt-Modules available.
Please open a ticket against me cleaning up p5-Module-Signature
dependencies (eg. by options).
So while each step might be ok, the notion that fltk is required to
install perl modules is ridiculous. (It's further semi-ridiculous that
it needs tex to build, but at least that's build only.) So I propose to
apply the following. (I ran into this trying to build wip/fldigi which
uses fltk13.) Objections?
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/math/pari/Makefile,v
retrieving revision 1.53
diff -u -p -r1.53 Makefile
--- Makefile 3 Oct 2012 21:56:40 -0000 1.53
+++ Makefile 4 Nov 2012 23:38:44 -0000
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.53 2012/10/03 21:56:40 wiz Exp $
DISTNAME= pari-2.3.5
-PKGREVISION= 8
+PKGREVISION= 9
CATEGORIES= math
MASTER_SITES= http://pari.math.u-bordeaux.fr/pub/pari/unix/
Index: options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/math/pari/options.mk,v
retrieving revision 1.6
diff -u -p -r1.6 options.mk
--- options.mk 18 Mar 2011 15:00:01 -0000 1.6
+++ options.mk 4 Nov 2012 23:38:44 -0000
@@ -2,7 +2,9 @@
PKG_OPTIONS_VAR= PKG_OPTIONS.pari
PKG_SUPPORTED_OPTIONS= doc gmp x11
-PKG_SUGGESTED_OPTIONS= doc gmp x11
+# x11 is not suggested because it's not reasonable to include a GUI in
+# a foundation library.
+PKG_SUGGESTED_OPTIONS= doc gmp
.include "../../mk/bsd.options.mk"
Maybe you can take a look at attached patch I suggest for pari/fltk(13)
combo.
Thanks
--
Jens Rehsack
pkgsrc, Perl5
Index: math/pari/distinfo
==================================================================
--- math/pari/distinfo
+++ math/pari/distinfo
@@ -17,6 +17,6 @@
SHA1 (patch-al) = 4b9fe2464fb1136449ab3f46dcd743e937db470f
SHA1 (patch-am) = 09e158e5cd3a680d786aa876ce66d034df0c3b86
SHA1 (patch-an) = 4e1f9c8e0c63e2f1922bb8b181212b3e09c56ce6
SHA1 (patch-ao) = 44bf077f1585e20277dcd42a7c5fd38d12b19af5
SHA1 (patch-ap) = 21a20b68b589f8be3036d1f2f9c4b2a7f43210a8
-SHA1 (patch-config_get_fltk) = 2c2aa271fad5880a44b2df70a7143d2aea690ca0
+SHA1 (patch-config_get_fltk) = 75b8c1f0fb8ba949639e9d2bdb8a7d403f5974b8
Index: math/pari/options.mk
==================================================================
--- math/pari/options.mk
+++ math/pari/options.mk
@@ -30,11 +30,11 @@
CONFIGURE_ARGS+= --graphic=X11
CONFIGURE_ARGS+= --with-fltk=${PREFIX}
CONFIGURE_ENV+= X11BASE=${X11BASE}
CONFIGURE_ENV+= Xincroot=${X11BASE}/include
.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/fltk/buildlink3.mk"
+.include "../../x11/fltk13/buildlink3.mk"
.else
CONFIGURE_ARGS+= --graphic=none
# don't let the configure script find an installed fltk
CONFIGURE_ARGS+= --with-fltk={BUILDLINK_DIR:Q}/nonexistent
.endif
Index: math/pari/patches/patch-config_get_fltk
==================================================================
--- math/pari/patches/patch-config_get_fltk
+++ math/pari/patches/patch-config_get_fltk
@@ -1,12 +1,14 @@
-$NetBSD: patch-config_get_fltk,v 1.1 2011/12/10 23:53:34 marino Exp $
+$NetBSD$
--- config/get_fltk.orig 2008-03-31 11:43:59.000000000 +0000
+++ config/get_fltk
-@@ -30,6 +30,6 @@ if test -n "$with_fltk"; then
+@@ -29,7 +29,7 @@ if test -n "$with_fltk"; then
+ fi
case "$osname" in
cygwin) FLTK_LIBS="-lgdi32 -lole32 -luuid -lwsock32 -lsupc++" ;;
- darwin) FLTK_LIBS="-framework Carbon -lsupc++" ;;
+- darwin) FLTK_LIBS="-framework Carbon -lsupc++" ;;
- *) FLTK_LIBS="$X11_LIBS" ;;
++ darwin) FLTK_LIBS="-framework Carbon -lstdc++" ;;
+ *) FLTK_LIBS="$X11_LIBS -lstdc++" ;;
esac
fi
Index: x11/fltk13/distinfo
==================================================================
--- x11/fltk13/distinfo
+++ x11/fltk13/distinfo
@@ -9,6 +9,8 @@
SHA1 (patch-ac) = 9ab9a8ab5d2fd54ff0fcdeb7e2486aa3b83be5de
SHA1 (patch-ad) = 01a25d7265784572fbd0c7d2c6f029d45333ad21
SHA1 (patch-ae) = e043676f7e111e343bccd6e49f83d11a018fa431
SHA1 (patch-af) = dc14ca1e0ba878ef2e94a9947c1409165a925e5c
SHA1 (patch-ag) = 87e890ac44b864c224855611942d58dd0ba4b2c9
+SHA1 (patch-flkt-config) = 3789d093530651c934890f4d50a4dc9eade511e4
+SHA1 (patch-src-filename_list.cxx) = 71f92e76c9e152e872872dae234e2269176874b2
SHA1 (patch-test_Makefile) = 9256cea83cf83bef6ad8253c3af14783eb37b4d3
ADDED x11/fltk13/patches/patch-flkt-config
Index: x11/fltk13/patches/patch-flkt-config
==================================================================
--- x11/fltk13/patches/patch-flkt-config
+++ x11/fltk13/patches/patch-flkt-config
@@ -0,0 +1,52 @@
+$NetBSD$
+
+# disable application bundle creation on darwin
+
+--- fltk-config.in.orig 2012-11-02 12:08:30.000000000 +0000
++++ fltk-config.in
+@@ -294,45 +294,6 @@ if test -n "$compile"; then
+ $CXX $ARCHFLAGS $includes $CXXFLAGS $debug -o "$prog" "$compile"
$LDSTATIC || exit 1
+ fi
+
+-if test -n "$post"; then
+- case "`uname`" in
+- Darwin)
+- echo Creating "'$post.app'" bundle for desktop...
+- id=`echo $post | tr ' ' '_'`
+-
+- # Make the bundle directory and move the executable there
+- rm -rf "$post.app/Contents/MacOS"
+- mkdir -p "$post.app/Contents/MacOS"
+- mv "$post" "$post.app/Contents/MacOS"
+-
+- # Make a shell script that runs the bundled executable
+- echo "#!/bin/sh" >"$post"
+- echo 'dir="`dirname \"$0\"`"' >>"$post"
+- echo 'exec "$dir/'"$post.app/Contents/MacOS/$post"'" "$@"' >>"$post"
+- chmod +x "$post"
+-
+- # Make the simplest Info.plist needed for an application
+- cat >"$post.app/Contents/Info.plist" <<EOF
+-<?xml version="1.0" encoding="UTF-8"?>
+-<plist version="0.9">
+- <dict>
+- <key>CFBundleInfoDictionaryVersion</key>
+- <string>6.0</string>
+- <key>CFBundleExecutable</key>
+- <string>$post</string>
+- <key>CFBundleIdentifier</key>
+- <string>org.fltk.$id</string>
+- <key>CFBundleName</key>
+- <string>$post</string>
+- <key>CFBundlePackageType</key>
+- <string>APPL</string>
+- </dict>
+-</plist>
+-EOF
+- ;;
+- esac
+-fi
+-
+ if test "$echo_cflags" = "yes"; then
+ echo $includes $CFLAGS
+ fi
ADDED x11/fltk13/patches/patch-src-filename_list.cxx
Index: x11/fltk13/patches/patch-src-filename_list.cxx
==================================================================
--- x11/fltk13/patches/patch-src-filename_list.cxx
+++ x11/fltk13/patches/patch-src-filename_list.cxx
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/filename_list.cxx.orig 2012-11-02 10:01:31.000000000 +0000
++++ src/filename_list.cxx
+@@ -104,7 +104,7 @@ int fl_filename_list(const char *d, dire
+ #ifndef HAVE_SCANDIR
+ // This version is when we define our own scandir
+ int n = fl_scandir(dirloc, list, 0, sort);
+-#elif defined(HAVE_SCANDIR_POSIX) && !defined(__APPLE__)
++#elif defined(HAVE_SCANDIR_POSIX)
+ // POSIX (2008) defines the comparison function like this:
+ int n = scandir(dirloc, list, 0, (int(*)(const dirent **, const dirent
**))sort);
+ #elif defined(__osf__)
Home |
Main Index |
Thread Index |
Old Index