diff --git a/textproc/Makefile b/textproc/Makefile index 94da7b0e720..64c82d38482 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.100 2003/07/22 17:45:50 pvalchev Exp $ +# $OpenBSD: Makefile,v 1.101 2003/08/12 04:42:49 jolan Exp $ # $FreeBSD: Makefile,v 1.15 1997/11/22 00:31:24 jseger Exp $ SUBDIR += TclXML @@ -76,7 +76,7 @@ SUBDIR += pear-XML-Tree SUBDIR += pilot_makedoc SUBDIR += pinfo - SUBDIR += pspell +# SUBDIR += pspell SUBDIR += py-Chart SUBDIR += py-HappyDoc SUBDIR += py-xml diff --git a/textproc/pspell/Makefile b/textproc/pspell/Makefile deleted file mode 100644 index 1aa77c55841..00000000000 --- a/textproc/pspell/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# $OpenBSD: Makefile,v 1.6 2003/02/24 04:08:02 brad Exp $ - -COMMENT= "generic interface to spell checker libraries" - -V= 0 -SV= .12.2 -PKGNAME= pspell-${V}${SV} -DISTNAME= pspell-${SV} -CATEGORIES= textproc devel - -MAINTAINER= David Lebel - -HOMEPAGE= http://pspell.sourceforge.net/ - -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes - -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pspell/} - -CONFIGURE_STYLE= gnu -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ - --enable-doc-dir=${PREFIX}/share/doc/pspell \ - --disable-ltdl - -.include diff --git a/textproc/pspell/distinfo b/textproc/pspell/distinfo deleted file mode 100644 index 977d62ef8df..00000000000 --- a/textproc/pspell/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (pspell-.12.2.tar.gz) = cfd3816b2372932a1b71c0ce4e9f881e -RMD160 (pspell-.12.2.tar.gz) = 3b7be22305c576e6b0ee52024206bd2ea7d71f2d -SHA1 (pspell-.12.2.tar.gz) = dc3f2757433d5e79d7bf024f55111e00f91905b7 diff --git a/textproc/pspell/patches/patch-ltcf-c_sh b/textproc/pspell/patches/patch-ltcf-c_sh deleted file mode 100644 index a02537991fa..00000000000 --- a/textproc/pspell/patches/patch-ltcf-c_sh +++ /dev/null @@ -1,39 +0,0 @@ -$OpenBSD: patch-ltcf-c_sh,v 1.3 2003/02/24 04:06:30 brad Exp $ ---- ltcf-c.sh.orig Tue May 1 19:58:17 2001 -+++ ltcf-c.sh Sun Feb 23 21:18:00 2003 -@@ -47,7 +47,9 @@ cygwin* | mingw*) - with_gnu_ld=no - fi - ;; -- -+openbsd*) -+ with_gnu_ld=no -+ ;; - esac - - ld_shlibs=yes -@@ -454,10 +456,22 @@ else - ;; - - openbsd*) -- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -- hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -+ case "$host_os" in -+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) -+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_libdir_flag_spec='-R$libdir' -+ ;; -+ *) -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ export_dynamic_flag_spec='${wl}-E' -+ fi -+ ;; -+ esac -+ - ;; - - os2*) diff --git a/textproc/pspell/patches/patch-ltcf-cxx_sh b/textproc/pspell/patches/patch-ltcf-cxx_sh deleted file mode 100644 index 0bb7f6acc51..00000000000 --- a/textproc/pspell/patches/patch-ltcf-cxx_sh +++ /dev/null @@ -1,34 +0,0 @@ -$OpenBSD: patch-ltcf-cxx_sh,v 1.1 2003/02/24 04:06:30 brad Exp $ ---- ltcf-cxx.sh.orig Tue May 1 19:58:17 2001 -+++ ltcf-cxx.sh Sun Feb 23 22:09:48 2003 -@@ -385,6 +385,21 @@ case $host_os in - netbsd*) - # NetBSD uses g++ - do we need to do anything? - ;; -+ openbsd*) -+ case $host_os in -+ openbsd[01].* | openbsd2.[0-8] | openbsd2.[0-8].*) -+ ld_shlibs=no -+ ;; -+ *) -+ archive_cmds='$CC -shared -nostdlib $pic_flag -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ archive_expsym_cmds= -+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then -+ export_dynamic_flag_spec='${wl}-E' -+ fi -+ ;; -+ esac -+ ;; - osf3*) - if test "$with_gcc" = yes && test "$with_gnu_ld" = no; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -@@ -799,6 +814,8 @@ else - esac - ;; - netbsd*) -+ ;; -+ openbsd*) - ;; - osf3* | osf4* | osf5*) - case $cc_basename in diff --git a/textproc/pspell/patches/patch-ltconfig b/textproc/pspell/patches/patch-ltconfig deleted file mode 100644 index 8d1bc89915d..00000000000 --- a/textproc/pspell/patches/patch-ltconfig +++ /dev/null @@ -1,20 +0,0 @@ -$OpenBSD: patch-ltconfig,v 1.2 2003/02/24 04:06:30 brad Exp $ ---- ltconfig.orig Tue May 1 19:58:17 2001 -+++ ltconfig Sun Feb 23 15:57:06 2003 -@@ -1243,13 +1243,12 @@ newsos6) - - openbsd*) - version_type=sunos -- if test "$with_gnu_ld" = yes; then -- need_lib_prefix=no -- need_version=no -- fi -+ need_lib_prefix=no -+ need_version=no - library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH -+ deplibs_check_method=pass_all - ;; - - os2*) diff --git a/textproc/pspell/patches/patch-ltmain_sh b/textproc/pspell/patches/patch-ltmain_sh deleted file mode 100644 index e660454f59f..00000000000 --- a/textproc/pspell/patches/patch-ltmain_sh +++ /dev/null @@ -1,65 +0,0 @@ -$OpenBSD: patch-ltmain_sh,v 1.1 2003/02/24 04:06:30 brad Exp $ ---- ltmain.sh.orig Sun Feb 23 21:35:19 2003 -+++ ltmain.sh Sun Feb 23 21:38:24 2003 -@@ -1217,6 +1217,10 @@ EOF - # These systems don't actually have a C library (as such) - test "X$arg" = "X-lc" && continue - ;; -+ *-*-openbsd*) -+ # Do not include libc due to us having libc/libc_r. -+ test "X$arg" - "X-lc" && continue -+ ;; - esac - fi - deplibs="$deplibs $arg" -@@ -2749,6 +2753,9 @@ EOF - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. - ;; -+ *-*-openbsd*) -+ # Do not include libc due to us having libc/libc_r. -+ ;; - *) - # Add libc to deplibs on all other systems if necessary. - if test $build_libtool_need_lc = "yes"; then -@@ -4884,40 +4891,6 @@ relink_command=\"$relink_command\"" - # Exit here if they wanted silent mode. - test "$show" = ":" && exit 0 - -- echo "----------------------------------------------------------------------" -- echo "Libraries have been installed in:" -- for libdir in $libdirs; do -- echo " $libdir" -- done -- echo -- echo "If you ever happen to want to link against installed libraries" -- echo "in a given directory, LIBDIR, you must either use libtool, and" -- echo "specify the full pathname of the library, or use the \`-LLIBDIR'" -- echo "flag during linking and do at least one of the following:" -- if test -n "$shlibpath_var"; then -- echo " - add LIBDIR to the \`$shlibpath_var' environment variable" -- echo " during execution" -- fi -- if test -n "$runpath_var"; then -- echo " - add LIBDIR to the \`$runpath_var' environment variable" -- echo " during linking" -- fi -- if test -n "$hardcode_libdir_flag_spec"; then -- libdir=LIBDIR -- eval flag=\"$hardcode_libdir_flag_spec\" -- -- echo " - use the \`$flag' linker flag" -- fi -- if test -n "$admincmds"; then -- echo " - have your system administrator run these commands:$admincmds" -- fi -- if test -f /etc/ld.so.conf; then -- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" -- fi -- echo -- echo "See any operating system documentation about shared libraries for" -- echo "more information, such as the ld(1) and ld.so(8) manual pages." -- echo "----------------------------------------------------------------------" - exit 0 - ;; - diff --git a/textproc/pspell/pkg/DESCR b/textproc/pspell/pkg/DESCR deleted file mode 100644 index dc3526f4370..00000000000 --- a/textproc/pspell/pkg/DESCR +++ /dev/null @@ -1,4 +0,0 @@ -The goal of the library is to provide a generic interface to Spell -checker libraries installed on the system. - -WWW: ${HOMEPAGE} diff --git a/textproc/pspell/pkg/PFRAG.shared b/textproc/pspell/pkg/PFRAG.shared deleted file mode 100644 index 6913cc37bb9..00000000000 --- a/textproc/pspell/pkg/PFRAG.shared +++ /dev/null @@ -1,5 +0,0 @@ -@comment $OpenBSD: PFRAG.shared,v 1.3 2003/02/24 04:06:31 brad Exp $ -lib/libpspell-impl.so.6.0 -lib/libpspell-modules.so.1.1 -lib/libpspell.so.4.3 -DYNLIBDIR(%D/lib) diff --git a/textproc/pspell/pkg/PLIST b/textproc/pspell/pkg/PLIST deleted file mode 100644 index 4f46a077d89..00000000000 --- a/textproc/pspell/pkg/PLIST +++ /dev/null @@ -1,91 +0,0 @@ -@comment $OpenBSD: PLIST,v 1.2 2001/06/07 15:16:25 lebel Exp $ -bin/pspell-config -include/pspell/app_string.hh -include/pspell/config.h -include/pspell/config_impl.hh -include/pspell/convert.hh -include/pspell/error.h -include/pspell/error_impl.hh -include/pspell/error_messages.hh -include/pspell/file_util.hh -include/pspell/getdata.hh -include/pspell/itemize.hh -include/pspell/manager.h -include/pspell/manager_impl.hh -include/pspell/mutable_container.h -include/pspell/pspell.h -include/pspell/string.hh -include/pspell/string_emulation.h -include/pspell/string_list.h -include/pspell/string_list.hh -include/pspell/string_list_impl.hh -include/pspell/string_map.h -include/pspell/string_map_impl.hh -include/pspell/string_pair.h -include/pspell/string_pair_emulation.h -include/pspell/wordlist.h -lib/libpspell-impl.a -lib/libpspell-impl.la -lib/libpspell-modules.a -lib/libpspell-modules.la -lib/libpspell.a -lib/libpspell.la -%%SHARED%% -share/doc/pspell/man-html/1_Introduction.html -share/doc/pspell/man-html/2_Getting.html -share/doc/pspell/man-html/3_Keeping.html -share/doc/pspell/man-html/4_Library.html -share/doc/pspell/man-html/5_Status.html -share/doc/pspell/man-html/6_Feedback.html -share/doc/pspell/man-html/7_Changelog.html -share/doc/pspell/man-html/8_Copyright.html -share/doc/pspell/man-html/About_this.html -share/doc/pspell/man-html/Contents.html -share/doc/pspell/man-html/contents.png -share/doc/pspell/man-html/index.html -share/doc/pspell/man-html/manual.css -share/doc/pspell/man-html/manual.html -share/doc/pspell/man-html/next.png -share/doc/pspell/man-html/next_g.png -share/doc/pspell/man-html/prev.png -share/doc/pspell/man-html/prev_g.png -share/doc/pspell/man-html/up.png -share/doc/pspell/man-html/up_g.png -share/doc/pspell/man-text/1_Introduction.txt -share/doc/pspell/man-text/2_Getting.txt -share/doc/pspell/man-text/3_Keeping.txt -share/doc/pspell/man-text/4_Library.txt -share/doc/pspell/man-text/5_Status.txt -share/doc/pspell/man-text/6_Feedback.txt -share/doc/pspell/man-text/7_Changelog.txt -share/doc/pspell/man-text/8_Copyright.txt -share/doc/pspell/man-text/About_this.txt -share/doc/pspell/man-text/Contents.txt -share/doc/pspell/man-text/index.txt -share/doc/pspell/man-text/manual.txt -share/doc/pspell/manual.aux -share/doc/pspell/manual.dvi -share/doc/pspell/manual.lyx -share/doc/pspell/manual.tex -share/pspell/cp1252.map -share/pspell/iso8859-1.map -share/pspell/iso8859-10.map -share/pspell/iso8859-13.map -share/pspell/iso8859-14.map -share/pspell/iso8859-15.map -share/pspell/iso8859-2.map -share/pspell/iso8859-3.map -share/pspell/iso8859-4.map -share/pspell/iso8859-5.map -share/pspell/iso8859-6.map -share/pspell/iso8859-7.map -share/pspell/iso8859-8.map -share/pspell/iso8859-9.map -share/pspell/koi8-r.map -share/pspell/region-to-spelling.map -share/pspell/viscii.map -@dirrm share/pspell -@dirrm share/doc/pspell/man-text -@dirrm share/doc/pspell/man-html -@dirrm share/doc/pspell -@dirrm include/pspell