aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lang/q/Makefile106
-rw-r--r--lang/q/distinfo6
-rw-r--r--lang/q/files/patch-ltmain.sh15
-rw-r--r--lang/q/files/patch-modules-clib_system.c11
-rw-r--r--lang/q/files/patch-modules-curl-curl.c35
-rw-r--r--lang/q/files/patch-modules-octave_octave.c19
-rw-r--r--lang/q/files/patch-src_qmparse.y10
-rw-r--r--lang/q/pkg-descr29
-rw-r--r--lang/q/pkg-plist226
9 files changed, 159 insertions, 298 deletions
diff --git a/lang/q/Makefile b/lang/q/Makefile
index 90d4147f0c1b..ea74a106b834 100644
--- a/lang/q/Makefile
+++ b/lang/q/Makefile
@@ -6,98 +6,46 @@
#
PORTNAME= q
-PORTVERSION= 6.2
-PORTREVISION= 10
+PORTVERSION= 7.11
CATEGORIES= lang
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= q-lang
+MASTER_SITES= SF/q-lang
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= gahr@FreeBSD.org
COMMENT= Q -- equational programming language
-BUILD_DEPENDS= ${LOCALBASE}/dx/lib_freebsd/libDXL.a:${PORTSDIR}/graphics/opendx
LIB_DEPENDS= MagickWand.2:${PORTSDIR}/graphics/ImageMagick \
freetype.9:${PORTSDIR}/print/freetype2 \
gdbm.3:${PORTSDIR}/databases/gdbm \
- gii.1:${PORTSDIR}/devel/libgii \
- ggi.2:${PORTSDIR}/graphics/libggi \
gmp.7:${PORTSDIR}/math/libgmp4 \
- curl:${PORTSDIR}/ftp/curl
+ iodbc.3:${PORTSDIR}/databases/libiodbc \
+ xml2.5:${PORTSDIR}/textproc/libxml2 \
+ xslt.2:${PORTSDIR}/textproc/libxslt \
+ ggi.2:${PORTSDIR}/graphics/libggi
-BROKEN= bad plist
-DEPRECATED= old version, broken plist
-EXPIRATION_DATE= 2008-12-24
+USE_ICONV= yes
+USE_TK= 84
+USE_LDCONFIG= yes
-USE_BISON= build
-USE_GNOME= gnometarget libxml2 libxslt
CFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -L${LOCALBASE}/dx/lib_freebsd ${PTHREAD_LIBS}" \
- CPPFLAGS="${PTHREAD_CFLAGS}" \
- MAKEINFO="makeinfo --no-split"
-# we need to add -lDX, because there is undefined reference to _dxfImportBin_FP
-# in libDXL.so (_dxfImportBin_FP is defined in libDX.so)
-CONFIGURE_ARGS= --with-dxl-includes=-I${LOCALBASE}/dx/include \
- "--with-dxl=-lDXL -lDX"
-USE_LDCONFIG= yes
-
-# The tk module is built by default, but you can disable this by defining
-# the following variable.
-.if defined(WITHOUT_TK)
-CONFIGURE_ARGS+= --without-tk
-.else
-LIB_DEPENDS+= tcl84:${PORTSDIR}/lang/tcl84 \
- tk84:${PORTSDIR}/x11-toolkits/tk84
-CFLAGS+= -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4
-CONFIGURE_ARGS+= --with-tk="-ltcl84 -ltk84"
-.endif
-
-# POSIX threads support is enabled by default, but you can disable this by
-# defining the following variable.
-.if defined(WITHOUT_PTHREAD)
-CONFIGURE_ARGS+= --without-pthread
-.else
-CONFIGURE_ARGS+= --with-pthread="${PTHREAD_LIBS}"
-.endif
-
-# The odbc module needs an ODBC driver manager to be installed, and it
-# supports both iODBC and unixODBC.
-
-.if defined(WITH_IODBC) && defined(WITH_UNIXODBC)
-IGNORE= selected mutually exclusive options: WITH_IODBC and WITH_UNIXODBC
-.endif
-
-.if !defined(WITH_IODBC) && !defined(WITH_UNIXODBC)
-WITH_IODBC?= yes
-.endif
-
-.if defined(WITH_UNIXODBC)
-LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC
-CONFIGURE_ARGS+= --with-odbc=-lodbc
-.elif defined(WITH_IODBC)
-LIB_DEPENDS+= iodbc.3:${PORTSDIR}/databases/libiodbc
-CONFIGURE_ARGS+= --with-odbc=-liodbc
-.endif
+CONFIGURE_ARGS+=--with-magick="`pkg-config ImageMagick --libs`" \
+ --with-magick-includes="`pkg-config ImageMagick --cflags`" \
+ --with-tk="-L${TK_LIBDIR} -L${TCL_LIBDIR} -ltk${TK_VER:S/.//} -ltcl${TCL_VER:S/.//}" \
+ --with-tk-includes="-I${TK_INCLUDEDIR} -I${TCL_INCLUDEDIR}" \
+ --with-gdbm="-L${LOCALBASE}/lib -lgdbm" \
+ --with-gdbm-includes="-I${LOCALBASE}/include" \
+ --with-curl="`pkg-config libcurl --libs`" \
+ --with-curl-includes="`pkg-config libcurl --cflags`" \
+ --with-gmp="-L${LOCALBASE}/lib -lgmp" \
+ --with-gmp-includes="-I${LOCALBASE}/include" \
+ --with-ggi="-L${LOCALBASE}/lib -lggi" \
+ --with-ggi-includes="-I${LOCALBASE}/include" \
+ --with-pthread="${PTHREAD_LIBS}" \
+ --with-odbc="`iodbc-config --libs`" \
+ --with-odbc-includes="`iodbc-config --cflags`"
MAN1= q.1
INFO= qdoc
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "amd64"
-BROKEN= Does not build on amd64 (shared libraries must be compiled with -fPIC)
-.endif
-
-post-extract:
- @${RM} -f ${WRKSRC}/doc/*info*
-
-post-patch:
- @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} \
- ${GREP} -l "^examplesdir" | ${XARGS} ${REINPLACE_CMD} -e \
- "s;[(]pkgdatadir[)]/examples;(datadir)/examples/@PACKAGE@;"
- @${FIND} ${WRKSRC} -name configure | ${XARGS} ${REINPLACE_CMD} -e 's|echo aout|echo elf|'
- @${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} \
- ${GREP} -l "<malloc\.h>" | ${XARGS} ${REINPLACE_CMD} \
- -e "s,<malloc\.h>,<stdlib.h>,"
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/lang/q/distinfo b/lang/q/distinfo
index 27f308612ad0..32ec60e5e44d 100644
--- a/lang/q/distinfo
+++ b/lang/q/distinfo
@@ -1,3 +1,3 @@
-MD5 (q-6.2.tar.gz) = fd26c4354a77c9e69eb542b49735db68
-SHA256 (q-6.2.tar.gz) = 710582c4b8782f88aa62bc58db837acb8e752b5e286eb2767acb3fe4604edae5
-SIZE (q-6.2.tar.gz) = 2693152
+MD5 (q-7.11.tar.gz) = 18ca956aad555b54efacc0de5b2d79bd
+SHA256 (q-7.11.tar.gz) = 59b9a0993a7c274c535058ae5ceaf243435be3713f83b53ea311bf7269df98d5
+SIZE (q-7.11.tar.gz) = 2147297
diff --git a/lang/q/files/patch-ltmain.sh b/lang/q/files/patch-ltmain.sh
deleted file mode 100644
index 6820023a7fef..000000000000
--- a/lang/q/files/patch-ltmain.sh
+++ /dev/null
@@ -1,15 +0,0 @@
---- ltmain.sh.orig Thu Jan 8 11:47:45 2004
-+++ ltmain.sh Thu Jan 8 11:48:00 2004
-@@ -4210,10 +4210,12 @@
- fi
-
- # Install the pseudo-library for information purposes.
-+ if /usr/bin/false ; then
- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- instname="$dir/$name"i
- $show "$install_prog $instname $destdir/$name"
- $run eval "$install_prog $instname $destdir/$name" || exit $?
-+ fi
-
- # Maybe install the static library, too.
- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/lang/q/files/patch-modules-clib_system.c b/lang/q/files/patch-modules-clib_system.c
new file mode 100644
index 000000000000..d74749909dbf
--- /dev/null
+++ b/lang/q/files/patch-modules-clib_system.c
@@ -0,0 +1,11 @@
+--- modules/clib/system.c.orig 2009-04-11 11:45:49.000000000 +0200
++++ modules/clib/system.c 2009-04-11 11:49:40.000000000 +0200
+@@ -1689,7 +1689,7 @@
+ mkvoid,
+ #endif
+ #ifdef _POSIX_CPUTIME
+- mkint(CLOCK_PROCESS_CPUTIME_ID),
++ mkint(CLOCK_VIRTUAL),
+ #else
+ mkvoid,
+ #endif
diff --git a/lang/q/files/patch-modules-curl-curl.c b/lang/q/files/patch-modules-curl-curl.c
deleted file mode 100644
index 9e9cf77518ff..000000000000
--- a/lang/q/files/patch-modules-curl-curl.c
+++ /dev/null
@@ -1,35 +0,0 @@
---- modules/curl/curl.c.orig Fri Dec 8 18:58:07 2006
-+++ modules/curl/curl.c Fri Dec 8 18:59:12 2006
-@@ -461,7 +461,9 @@
- CURLOPT_WRITEFUNCTION,
- CURLOPT_READFUNCTION,
- CURLOPT_PROGRESSFUNCTION,
-+#if LIBCURL_VERSION_NUM < 0x071000
- CURLOPT_PASSWDFUNCTION,
-+#endif
- CURLOPT_HEADERFUNCTION,
- CURLOPT_DEBUGFUNCTION,
-
-@@ -660,7 +662,9 @@
- mkint(CURLOPT_WRITEFUNCTION),
- mkint(CURLOPT_READFUNCTION),
- mkint(CURLOPT_PROGRESSFUNCTION),
-+#if LIBCURL_VERSION_NUM < 0x071000
- mkint(CURLOPT_PASSWDFUNCTION),
-+#endif
- mkint(CURLOPT_HEADERFUNCTION),
- mkint(CURLOPT_DEBUGFUNCTION),
-
-@@ -964,10 +968,12 @@
- cb = (int(*)())progress_cb;
- dataopt = CURLOPT_PROGRESSDATA;
- break;
-+#if LIBCURL_VERSION_NUM < 0x071000
- case CURLOPT_PASSWDFUNCTION:
- cb = (int(*)())passwd_cb;
- dataopt = CURLOPT_PASSWDDATA;
- break;
-+#endif
- case CURLOPT_HEADERFUNCTION:
- cb = (int(*)())header_cb;
- dataopt = CURLOPT_WRITEHEADER;
diff --git a/lang/q/files/patch-modules-octave_octave.c b/lang/q/files/patch-modules-octave_octave.c
deleted file mode 100644
index 891db66f7685..000000000000
--- a/lang/q/files/patch-modules-octave_octave.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- modules/octave/octave.c.orig 2007-11-14 03:04:18.000000000 +0100
-+++ modules/octave/octave.c 2007-11-14 03:06:27.000000000 +0100
-@@ -126,6 +126,8 @@
- static const char *octaverc = ".octaverc";
- static const char *octaverc_bak = ".octaverc.$$$";
-
-+static int send_octave(char *);
-+
- /* handle SIGINT and SIGTERM */
-
- #if RETSIGTYPE == void
-@@ -272,7 +274,6 @@
- FILE *fp, *fp2;
- char buf[bufsz];
- int bak = 0;
-- static int send_octave(char *cmd);
- static int init = 0;
- if (!octp) {
- /* get the command from the OCTAVE variable if defined */
diff --git a/lang/q/files/patch-src_qmparse.y b/lang/q/files/patch-src_qmparse.y
deleted file mode 100644
index a07f756d502e..000000000000
--- a/lang/q/files/patch-src_qmparse.y
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/qmparse.y.orig 2007-11-14 03:07:31.000000000 +0100
-+++ src/qmparse.y 2007-11-14 03:09:06.000000000 +0100
-@@ -239,7 +239,6 @@
-
- | _PROMPT_ arg_list
- {
-- static savepos();
- char **argv = $2.v;
- int argc = $2.c, i;
- if (argc == 0) {
diff --git a/lang/q/pkg-descr b/lang/q/pkg-descr
index f47a071d873a..ca5fe0cb6764 100644
--- a/lang/q/pkg-descr
+++ b/lang/q/pkg-descr
@@ -4,34 +4,7 @@ the interpreter uses as rewrite rules to reduce expressions to normal form. Q
is useful for scientific programming and other advanced applications, and also
as a sophisticated kind of desktop calculator. The distribution includes the Q
programming tools, the standard library, add-on modules for interfacing to GNU
-dbm, ODBC, GNU Octave, GGI, ImageMagick, Tcl/Tk and IBM's Data Explorer, and
+dbm, GNU Octave, GGI, ImageMagick, Tcl/Tk and IBM's Data Explorer, and
an Emacs mode.
-Q's main features:
-
-- advanced symbolic expression manipulation, using equations supplied by the
- programmer
-
-- fast bytecode interpreter, which executes Q scripts almost as fast as
- interpreted Lisp or Haskell
-
-- built-in support for arbitrary precision integers, double precision floating
- point numbers, strings, lists, tuples, curried function applications, lazy
- evaluation, exception handling, and user-defined object-oriented data types
- with single inheritance
-
-- simple but powerful module system which lets you manage large scripts with
- ease, and a libtool-based interface to external C modules which allows such
- modules to be loaded at runtime
-
-- comprehensive standard library written mostly in Q itself, which includes
- powerful list processing functions, a collection of useful container data
- structures, an implementation of the lambda calculus, an interface to the
- PostScript language, and a system interface featuring binary and C-style
- formatted I/O, file system and process manipulation utilities, POSIX
- threads, BSD sockets, regular expression matching, ...
-
WWW: http://q-lang.sourceforge.net/
-
-- Albert Graef
-ag@muwiinfa.geschichte.uni-mainz.de
diff --git a/lang/q/pkg-plist b/lang/q/pkg-plist
index 38005c1d73ab..8f28de733e39 100644
--- a/lang/q/pkg-plist
+++ b/lang/q/pkg-plist
@@ -1,122 +1,53 @@
bin/q
bin/qc
bin/qcc
-bin/qcwrap
bin/qld
include/libq.h
include/qint.h
-lib/libq.a
+lib/libq.so.8
lib/libq.so
-lib/libq.so.6
-lib/libqint.a
-lib/libqint.so
-lib/libqint.so.2
+lib/libq.la
+lib/libq.a
+lib/libqmain.la
lib/libqmain.a
+lib/libqint.so.2
+lib/libqint.so
+lib/libqint.la
+lib/libqint.a
lib/q/clib.a
+lib/q/clib.la
lib/q/clib.so
lib/q/curl.a
+lib/q/curl.la
lib/q/curl.so
-lib/q/dxl.a
-lib/q/dxl.so
-lib/q/gdbm.a
-lib/q/gdbm.so
lib/q/ggi.a
+lib/q/ggi.la
lib/q/ggi.so
+lib/q/gdbm.a
+lib/q/gdbm.la
+lib/q/gdbm.so
lib/q/libtool
lib/q/magick.a
+lib/q/magick.la
lib/q/magick.so
lib/q/octave.a
+lib/q/octave.la
lib/q/octave.so
lib/q/odbc.a
+lib/q/odbc.la
lib/q/odbc.so
lib/q/swig.a
+lib/q/swig.la
lib/q/swig.so
+lib/q/system.a
+lib/q/system.la
+lib/q/system.so
lib/q/tk.a
+lib/q/tk.la
lib/q/tk.so
lib/q/xml.a
+lib/q/xml.la
lib/q/xml.so
-%%EXAMPLESDIR%%/avltree.q
-%%EXAMPLESDIR%%/bintree.q
-%%EXAMPLESDIR%%/cgi.q
-%%EXAMPLESDIR%%/creverse.c
-%%EXAMPLESDIR%%/creverse.q
-%%EXAMPLESDIR%%/ctype.c
-%%EXAMPLESDIR%%/ctype.q
-%%EXAMPLESDIR%%/curl/curltest.q
-%%EXAMPLESDIR%%/daemon.q
-%%EXAMPLESDIR%%/dfs.q
-%%EXAMPLESDIR%%/dgram.q
-%%EXAMPLESDIR%%/dnf.q
-%%EXAMPLESDIR%%/dxl/dxl_sample.cfg
-%%EXAMPLESDIR%%/dxl/dxl_sample.net
-%%EXAMPLESDIR%%/dxl/dxl_sample.q
-%%EXAMPLESDIR%%/dxl/dxl_simple.q
-%%EXAMPLESDIR%%/dxl/sombrero.cfg
-%%EXAMPLESDIR%%/dxl/sombrero.dx
-%%EXAMPLESDIR%%/dxl/sombrero.net
-%%EXAMPLESDIR%%/dxl/sombrero.q
-%%EXAMPLESDIR%%/except.q
-%%EXAMPLESDIR%%/fac.q
-%%EXAMPLESDIR%%/factor.q
-%%EXAMPLESDIR%%/fcntl.q
-%%EXAMPLESDIR%%/fib.q
-%%EXAMPLESDIR%%/fixpt.q
-%%EXAMPLESDIR%%/gdbm/gdbm_dict.q
-%%EXAMPLESDIR%%/gdbm/testdb.q
-%%EXAMPLESDIR%%/getpass.q
-%%EXAMPLESDIR%%/ggi/bufdemo.q
-%%EXAMPLESDIR%%/ggi/flying_ggis.q
-%%EXAMPLESDIR%%/ggi/font_test.q
-%%EXAMPLESDIR%%/ggi/ggi_demo.q
-%%EXAMPLESDIR%%/globexamp.q
-%%EXAMPLESDIR%%/graph.q
-%%EXAMPLESDIR%%/grid.q
-%%EXAMPLESDIR%%/hamming.q
-%%EXAMPLESDIR%%/hashed.q
-%%EXAMPLESDIR%%/huffman.q
-%%EXAMPLESDIR%%/magick/magicktest.q
-%%EXAMPLESDIR%%/magick/mozilla.png
-%%EXAMPLESDIR%%/magick/mozilla_48x48.rgba
-%%EXAMPLESDIR%%/magick/sprite.q
-%%EXAMPLESDIR%%/menu.q
-%%EXAMPLESDIR%%/newton.q
-%%EXAMPLESDIR%%/odbc/odbc_examp.q
-%%EXAMPLESDIR%%/perms.q
-%%EXAMPLESDIR%%/pipes.q
-%%EXAMPLESDIR%%/popen2.q
-%%EXAMPLESDIR%%/powers.q
-%%EXAMPLESDIR%%/primes.q
-%%EXAMPLESDIR%%/primesum.q
-%%EXAMPLESDIR%%/print.q
-%%EXAMPLESDIR%%/pty.q
-%%EXAMPLESDIR%%/qint.c
-%%EXAMPLESDIR%%/queens.q
-%%EXAMPLESDIR%%/queens2.q
-%%EXAMPLESDIR%%/queens3.q
-%%EXAMPLESDIR%%/queue.q
-%%EXAMPLESDIR%%/regexamp.q
-%%EXAMPLESDIR%%/searchtree.q
-%%EXAMPLESDIR%%/select.q
-%%EXAMPLESDIR%%/signal.q
-%%EXAMPLESDIR%%/swig/example.c
-%%EXAMPLESDIR%%/swig/example.i
-%%EXAMPLESDIR%%/swig/qt_examp.cxx
-%%EXAMPLESDIR%%/swig/qt_examp.h
-%%EXAMPLESDIR%%/swig/qt_examp.i
-%%EXAMPLESDIR%%/sys.q
-%%EXAMPLESDIR%%/testfont.q
-%%EXAMPLESDIR%%/time.q
-%%EXAMPLESDIR%%/tk/tix.q
-%%EXAMPLESDIR%%/tk/tk_examp.q
-%%EXAMPLESDIR%%/tk/tk_test.q
-%%EXAMPLESDIR%%/trees.q
-%%EXAMPLESDIR%%/xml/catalog.q
-%%EXAMPLESDIR%%/xml/catalog.xsl
-%%EXAMPLESDIR%%/xml/recipes.q
-%%EXAMPLESDIR%%/xml/recipes.xml
-%%EXAMPLESDIR%%/xml/recipes.xsl
-%%EXAMPLESDIR%%/xml/sample.xml
-%%EXAMPLESDIR%%/xml/xml_examp.q
%%DATADIR%%/etc/AUTHORS
%%DATADIR%%/etc/COPYING
%%DATADIR%%/etc/ChangeLog
@@ -124,19 +55,94 @@ lib/q/xml.so
%%DATADIR%%/etc/README
%%DATADIR%%/etc/README-Clib
%%DATADIR%%/etc/README-Curl
-%%DATADIR%%/etc/README-DXL
-%%DATADIR%%/etc/README-GGI
%%DATADIR%%/etc/README-Gdbm
+%%DATADIR%%/etc/README-GGI
%%DATADIR%%/etc/README-Magick
-%%DATADIR%%/etc/README-ODBC
%%DATADIR%%/etc/README-Octave
+%%DATADIR%%/etc/README-ODBC
%%DATADIR%%/etc/README-SWIG
%%DATADIR%%/etc/README-Tk
%%DATADIR%%/etc/README-XML
%%DATADIR%%/etc/q-mode.el
+%%DATADIR%%/etc/q.vim
%%DATADIR%%/etc/q.xml
%%DATADIR%%/etc/qexitrc
%%DATADIR%%/etc/qinitrc
+%%DATADIR%%/examples/basics.q
+%%DATADIR%%/examples/cgi.q
+%%DATADIR%%/examples/creverse.c
+%%DATADIR%%/examples/creverse.q
+%%DATADIR%%/examples/csv.q
+%%DATADIR%%/examples/ctype.c
+%%DATADIR%%/examples/ctype.q
+%%DATADIR%%/examples/curl/curltest.q
+%%DATADIR%%/examples/daemon.q
+%%DATADIR%%/examples/dfs.q
+%%DATADIR%%/examples/dgram.q
+%%DATADIR%%/examples/dnf.q
+%%DATADIR%%/examples/except.q
+%%DATADIR%%/examples/factor.q
+%%DATADIR%%/examples/fcntl.q
+%%DATADIR%%/examples/fibs.q
+%%DATADIR%%/examples/fibs.sh
+%%DATADIR%%/examples/fixpt.q
+%%DATADIR%%/examples/gamma.q
+%%DATADIR%%/examples/gdbm/gdbm_dict.q
+%%DATADIR%%/examples/gdbm/testdb.q
+%%DATADIR%%/examples/getpass.q
+%%DATADIR%%/examples/ggi/bufdemo.q
+%%DATADIR%%/examples/ggi/flying_ggis.q
+%%DATADIR%%/examples/ggi/font_test.q
+%%DATADIR%%/examples/ggi/ggi_demo.q
+%%DATADIR%%/examples/globexamp.q
+%%DATADIR%%/examples/graph.q
+%%DATADIR%%/examples/grid.q
+%%DATADIR%%/examples/hashed.q
+%%DATADIR%%/examples/huffman.q
+%%DATADIR%%/examples/lambda.q
+%%DATADIR%%/examples/magick/magicktest.q
+%%DATADIR%%/examples/magick/mozilla.png
+%%DATADIR%%/examples/magick/mozilla_48x48.rgba
+%%DATADIR%%/examples/magick/sprite.q
+%%DATADIR%%/examples/menu.q
+%%DATADIR%%/examples/newton.q
+%%DATADIR%%/examples/odbc/odbc_examp.q
+%%DATADIR%%/examples/pipes.q
+%%DATADIR%%/examples/popen2.q
+%%DATADIR%%/examples/primetest.q
+%%DATADIR%%/examples/pty.q
+%%DATADIR%%/examples/qint.c
+%%DATADIR%%/examples/queens.q
+%%DATADIR%%/examples/queens2.q
+%%DATADIR%%/examples/queens3.q
+%%DATADIR%%/examples/queue.q
+%%DATADIR%%/examples/regexamp.q
+%%DATADIR%%/examples/rlexamp.q
+%%DATADIR%%/examples/rot13.q
+%%DATADIR%%/examples/searchtree.q
+%%DATADIR%%/examples/select.q
+%%DATADIR%%/examples/signal.q
+%%DATADIR%%/examples/streams.q
+%%DATADIR%%/examples/swig/example.c
+%%DATADIR%%/examples/swig/example.i
+%%DATADIR%%/examples/swig/qt_examp.cxx
+%%DATADIR%%/examples/swig/qt_examp.h
+%%DATADIR%%/examples/swig/qt_examp.i
+%%DATADIR%%/examples/symbolic.q
+%%DATADIR%%/examples/sys.q
+%%DATADIR%%/examples/testfont.q
+%%DATADIR%%/examples/time.q
+%%DATADIR%%/examples/unicode.q
+%%DATADIR%%/examples/tk/tix.q
+%%DATADIR%%/examples/tk/tk_examp.q
+%%DATADIR%%/examples/tk/tk_test.q
+%%DATADIR%%/examples/xml/catalog.q
+%%DATADIR%%/examples/xml/catalog.xsl
+%%DATADIR%%/examples/xml/recipes.q
+%%DATADIR%%/examples/xml/recipes.xml
+%%DATADIR%%/examples/xml/recipes.xsl
+%%DATADIR%%/examples/xml/sample.xml
+%%DATADIR%%/examples/xml/xml_examp.q
%%DATADIR%%/lib/array.q
%%DATADIR%%/lib/assert.q
%%DATADIR%%/lib/bag.q
@@ -145,20 +151,20 @@ lib/q/xml.so
%%DATADIR%%/lib/cond.q
%%DATADIR%%/lib/curl.q
%%DATADIR%%/lib/dict.q
-%%DATADIR%%/lib/dxl.q
%%DATADIR%%/lib/error.q
%%DATADIR%%/lib/gdbm.q
+%%DATADIR%%/lib/getopt.q
%%DATADIR%%/lib/ggi.q
%%DATADIR%%/lib/graphics.q
%%DATADIR%%/lib/hdict.q
%%DATADIR%%/lib/heap.q
-%%DATADIR%%/lib/lambda.q
-%%DATADIR%%/lib/list.q
%%DATADIR%%/lib/magick.q
%%DATADIR%%/lib/math.q
%%DATADIR%%/lib/octave.q
%%DATADIR%%/lib/odbc.q
%%DATADIR%%/lib/prelude.q
+%%DATADIR%%/lib/rational.q
+%%DATADIR%%/lib/reftypes.q
%%DATADIR%%/lib/set.q
%%DATADIR%%/lib/sort.q
%%DATADIR%%/lib/stddecl.q
@@ -167,20 +173,22 @@ lib/q/xml.so
%%DATADIR%%/lib/stream.q
%%DATADIR%%/lib/string.q
%%DATADIR%%/lib/swig.q
+%%DATADIR%%/lib/system.q
%%DATADIR%%/lib/tk.q
+%%DATADIR%%/lib/tuple.q
%%DATADIR%%/lib/typec.q
%%DATADIR%%/lib/xml.q
+@dirrm lib/q
@dirrm %%DATADIR%%/lib
+@dirrm %%DATADIR%%/examples/xml
+@dirrm %%DATADIR%%/examples/tk
+@dirrm %%DATADIR%%/examples/swig
+@dirrm %%DATADIR%%/examples/odbc
+@dirrm %%DATADIR%%/examples/magick
+@dirrm %%DATADIR%%/examples/ggi
+@dirrm %%DATADIR%%/examples/gdbm
+@dirrm %%DATADIR%%/examples/dxl
+@dirrm %%DATADIR%%/examples/curl
+@dirrm %%DATADIR%%/examples
@dirrm %%DATADIR%%/etc
@dirrm %%DATADIR%%
-@dirrm %%EXAMPLESDIR%%/xml
-@dirrm %%EXAMPLESDIR%%/tk
-@dirrm %%EXAMPLESDIR%%/swig
-@dirrm %%EXAMPLESDIR%%/odbc
-@dirrm %%EXAMPLESDIR%%/magick
-@dirrm %%EXAMPLESDIR%%/ggi
-@dirrm %%EXAMPLESDIR%%/gdbm
-@dirrm %%EXAMPLESDIR%%/dxl
-@dirrm %%EXAMPLESDIR%%/curl
-@dirrm %%EXAMPLESDIR%%
-@dirrm lib/q