diff options
| author | jlam <jlam@pkgsrc.org> | 2002-06-23 18:37:12 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-06-23 18:37:12 +0000 |
| commit | e43bd7cdef06b9274e767e76147d46a933f396af (patch) | |
| tree | ec205ad7d392f8b4fb061b9510a7c3c38870f747 | |
| parent | 0ce2600e1724a8db00dd3c6d8d500657dd469b43 (diff) | |
| download | pkgsrc-e43bd7cdef06b9274e767e76147d46a933f396af.tar.gz | |
Merge from pkgsrc-current to buildlink2 branch.
886 files changed, 22182 insertions, 5677 deletions
@@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2001/12/17 02:33:46 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.46.2.1 2002/06/23 18:37:12 jlam Exp $ # .include "mk/bsd.prefs.mk" @@ -27,7 +27,7 @@ SUBDIR += fonts SUBDIR += games SUBDIR += graphics SUBDIR += ham -SUBDIR += japanese +SUBDIR += inputmethod SUBDIR += lang SUBDIR += mail SUBDIR += math diff --git a/Packages.txt b/Packages.txt index ed6f066088e..54ae2417c75 100644 --- a/Packages.txt +++ b/Packages.txt @@ -1,4 +1,4 @@ -# $NetBSD: Packages.txt,v 1.244 2002/04/27 02:42:22 enami Exp $ +# $NetBSD: Packages.txt,v 1.244.2.1 2002/06/23 18:37:13 jlam Exp $ ########################################################################### ========================== @@ -296,6 +296,27 @@ get an overview of what will be set there by default. Environment variables such as LOCALBASE, and X11BASE can be set in /etc/mk.conf to save having to remember to set them each time you want to use pkgsrc. +Occasionally, people want to "look under the covers" to see what is +going on when a package is building or being installed. This may be +for debugging purposes, or out of simple curiosity. A number of utility +values have been added to help with this. + +(1) If you invoke the make(1) command with PKG_DEBUG_LEVEL=2, then a +huge amount of information will be displayed. As a worked example, + + make patch PKG_DEBUG_LEVEL=2 + +will show all the commands that are invoked, up to and including the +"patch stage". + +(2) If you want to know the value of a certain make(1) definition, then +the VARNAME definition should be used, in conjunction with the show-var +target. e.g. + + make show-var VARNAME=DISTFILES + +will show the expansion of the make(1) variable "DISTFILES". + If you want to de-install and re-install a binary package that you've created (see next section), that you put into pkgsrc/packages manually or that's located on a remote FTP server, you can use the the "bin-install" @@ -511,7 +532,7 @@ wasted by recompiling. =============================================== If you don't want all the pkgs nuked from a machine (rendering it useless -for anything but pkg compiling), there the possibility of doing the pkg +for anything but pkg compiling), there is the possibility of doing the pkg bulk build inside a chroot environment. The first step to do so is setting up a chroot sandbox, e.g. /usr/sandbox. @@ -533,6 +554,9 @@ items are present and properly configures: * adjust .../mk/bulk/build.conf !!! Don't forget to install X !!! +If you are a developer and want to upload the resulting binary packages +to ftp.netbsd.org, make sure you are using the default X version for your +architecture and release (up to 1.6, that is 3.3.6 for all architectures). Next thing you will want to is make sure /usr/sandbox/usr/pkgsrc contains a fresh checkout of pkgsrc (e.g. from anoncvs). Do not mount/link this to the @@ -864,8 +888,8 @@ to when dealing with the PLIST file (or files, see below!). their file. To handle this case, PLIST will be preprocessed before actually used, and the symbol "${MACHINE_ARCH}" will be replaced by what "uname -p" gives. The same is done if the string ${MACHINE_GNU_ARCH} - is embedded in PLIST somewhere - use this on packages that use GNU - autoconfigure. + is embedded in PLIST somewhere - use this on packages that have GNU + autoconf created configure scripts. Legacy note: There used to be a symbol "<$ARCH>" that was replaced by the output of "uname -m", but that's no longer supported and has been @@ -1720,11 +1744,11 @@ debugging aids. 10 FAQs & features of the package system ======================================== - 10.1 Packages using GNU autoconfig - ================================== + 10.1 Packages using GNU autoconf + ================================ -If your package uses GNU autoconf, add the following to your package's -Makefile: +If your package uses GNU autoconf created configure scripts, add the following +to your package's Makefile: GNU_CONFIGURE= yes @@ -2199,7 +2223,9 @@ By default, a new user will have home directory /nonexistent, and login shell The package Makefile must also include "../../mk/bsd.pkg.install.mk" prior to the inclusion of bsd.pkg.mk. This will cause the users and groups to be created at pre-install time, and the admin will be prompted to remove them at -post-deinstall time. +post-deinstall time. Automatic creation of the users and groups can be +toggled on and off by setting the environment variable PKG_CREATE_USERGROUP +prior to package installation. 10.23 How to handle compiler bugs @@ -2290,6 +2316,73 @@ bootstrap the necessary utilities (BSD make, pkg_*, ...). See http://www.zoularis.org/ for information on boostrapping. + 10.27 Configuration files handling and placement + ================================================ + +The global variable PKG_SYSCONFBASE (and some others) can be set by the +system administrator in /etc/mk.conf to define the place where +configuration files get installed. Therefore, packages must be adapted to +support this feature. Keep in mind that you should only install files that +are strictly necessary in the configuration directory, files that can +go to $PREFIX/share should go there. + +We will take a look at available variables first (bsd.pkg.mk contains more +information). PKG_SYSCONFDIR is where the configuration files for a package +may be found (that is, the full path, e.g. /etc or /usr/pkg/etc). This +value may be customized in various ways: + + 1) PKG_SYSCONFBASE is the main config directory under which all package + configuration files are to be found. Users will typically want to set + it to /etc, or accept the default location of $PREFIX/etc. + + 2) PKG_SYSCONFSUBDIR is the subdirectory of PKG_SYSCONFBASE under which + the configuration files for a particular package may be found. Defaults + to $SYSCONFBASE + + 3) PKG_SYSCONFVAR is the special suffix used to distinguish any overriding + values for a particular package (see next item). It defaults to + ${PKGBASE}, but for a collection of related packages that should all + have the same PKG_SYSCONFDIR value, it can be set in each of the + package Makefiles to a common value. + + 4) PKG_SYSCONFDIR.${PKG_SYSCONFVAR} overrides the value of + ${PKG_SYSCONFDIR} for packages with the same value for PKG_SYSCONFVAR. + + As an example, all the various KDE packages may want to set + PKG_SYSCONFVAR to "kde" so admins can set ${PKG_SYSCONFDIR.kde} in + /etc/mk.conf to define where to install KDE config files. + +Programs' configuration directory should be defined during the configure +stage. Packages that use GNU autoconf can usually do this by using the +--sysconfdir parameter, but this brings some problems as we will see now. +When you change this pathname in packages, you should not allow them to +install files in that directory directly. Instead they need to install +those files under share/examples/${PKGNAME} so PLIST can register them. + +Once you have the required configuration files in place (under the +share/examples directory) the variable CONF_FILES should be set to copy +them into PKG_SYSCONFDIR. The contents of this variable is formed by pairs +of filenames; the first element of the pair specifies the file inside the +examples directory (registered by PLIST) and the second element specifies +the target file. This is done this way to allow binary packages to place +files in the right directory using INSTALL/DEINSTALL scripts which are +created automatically. The package Makefile must also include +"../../mk/bsd.pkg.install.mk" prior to the inclusion of bsd.pkg.mk to use +these automatically generated scripts. The automatic copying of config +files can be toggled by setting the environment variable PKG_CONFIG prior +to package installation. + +Here is an example, taken from mail/mutt/Makefile: + + EGDIR= ${PREFIX}/share/doc/mutt/samples + CONF_FILES= ${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc + +As you can see, this package installs configuration files inside EGDIR, +which are registered by PLIST. After that, the variable CONF_FILES lists +the installed file first and then the target file. Users will also get an +automatic message when files are installed using this method. + + 11 Submitting & Committing ========================== @@ -2350,6 +2443,10 @@ important to keep this file up to date and conforming to the existing format, because it will be used by scripts to automatically update pages on www.netbsd.org and other sites. +For new packages, "cvs import" is preferred to "cvs add" because +the former gets everything with a single command, and provides a +consistent tag. + 11.3 Updating a Package to a Newer Version ========================================== @@ -1,4 +1,4 @@ -$NetBSD: TODO,v 1.79 2002/04/21 09:42:42 zuntum Exp $ +$NetBSD: TODO,v 1.79.2.1 2002/06/23 18:37:15 jlam Exp $ packages TODO (Suggested new packages) ^^^^^^^^^^^^^ @@ -14,6 +14,9 @@ packages TODO (Suggested new packages) More fonts for figlet ftp://ftp.plig.org/pub/figlet/fonts/contributed/ + gd-noX11 + version of gd for systems without X11 + jabber Messaging client http://www.jabber.com/downloads/index.shtml diff --git a/archivers/Makefile b/archivers/Makefile index 9490dbc4f8e..948a9542b8a 100644 --- a/archivers/Makefile +++ b/archivers/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2002/03/22 13:49:11 wiz Exp $ +# $NetBSD: Makefile,v 1.42.2.1 2002/06/23 18:37:17 jlam Exp $ # COMMENT= Archivers @@ -8,6 +8,7 @@ SUBDIR+= bicom SUBDIR+= bunzip SUBDIR+= bzip2 SUBDIR+= cabextract +SUBDIR+= cxunzip SUBDIR+= dact SUBDIR+= fastjar SUBDIR+= freeze diff --git a/archivers/arc/distinfo b/archivers/arc/distinfo index 8c8e88ec2c7..d61cf3d483e 100644 --- a/archivers/arc/distinfo +++ b/archivers/arc/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.2 2001/04/18 11:21:02 agc Exp $ +$NetBSD: distinfo,v 1.2.2.1 2002/06/23 18:37:18 jlam Exp $ SHA1 (arc521e.pl8.tar.Z) = 34210f9aeaac39a15b34e6aa400b38127b6a2a20 Size (arc521e.pl8.tar.Z) = 100821 bytes SHA1 (patch-aa) = 62324f346559b2997eba56698b1c0c1c29a328c3 -SHA1 (patch-ab) = 607c5fd0f5083c573a59d2b1fafbf982dc282ae4 +SHA1 (patch-ab) = dfdfde740d70511adba711bb0a228154a9c9993e diff --git a/archivers/arc/patches/patch-ab b/archivers/arc/patches/patch-ab index d16ca3e6ddc..4c5b8313f1f 100644 --- a/archivers/arc/patches/patch-ab +++ b/archivers/arc/patches/patch-ab @@ -1,12 +1,12 @@ -$NetBSD: patch-ab,v 1.1 1999/05/22 19:54:09 tv Exp $ +$NetBSD: patch-ab,v 1.1.2.1 2002/06/23 18:37:18 jlam Exp $ --- arcdos.c.orig Tue Apr 14 18:58:21 1992 -+++ arcdos.c Sat May 22 15:43:27 1999 -@@ -173,14 +173,20 @@ ++++ arcdos.c Sun Jun 9 12:01:30 2002 +@@ -173,14 +173,21 @@ struct tm tm; struct timeval tvp[2]; int utimes(); -+#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) ++#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__APPLE__) long tmclock(); +#endif tm.tm_sec = (time & 31) * 2; @@ -15,10 +15,11 @@ $NetBSD: patch-ab,v 1.1 1999/05/22 19:54:09 tv Exp $ tm.tm_mday = date & 31; tm.tm_mon = ((date >> 5) & 15) - 1; tm.tm_year = (date >> 9) + 80; -+#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) ++ tm.tm_isdst = -1; ++#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__APPLE__) tvp[0].tv_sec = tmclock(&tm); +#else -+ tvp[0].tv_sec = timelocal(&tm); ++ tvp[0].tv_sec = mktime(&tm); +#endif tvp[1].tv_sec = tvp[0].tv_sec; tvp[0].tv_usec = tvp[1].tv_usec = 0; diff --git a/archivers/bzip2/buildlink.mk b/archivers/bzip2/buildlink.mk index 0f951952b29..4440493f10e 100644 --- a/archivers/bzip2/buildlink.mk +++ b/archivers/bzip2/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.5 2001/07/27 13:33:18 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.5.2.1 2002/06/23 18:37:19 jlam Exp $ # # This Makefile fragment is included by packages that use bzip2. # @@ -27,7 +27,7 @@ BUILDLINK_DEPENDS.bzip2?= bzip2>=1.0.1 # _BUILTIN_BZIP2!= ${EGREP} -c "BZ2_" /usr/include/bzlib.h || ${TRUE} .else -_BUILTIN_BZIP2!= 0 +_BUILTIN_BZIP2= 0 .endif .if ${_BUILTIN_BZIP2} == "0" diff --git a/archivers/cabextract/distinfo b/archivers/cabextract/distinfo index 1c319e8bc69..837a58f328b 100644 --- a/archivers/cabextract/distinfo +++ b/archivers/cabextract/distinfo @@ -1,4 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2001/10/18 09:56:13 agc Exp $ +$NetBSD: distinfo,v 1.1.1.1.2.1 2002/06/23 18:37:20 jlam Exp $ SHA1 (cabextract-0.5.tar.gz) = 0ae65a6c86d57f13a136986ba3df8aab8d2cfcf9 Size (cabextract-0.5.tar.gz) = 76097 bytes +SHA1 (patch-aa) = 57ee22a2e3e15e6fc740e76f8bbcf240d183d932 diff --git a/archivers/cabextract/patches/patch-aa b/archivers/cabextract/patches/patch-aa new file mode 100644 index 00000000000..8b67a1ed555 --- /dev/null +++ b/archivers/cabextract/patches/patch-aa @@ -0,0 +1,131 @@ +$NetBSD: patch-aa,v 1.1.2.2 2002/06/23 18:37:21 jlam Exp $ + +--- cabextract.c.orig Mon Aug 20 17:06:11 2001 ++++ cabextract.c Fri May 10 10:19:42 2002 +@@ -50,6 +50,7 @@ + #ifdef HAVE_CONFIG_H + #include <config.h> + ++#include <ctype.h> + #include <stdio.h> /* everyone has this! */ + + #ifdef HAVE_SYS_TYPES_H +@@ -1434,14 +1435,25 @@ + } + + rundest = window + window_posn; +- runsrc = rundest - match_offset; +- window_posn += match_length; + this_run -= match_length; + + /* copy any wrapped around source data */ +- while ((runsrc < window) && (match_length-- > 0)) { +- *rundest++ = *(runsrc + window_size); runsrc++; ++ if (window_posn >= match_offset) { ++ /* no wrap */ ++ runsrc = rundest - match_offset; ++ } else { ++ int copy_length; ++ runsrc = rundest + (window_size - match_offset); ++ copy_length = match_offset - window_posn; ++ if (copy_length < match_length) { ++ match_length -= copy_length; ++ window_posn += copy_length; ++ while (copy_length-- > 0) *rundest++ = *runsrc++; ++ runsrc = window; ++ } + } ++ window_posn += match_length; ++ + /* copy match data - no worries about destination wraps */ + while (match_length-- > 0) *rundest++ = *runsrc++; + +@@ -1514,14 +1526,25 @@ + } + + rundest = window + window_posn; +- runsrc = rundest - match_offset; +- window_posn += match_length; + this_run -= match_length; + + /* copy any wrapped around source data */ +- while ((runsrc < window) && (match_length-- > 0)) { +- *rundest++ = *(runsrc + window_size); runsrc++; ++ if (window_posn >= match_offset) { ++ /* no wrap */ ++ runsrc = rundest - match_offset; ++ } else { ++ int copy_length; ++ runsrc = rundest + (window_size - match_offset); ++ copy_length = match_offset - window_posn; ++ if (copy_length < match_length) { ++ match_length -= copy_length; ++ window_posn += copy_length; ++ while (copy_length-- > 0) *rundest++ = *runsrc++; ++ runsrc = window; ++ } + } ++ window_posn += match_length; ++ + /* copy match data - no worries about destination wraps */ + while (match_length-- > 0) *rundest++ = *runsrc++; + +@@ -1635,7 +1658,7 @@ + d = &name[strlen(name)]; + do { + c = *s++; +- *d++ = (c=='/') ? '\\' : ((c=='\\') ? '/' : (lower ? tolower(c) : c)); ++ *d++ = (c=='/') ? '\\' : ((c=='\\') ? '/' : (lower ? tolower((unsigned char) c) : c)); + } while (c); + + /* create directories if needed, attempt to write file */ +@@ -1655,14 +1678,17 @@ + void file_close(struct file *fi) { + struct utimbuf utb; + struct tm time; ++ mode_t m; + + if (fi->fh) fclose(fi->fh); + fi->fh = NULL; + ++ m = umask(0); ++ (void) umask(m); + chmod(fi->filename, +- (mode_t) 0444 ++ ((mode_t) 0444 + | (fi->attribs & cffile_A_EXEC ? 0111 : 0) +- | (fi->attribs & cffile_A_RDONLY ? 0 : 0222) ++ | (fi->attribs & cffile_A_RDONLY ? 0 : 0222)) & ~m + ); + + +@@ -1670,8 +1696,9 @@ + time.tm_min = (fi->time >> 5) & 0x3f; + time.tm_hour = (fi->time >> 11); + time.tm_mday = fi->date & 0x1f; +- time.tm_mon = (fi->date >> 5) & 0xf; ++ time.tm_mon = ((fi->date >> 5) & 0xf) - 1; + time.tm_year = (fi->date >> 9) + 80; ++ time.tm_isdst = -1; + #ifdef HAVE_UTIME + utb.actime = utb.modtime = mktime(&time); + utime(fi->filename, &utb); +@@ -1726,7 +1753,7 @@ + char *p, c; + p = strrchr(name, '/'); /* only modify the filename, not the path */ + if (!p) p = name; +- while ((c = *p)) *p++ = (char) tolower((int) c); ++ while ((c = *p)) *p++ = (char) tolower((unsigned char) c); + fh = fopen(name, "rb"); + if (!fh) { perror(name); return 0; } + } +@@ -1818,7 +1845,8 @@ + * file, and the 'file offset' header isn't beyond the cabinet + * length, this is a reasonable cabinet header. + */ +- if ((len+offset+i) < cab->filelen && foff < len) { ++ /* XXX 20 for self-extracting cabinet */ ++ if ((len+offset+i) <= cab->filelen+20 && foff < len) { + cabinet_seek(cab, offset+i-20); return 1; + } + } diff --git a/archivers/cxunzip/DESCR b/archivers/cxunzip/DESCR new file mode 100644 index 00000000000..33edf434432 --- /dev/null +++ b/archivers/cxunzip/DESCR @@ -0,0 +1,5 @@ +Cloned Xunzip is an GNOME app for opening ZIP files and viewing +files. The graphical interface shows the filename, date, ratio, +real size and the packed file size. It can also be used to find +CRC errors. You can choose where to extract all or selected files; +plus it can lowercase filenames. diff --git a/archivers/cxunzip/Makefile b/archivers/cxunzip/Makefile new file mode 100644 index 00000000000..3c2de5279a4 --- /dev/null +++ b/archivers/cxunzip/Makefile @@ -0,0 +1,17 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:37:23 jlam Exp $ + +DISTNAME= cxunzip-0.96 +CATEGORIES= archivers +MASTER_SITES= http://gurb.ton.tut.fi/gnome/download/ + +MAINTAINER= packages@netbsd.org +HOMEPAGE= http://gurb.ton.tut.fi/gnome +COMMENT= Cloned Xunzip is a GNOME zip-archive uncompressing program + +GNU_CONFIGURE= yes +USE_GMAKE= yes +#USE_LIBTOOL= yes + +.include "../../x11/gnome-libs/buildlink.mk" +.include "../../mk/x11.buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/archivers/cxunzip/PLIST b/archivers/cxunzip/PLIST new file mode 100644 index 00000000000..3c009734bc1 --- /dev/null +++ b/archivers/cxunzip/PLIST @@ -0,0 +1,3 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.2.2 2002/06/23 18:37:23 jlam Exp $ +bin/cxunzip +share/gnome/apps/Utilities/cxunzip.desktop diff --git a/archivers/cxunzip/distinfo b/archivers/cxunzip/distinfo new file mode 100644 index 00000000000..1e285014f14 --- /dev/null +++ b/archivers/cxunzip/distinfo @@ -0,0 +1,5 @@ +$NetBSD: distinfo,v 1.1.1.1.2.2 2002/06/23 18:37:24 jlam Exp $ + +SHA1 (cxunzip-0.96.tar.gz) = 5c639c344a8a3a05ab33419d1b1f66b99ac460a4 +Size (cxunzip-0.96.tar.gz) = 185785 bytes +SHA1 (patch-aa) = 1738c34f3a0ca48f8651228b72e044b32872d6a1 diff --git a/archivers/cxunzip/patches/patch-aa b/archivers/cxunzip/patches/patch-aa new file mode 100644 index 00000000000..5db0d50fb45 --- /dev/null +++ b/archivers/cxunzip/patches/patch-aa @@ -0,0 +1,13 @@ +$NetBSD: patch-aa,v 1.1.1.1.4.2 2002/06/23 18:37:25 jlam Exp $ + +--- src/callbacks.cc.orig Fri May 24 12:49:34 2002 ++++ src/callbacks.cc Fri May 24 12:51:17 2002 +@@ -203,7 +203,7 @@ + msg=g_strdup_printf(_("Unable view file %s"),filename); + show_error(msg); + } else { +- msg=g_strdup_printf("%s %s/%s &", ++ msg=g_strdup_printf("%s \"%s/%s\" &", + string,dirname,filename); + system(msg); + } diff --git a/audio/Makefile b/audio/Makefile index 09e1e404a7a..675fdd36e34 100644 --- a/audio/Makefile +++ b/audio/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.131 2002/04/28 16:55:26 zuntum Exp $ +# $NetBSD: Makefile,v 1.131.2.1 2002/06/23 18:37:26 jlam Exp $ # COMMENT= Audio tools @@ -6,6 +6,7 @@ COMMENT= Audio tools SUBDIR+= SDL-mixer SUBDIR+= abcde SUBDIR+= amp +SUBDIR+= arts SUBDIR+= audacity SUBDIR+= aumix SUBDIR+= bladeenc @@ -56,6 +57,7 @@ SUBDIR+= flac SUBDIR+= flac-xmms SUBDIR+= freezetag SUBDIR+= gdcd +SUBDIR+= gkrellm-volume SUBDIR+= gkrellm-xmms SUBDIR+= gmodplay SUBDIR+= gmp3info @@ -73,6 +75,7 @@ SUBDIR+= id3lib SUBDIR+= id3v2 SUBDIR+= kdemultimedia SUBDIR+= kdemultimedia2 +SUBDIR+= kdemultimedia3 SUBDIR+= krio SUBDIR+= lame SUBDIR+= liba52 @@ -100,13 +103,18 @@ SUBDIR+= mp3blaster SUBDIR+= mp3check SUBDIR+= mp3info SUBDIR+= mp3to +SUBDIR+= mpegaudio SUBDIR+= mpg123 +SUBDIR+= mpg123-esound +SUBDIR+= mpg123-nas +SUBDIR+= mpg321 SUBDIR+= mserv SUBDIR+= musicbox SUBDIR+= musicbrainz SUBDIR+= nas SUBDIR+= normalize SUBDIR+= nspmod +SUBDIR+= oggasm SUBDIR+= p5-Audio-CD-disc-cover SUBDIR+= p5-MP3-Info SUBDIR+= p5-MP3-Tag @@ -114,6 +122,7 @@ SUBDIR+= py-cddb SUBDIR+= realplayer SUBDIR+= rio SUBDIR+= rio500 +SUBDIR+= rioutil SUBDIR+= rosegarden SUBDIR+= rplay SUBDIR+= rsynth @@ -122,6 +131,7 @@ SUBDIR+= sidplay SUBDIR+= snd SUBDIR+= sox SUBDIR+= spiralloops +SUBDIR+= spiralsynth SUBDIR+= splay SUBDIR+= tfmxplay SUBDIR+= timidity @@ -129,6 +139,9 @@ SUBDIR+= tosha SUBDIR+= tracker SUBDIR+= vorbis-tools SUBDIR+= wmmixer +SUBDIR+= wmmp3 +SUBDIR+= wmsmixer +SUBDIR+= wmusic SUBDIR+= wsoundprefs SUBDIR+= wsoundserver SUBDIR+= xamp @@ -146,6 +159,7 @@ SUBDIR+= xmms-dspectogram SUBDIR+= xmms-dspectralizer SUBDIR+= xmms-fmradio SUBDIR+= xmms-gdancer +SUBDIR+= xmms-mad SUBDIR+= xmms-neato SUBDIR+= xmms-sid SUBDIR+= xmms-vismsa diff --git a/audio/arts/DESCR b/audio/arts/DESCR new file mode 100644 index 00000000000..bbe8e1016a9 --- /dev/null +++ b/audio/arts/DESCR @@ -0,0 +1,5 @@ +The Analog Real-Time Synthesizer, or aRts, is a modular system for synthesizing +sound and music on a digital computer. Using small building blocks called +modules, the user can easily build complex audio processing tools. Modules +typically provide functions such as sound waveform generators, filters, audio +effects, mixing, and playback of digital audio in different file formats. diff --git a/audio/arts/Makefile b/audio/arts/Makefile new file mode 100644 index 00000000000..84bcdd3fbf7 --- /dev/null +++ b/audio/arts/Makefile @@ -0,0 +1,31 @@ +# $NetBSD: Makefile,v 1.2.2.2 2002/06/23 18:37:28 jlam Exp $ + +DISTNAME= arts-1.0.1 +CATEGORIES= audio +COMMENT= Analog Real-Time Synthesizer + +.include "../../x11/kde3/Makefile.kde3" + +CONFLICTS+= kdelibs-2* + +USE_BUILDLINK_ONLY= yes + +LIBTOOL_OVERRIDE+= ${WRKSRC}/libltdl/libtool + +BUILD_DEPENDS+= perl>=${PERL5_REQD}:../../lang/perl5 +USE_PTHREAD= native pth-syscall +.include "../../mk/bsd.prefs.mk" + +.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "none" +CONFIGURE_ARGS+= --disable-threading +.endif + +.if ${OPSYS} == "NetBSD" +LIBS+= -Wl,--export-dynamic +.endif + +.include "../../audio/libaudiofile/buildlink.mk" +.include "../../mk/pthread.buildlink.mk" +.include "../../x11/kde3/buildlink.mk" +.include "../../mk/x11.buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/audio/arts/PLIST b/audio/arts/PLIST new file mode 100644 index 00000000000..be9fca2097a --- /dev/null +++ b/audio/arts/PLIST @@ -0,0 +1,160 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.2.2 2002/06/23 18:37:29 jlam Exp $ +bin/artsc-config +bin/artscat +bin/artsd +bin/artsdsp +bin/artsplay +bin/artsrec +bin/artsshell +bin/artswrapper +bin/mcopidl +include/arts/anyref.h +include/arts/artsflow.h +include/arts/artsflow.idl +include/arts/artsversion.h +include/arts/asyncstream.h +include/arts/audioio.h +include/arts/audiosubsys.h +include/arts/buffer.h +include/arts/bufferqueue.h +include/arts/cache.h +include/arts/cachedwav.h +include/arts/common.h +include/arts/connect.h +include/arts/connection.h +include/arts/convert.h +include/arts/core.h +include/arts/core.idl +include/arts/cpuinfo.h +include/arts/datapacket.h +include/arts/debug.h +include/arts/delayedreturn.h +include/arts/dispatcher.h +include/arts/dynamicrequest.h +include/arts/dynamicskeleton.h +include/arts/extensionloader.h +include/arts/factory.h +include/arts/fft.h +include/arts/flowsystem.h +include/arts/idlfilereg.h +include/arts/ifacerepo_impl.h +include/arts/iomanager.h +include/arts/kmedia2.h +include/arts/kmedia2.idl +include/arts/mcopconfig.h +include/arts/mcoputils.h +include/arts/notification.h +include/arts/object.h +include/arts/objectmanager.h +include/arts/pipebuffer.h +include/arts/pool.h +include/arts/qiomanager.h +include/arts/reference.h +include/arts/referenceclean.h +include/arts/resample.h +include/arts/socketconnection.h +include/arts/soundserver.h +include/arts/soundserver.idl +include/arts/startupmanager.h +include/arts/stdsynthmodule.h +include/arts/synthschedule.h +include/arts/tcpconnection.h +include/arts/tcpserver.h +include/arts/thread.h +include/arts/type.h +include/arts/unixconnection.h +include/arts/unixserver.h +include/arts/weakreference.h +include/artsc/artsc.h +lib/libartsc.a +lib/libartsc.la +lib/libartsc.so +lib/libartsc.so.0 +lib/libartsc.so.0.0 +lib/libartscbackend.a +lib/libartscbackend.la +lib/libartscbackend.so +lib/libartscbackend.so.0 +lib/libartscbackend.so.0.0 +lib/libartsdsp.a +lib/libartsdsp.la +lib/libartsdsp.so +lib/libartsdsp.so.0 +lib/libartsdsp.so.0.0 +lib/libartsdsp_st.a +lib/libartsdsp_st.la +lib/libartsdsp_st.so +lib/libartsdsp_st.so.0 +lib/libartsdsp_st.so.0.0 +lib/libartsflow.a +lib/libartsflow.la +lib/libartsflow.so +lib/libartsflow.so.1 +lib/libartsflow.so.1.0 +lib/libartsflow_idl.a +lib/libartsflow_idl.la +lib/libartsflow_idl.so +lib/libartsflow_idl.so.1 +lib/libartsflow_idl.so.1.0 +lib/libartswavplayobject.a +lib/libartswavplayobject.la +lib/libartswavplayobject.so +lib/libartswavplayobject.so.0 +lib/libartswavplayobject.so.0.0 +lib/libkmedia2.a +lib/libkmedia2.la +lib/libkmedia2.so +lib/libkmedia2.so.1 +lib/libkmedia2.so.1.0 +lib/libkmedia2_idl.a +lib/libkmedia2_idl.la +lib/libkmedia2_idl.so +lib/libkmedia2_idl.so.1 +lib/libkmedia2_idl.so.1.0 +lib/libmcop.a +lib/libmcop.la +lib/libmcop.so +lib/libmcop.so.1 +lib/libmcop.so.1.0 +lib/libqtmcop.a +lib/libqtmcop.la +lib/libqtmcop.so +lib/libqtmcop.so.1 +lib/libqtmcop.so.1.0 +lib/libsoundserver_idl.a +lib/libsoundserver_idl.la +lib/libsoundserver_idl.so +lib/libsoundserver_idl.so.1 +lib/libsoundserver_idl.so.1.0 +lib/libx11globalcomm.a +lib/libx11globalcomm.la +lib/libx11globalcomm.so +lib/libx11globalcomm.so.1 +lib/libx11globalcomm.so.1.0 +lib/mcop/Arts/FileInputStream.mcopclass +lib/mcop/Arts/Synth_ADD.mcopclass +lib/mcop/Arts/Synth_AMAN_PLAY.mcopclass +lib/mcop/Arts/Synth_AMAN_RECORD.mcopclass +lib/mcop/Arts/Synth_BUS_DOWNLINK.mcopclass +lib/mcop/Arts/Synth_BUS_UPLINK.mcopclass +lib/mcop/Arts/Synth_FREQUENCY.mcopclass +lib/mcop/Arts/Synth_MUL.mcopclass +lib/mcop/Arts/Synth_MULTI_ADD.mcopclass +lib/mcop/Arts/Synth_PLAY.mcopclass +lib/mcop/Arts/Synth_PLAY_WAV.mcopclass +lib/mcop/Arts/Synth_RECORD.mcopclass +lib/mcop/Arts/Synth_WAVE_SIN.mcopclass +lib/mcop/Arts/WavPlayObject.mcopclass +lib/mcop/Arts/X11GlobalComm.mcopclass +lib/mcop/artsflow.mcopclass +lib/mcop/artsflow.mcoptype +lib/mcop/kmedia2.mcopclass +lib/mcop/kmedia2.mcoptype +lib/mcop/soundserver.mcopclass +lib/mcop/soundserver.mcoptype +lib/mcop/x11globalcomm.mcopclass +lib/mcop/x11globalcomm.mcoptype +@dirrm lib/mcop/Arts +@dirrm lib/mcop +@dirrm include/artsc +@dirrm include/arts diff --git a/audio/arts/buildlink.mk b/audio/arts/buildlink.mk new file mode 100644 index 00000000000..d3bb02db81b --- /dev/null +++ b/audio/arts/buildlink.mk @@ -0,0 +1,49 @@ +# $NetBSD: buildlink.mk,v 1.1.1.1.2.2 2002/06/23 18:37:29 jlam Exp $ +# +# This Makefile fragment is included by packages that use arts. +# +# To use this Makefile fragment, simply: +# +# (1) Optionally define BUILDLINK_DEPENDS.arts to the dependency pattern +# for the version of arts desired. +# (2) Include this Makefile fragment in the package Makefile, +# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header +# search path, and +# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search +# path. + +.if !defined(ARTS_BUILDLINK_MK) +ARTS_BUILDLINK_MK= # defined + +.include "../../mk/bsd.buildlink.mk" + +BUILDLINK_DEPENDS.arts?= arts>=1.0.0 +DEPENDS+= ${BUILDLINK_DEPENDS.arts}:../../audio/arts + +EVAL_PREFIX+= BUILDLINK_PREFIX.arts=arts +BUILDLINK_PREFIX.arts_DEFAULT= ${X11BASE} + +BUILDLINK_FILES.arts!= ${GREP} "^\(include\|lib\)" ${.CURDIR}/../../audio/arts/PLIST + +BUILDLINK_TARGETS.arts= arts-buildlink +BUILDLINK_TARGETS.arts+= artsc-buildlink-config-wrapper +BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.arts} + +BUILDLINK_CONFIG.artsc= \ + ${BUILDLINK_PREFIX.arts}/bin/artsc-config +BUILDLINK_CONFIG_WRAPPER.artsc= \ + ${BUILDLINK_DIR}/bin/artsc-config +REPLACE_BUILDLINK_SED+= \ + -e "s|${BUILDLINK_CONFIG_WRAPPER.artsc}|${BUILDLINK_CONFIG.artsc}|g" + +.if defined(USE_CONFIG_WRAPPER) +ARTSC_CONFIG?= ${BUILDLINK_CONFIG_WRAPPER.artsc} +CONFIGURE_ENV+= ARTSC_CONFIG="${ARTSC_CONFIG}" +MAKE_ENV+= ARTSC_CONFIG="${ARTSC_CONFIG}" +.endif + +pre-configure: ${BUILDLINK_TARGETS.arts} +arts-buildlink: _BUILDLINK_USE +artsc-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE + +.endif # ARTS_BUILDLINK_MK diff --git a/audio/arts/distinfo b/audio/arts/distinfo new file mode 100644 index 00000000000..fd24e114ff1 --- /dev/null +++ b/audio/arts/distinfo @@ -0,0 +1,10 @@ +$NetBSD: distinfo,v 1.1.1.1.2.2 2002/06/23 18:37:30 jlam Exp $ + +SHA1 (arts-1.0.1.tar.bz2) = 88e845d9fa588a254e0e98bcc5391d92722bcdc2 +Size (arts-1.0.1.tar.bz2) = 1018246 bytes +SHA1 (patch-aa) = 23dd79c83f7e0905cef66e002387f44c18438fed +SHA1 (patch-ab) = c18aa3dbb98d916cba99da03e51d53ee72649e9e +SHA1 (patch-ac) = cd5cd30ff4d35de2a11a05e475dfaf5e1fb36f24 +SHA1 (patch-ad) = f030e7f34e4c32d0df6e1c0bcdb9e1bd82e687c5 +SHA1 (patch-ae) = 4913eab125a37e2cb95d1574cad5c7eb84e80956 +SHA1 (patch-af) = 9a130ccd7f56656bb55e2c5edf223c38c69be591 diff --git a/audio/arts/patches/patch-aa b/audio/arts/patches/patch-aa new file mode 100644 index 00000000000..03aa32381d6 --- /dev/null +++ b/audio/arts/patches/patch-aa @@ -0,0 +1,13 @@ +$NetBSD: patch-aa,v 1.1.1.1.2.2 2002/06/23 18:37:31 jlam Exp $ + +--- Makefile.in.orig Wed May 8 19:59:26 2002 ++++ Makefile.in +@@ -271,7 +271,7 @@ + x_libraries = @x_libraries@ + + AUTOMAKE_OPTIONS = foreign 1.4 +-COMPILE_FIRST = libltdl mcop mcopidl flow mcop_mt soundserver artsc examples tests doc ++COMPILE_FIRST = libltdl mcop mcopidl flow soundserver artsc examples tests doc + SUBDIRS = $(COMPILE_FIRST) $(TOPSUBDIRS) + EXTRA_DIST = admin + subdir = . diff --git a/audio/arts/patches/patch-ab b/audio/arts/patches/patch-ab new file mode 100644 index 00000000000..396075950ee --- /dev/null +++ b/audio/arts/patches/patch-ab @@ -0,0 +1,68 @@ +$NetBSD: patch-ab,v 1.1.1.1.2.2 2002/06/23 18:37:33 jlam Exp $ + +--- artsc/artsdsp.c.orig Fri Jul 27 11:49:53 2001 ++++ artsc/artsdsp.c +@@ -127,6 +127,9 @@ + + static void artsdsp_doinit() + { ++#if defined(__NetBSD__) ++ void *handle; ++#endif + const char *env; + artsdsp_init = 1; + +@@ -139,6 +142,18 @@ + mmapemu = env && !strcmp(env,"1"); + + /* resolve original symbols */ ++#if defined(__NetBSD__) ++ handle = dlopen(NULL, DL_LAZY); ++ orig_open = (orig_open_ptr)dlsym(handle,"open"); ++ orig_close = (orig_close_ptr)dlsym(handle,"close"); ++ orig_write = (orig_write_ptr)dlsym(handle,"write"); ++ orig_ioctl = (orig_ioctl_ptr)dlsym(handle,"_oss_ioctl"); ++ orig_mmap = (orig_mmap_ptr)dlsym(handle,"mmap"); ++ orig_munmap = (orig_munmap_ptr)dlsym(handle,"munmap"); ++ orig_fopen = (orig_fopen_ptr)dlsym(handle,"fopen"); ++ orig_access = (orig_access_ptr)dlsym(handle,"access"); ++ (void) dlclose(handle); ++#else + orig_open = (orig_open_ptr)dlsym(RTLD_NEXT,"open"); + orig_close = (orig_close_ptr)dlsym(RTLD_NEXT,"close"); + orig_write = (orig_write_ptr)dlsym(RTLD_NEXT,"write"); +@@ -147,6 +162,7 @@ + orig_munmap = (orig_munmap_ptr)dlsym(RTLD_NEXT,"munmap"); + orig_fopen = (orig_fopen_ptr)dlsym(RTLD_NEXT,"fopen"); + orig_access = (orig_access_ptr)dlsym(RTLD_NEXT,"access"); ++#endif + } + + static void artsdspdebug(const char *fmt,...) +@@ -230,13 +246,18 @@ + return sndfd; + } + ++#if defined(__NetBSD__) ++int _oss_ioctl (int fd, unsigned long request, void *argp) ++#else + int ioctl (int fd, ioctl_request_t request, ...) ++#endif + { + static int channels; + static int bits; + static int speed; + int space, size, latency, odelay; + ++#if !defined(__NetBSD__) + /* + * FreeBSD needs ioctl with varargs. However I have no idea how to "forward" + * the variable args ioctl to the orig_ioctl routine. So I expect the ioctl +@@ -248,6 +269,7 @@ + va_start(args,request); + argp = va_arg(args, void *); + va_end(args); ++#endif + + CHECK_INIT(); + diff --git a/audio/arts/patches/patch-ac b/audio/arts/patches/patch-ac new file mode 100644 index 00000000000..9c02a280254 --- /dev/null +++ b/audio/arts/patches/patch-ac @@ -0,0 +1,22 @@ +$NetBSD: patch-ac,v 1.1.1.1.2.2 2002/06/23 18:37:33 jlam Exp $ + +--- flow/cpuinfo.cc.orig Wed May 8 19:57:52 2002 ++++ flow/cpuinfo.cc +@@ -204,6 +204,9 @@ + : /* no input */ + : "memory" + ); ++#if defined(__NetBSD__) ++ CpuInfo::s_flags = 0; ++#else + // SSE must be supported by the OS, if it's not, any SSE insn will + // trigger an invalid opcode exception, to check for this, a SIGILL + // handler is installed and a SSE insn run. If the handler is called, +@@ -226,6 +229,7 @@ + } + signal(SIGILL, oldHandler); + } ++#endif + #endif /* HAVE_X86_SSE */ + } + diff --git a/audio/arts/patches/patch-ad b/audio/arts/patches/patch-ad new file mode 100644 index 00000000000..2bcd3c60d3e --- /dev/null +++ b/audio/arts/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.1.1.1.2.2 2002/06/23 18:37:34 jlam Exp $ + +--- soundserver/Makefile.am.orig Wed May 8 19:57:54 2002 ++++ soundserver/Makefile.am +@@ -45,7 +45,7 @@ + bin_PROGRAMS = artsd artsplay artscat artswrapper artsshell artsrec + + artsd_LDADD = libsoundserver_idl.la $(FLOWLIBS) \ +- $(top_builddir)/mcop_mt/libmcop_mt.la $(USE_THREADS) ++ $(top_builddir)/mcop/libmcop.la $(USE_THREADS) + artsd_SOURCES = soundserverv2_impl.cc soundserver_impl.cc simplesoundserver_impl.cc artsd.cc cpuusage.cc samplestorage_impl.cc + + artscat_LDADD = libsoundserver_idl.la $(FLOWLIBS) diff --git a/audio/arts/patches/patch-ae b/audio/arts/patches/patch-ae new file mode 100644 index 00000000000..9c80d1644ad --- /dev/null +++ b/audio/arts/patches/patch-ae @@ -0,0 +1,22 @@ +$NetBSD: patch-ae,v 1.1.1.1.2.2 2002/06/23 18:37:35 jlam Exp $ + +--- soundserver/Makefile.in.orig Wed May 8 19:59:27 2002 ++++ soundserver/Makefile.in +@@ -303,7 +303,7 @@ + bin_PROGRAMS = artsd artsplay artscat artswrapper artsshell artsrec + + artsd_LDADD = libsoundserver_idl.la $(FLOWLIBS) \ +- $(top_builddir)/mcop_mt/libmcop_mt.la $(USE_THREADS) ++ $(top_builddir)/mcop/libmcop.la $(USE_THREADS) + + artsd_SOURCES = soundserverv2_impl.cc soundserver_impl.cc simplesoundserver_impl.cc artsd.cc cpuusage.cc samplestorage_impl.cc + +@@ -395,7 +395,7 @@ + @KDE_USE_FINAL_TRUE@artsd_OBJECTS = $(artsd_final_OBJECTS) + artsd_DEPENDENCIES = libsoundserver_idl.la \ + $(top_builddir)/flow/libartsflow.la \ +- $(top_builddir)/mcop_mt/libmcop_mt.la ++ $(top_builddir)/mcop/libmcop.la + artsd_LDFLAGS = + am_artsplay_OBJECTS = artsplay.$(OBJEXT) + #>- artsplay_OBJECTS = $(am_artsplay_OBJECTS) diff --git a/audio/arts/patches/patch-af b/audio/arts/patches/patch-af new file mode 100644 index 00000000000..44f38ea9e27 --- /dev/null +++ b/audio/arts/patches/patch-af @@ -0,0 +1,14 @@ +$NetBSD: patch-af,v 1.1.1.1.2.2 2002/06/23 18:37:35 jlam Exp $ + +--- flow/gsl/gslcommon.c.orig Thu May 30 13:24:35 2002 ++++ flow/gsl/gslcommon.c +@@ -23,7 +23,9 @@ + #include <fcntl.h> + #include <sys/utsname.h> + #include <string.h> ++#if !defined(__NetBSD__) + #include <sched.h> ++#endif + #include <errno.h> + #include <sys/poll.h> + #include <sys/stat.h> diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile index 5619acd1b77..5aa37e18cf0 100644 --- a/audio/audacity/Makefile +++ b/audio/audacity/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.5 2002/03/13 17:36:35 fredb Exp $ +# $NetBSD: Makefile,v 1.5.2.1 2002/06/23 18:37:36 jlam Exp $ # DISTNAME= audacity-src-0.96 PKGNAME= audacity-0.96 PKGREVISION= 1 CATEGORIES= audio -MASTER_SITES= http://prdownloads.sourceforge.net/audacity/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=audacity/} EXTRACT_SUFX= .tgz MAINTAINER= packages@netbsd.org diff --git a/audio/audacity/patches/patch-ae b/audio/audacity/patches/patch-ae index 65b9df4d5a6..35a7cd20d00 100644 --- a/audio/audacity/patches/patch-ae +++ b/audio/audacity/patches/patch-ae @@ -1,3 +1,4 @@ +$NetBSD: patch-ae,v 1.2.2.1 2002/06/23 18:37:37 jlam Exp $ --- Makefile.in.orig Sun Jul 29 03:17:54 2001 +++ Makefile.in Tue Jul 31 19:28:20 2001 @@ -8,7 +8,7 @@ diff --git a/audio/disc-cover/Makefile b/audio/disc-cover/Makefile index a0bb201773b..07a9b187daa 100644 --- a/audio/disc-cover/Makefile +++ b/audio/disc-cover/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.3 2001/11/26 10:00:36 jlam Exp $ +# $NetBSD: Makefile,v 1.3.2.1 2002/06/23 18:37:38 jlam Exp $ # -DISTNAME= disc-cover-1.2.2 +DISTNAME= disc-cover-1.3.1 CATEGORIES= audio MASTER_SITES= http://www.liacs.nl/~jvhemert/disc-cover/download/unstable/ diff --git a/audio/disc-cover/distinfo b/audio/disc-cover/distinfo index 15f153b008b..6e0bccfbfdd 100644 --- a/audio/disc-cover/distinfo +++ b/audio/disc-cover/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2001/11/26 10:00:36 jlam Exp $ +$NetBSD: distinfo,v 1.4.2.1 2002/06/23 18:37:39 jlam Exp $ -SHA1 (disc-cover-1.2.2.tar.gz) = e5af63e361c66b7ab301c3472cd31af9d542cd30 -Size (disc-cover-1.2.2.tar.gz) = 42151 bytes +SHA1 (disc-cover-1.3.1.tar.gz) = 8195ebe3cce3727fc378e00208bb92dcc2b793d1 +Size (disc-cover-1.3.1.tar.gz) = 47445 bytes diff --git a/audio/esound/Makefile b/audio/esound/Makefile index 3be1b049e23..d3fde455475 100644 --- a/audio/esound/Makefile +++ b/audio/esound/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.30.2.2 2002/06/21 23:04:57 jlam Exp $ +# $NetBSD: Makefile,v 1.30.2.3 2002/06/23 18:37:40 jlam Exp $ -DISTNAME= esound-0.2.25 +DISTNAME= esound-0.2.26 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/esound/} @@ -19,5 +19,6 @@ EGDIR= ${PREFIX}/share/examples/esound CONF_FILES= ${EGDIR}/esd.conf ${PKG_SYSCONFDIR}/esd.conf .include "../../audio/libaudiofile/buildlink2.mk" + .include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/esound/PLIST b/audio/esound/PLIST index f9d9fdbdf35..d93ae575a9e 100644 --- a/audio/esound/PLIST +++ b/audio/esound/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2002/04/29 08:40:27 wiz Exp $ +@comment $NetBSD: PLIST,v 1.4.2.1 2002/06/23 18:37:41 jlam Exp $ bin/esd bin/esd-config bin/esdcat @@ -14,7 +14,7 @@ lib/libesd.a lib/libesd.la lib/libesd.so lib/libesd.so.2 -lib/libesd.so.2.25 +lib/libesd.so.2.26 lib/pkgconfig/esound.pc share/aclocal/esd.m4 share/examples/esound/esd.conf diff --git a/audio/esound/distinfo b/audio/esound/distinfo index 35824ad9868..51001eab32a 100644 --- a/audio/esound/distinfo +++ b/audio/esound/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.5 2002/04/29 08:40:27 wiz Exp $ +$NetBSD: distinfo,v 1.5.2.1 2002/06/23 18:37:41 jlam Exp $ -SHA1 (esound-0.2.25.tar.gz) = c72b333e666f6bd8668bc0ebe75c7e817fbfa139 -Size (esound-0.2.25.tar.gz) = 339560 bytes +SHA1 (esound-0.2.26.tar.gz) = dffa3424120b896b879a2ea95f2c495a49dadc45 +Size (esound-0.2.26.tar.gz) = 349513 bytes SHA1 (patch-aa) = fe632a5514073f8d898fef5182a1047b9f2a44c9 SHA1 (patch-ab) = af59f6f254812c082566a1c483aec511deed0819 SHA1 (patch-ac) = 8c68050320c80363b831745eb17cc0703acbaf24 diff --git a/audio/gkrellm-volume/DESCR b/audio/gkrellm-volume/DESCR new file mode 100644 index 00000000000..ece565f5008 --- /dev/null +++ b/audio/gkrellm-volume/DESCR @@ -0,0 +1,2 @@ +gkrellm-volume is a gkrellm plugin to control all your mixer volumes. +It also allows to save/restore volumes between sessions. diff --git a/audio/gkrellm-volume/Makefile b/audio/gkrellm-volume/Makefile new file mode 100644 index 00000000000..8e4480f2639 --- /dev/null +++ b/audio/gkrellm-volume/Makefile @@ -0,0 +1,19 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:37:43 jlam Exp $ + +DISTNAME= volume-0.8 +PKGNAME= gkrellm-${DISTNAME} +WRKSRC= ${WRKDIR}/volume +CATEGORIES= audio +MASTER_SITES= http://gkrellm.luon.net/files/ + +MAINTAINER= jmmv@hispabsd.org +HOMEPAGE= http://gkrellm.luon.net/volume.phtml +COMMENT= gkrellm volume mixer plugin + +DEPENDS+= gkrellm-1.2.*:../../sysutils/gkrellm + +USE_PTHREAD= native pth + +.include "../../graphics/imlib/buildlink.mk" +.include "../../x11/gtk/buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/audio/gkrellm-volume/PLIST b/audio/gkrellm-volume/PLIST new file mode 100644 index 00000000000..9593ef99228 --- /dev/null +++ b/audio/gkrellm-volume/PLIST @@ -0,0 +1,2 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.4.2 2002/06/23 18:37:44 jlam Exp $ +lib/gkrellm/plugins/volume.so diff --git a/audio/gkrellm-volume/distinfo b/audio/gkrellm-volume/distinfo new file mode 100644 index 00000000000..2d029f28b8a --- /dev/null +++ b/audio/gkrellm-volume/distinfo @@ -0,0 +1,6 @@ +$NetBSD: distinfo,v 1.2.2.2 2002/06/23 18:37:44 jlam Exp $ + +SHA1 (volume-0.8.tar.gz) = 7348c8fc41bdc6c236442748ef3c803851a151f8 +Size (volume-0.8.tar.gz) = 8395 bytes +SHA1 (patch-aa) = adf96e0bd1e2b65e85394c4c50ce1db587b73195 +SHA1 (patch-ab) = 9281f2e550134887bfbc99464ab79987f4a26183 diff --git a/audio/gkrellm-volume/patches/patch-aa b/audio/gkrellm-volume/patches/patch-aa new file mode 100644 index 00000000000..7fe16008e9c --- /dev/null +++ b/audio/gkrellm-volume/patches/patch-aa @@ -0,0 +1,57 @@ +$NetBSD: patch-aa,v 1.2.2.2 2002/06/23 18:37:45 jlam Exp $ + +--- Makefile.orig Fri Jun 23 19:47:00 2000 ++++ Makefile +@@ -1,27 +1,19 @@ + # Makefile for GKrellM volume plugin + +-# Linux +-GTK_CONFIG = gtk-config +-SYSLIB = -lpthread +- +-# FreeBSD +-#GTK_CONFIG = gtk12-config +-#SYSLIB = +- +-PLUGIN_DIR = /usr/share/gkrellm/plugins ++PLUGIN_DIR = ${LOCALBASE}/lib/gkrellm/plugins + GKRELLM_INCLUDE = -I/usr/local/include + +-GTK_INCLUDE = `$(GTK_CONFIG) --cflags` +-GTK_LIB = `$(GTK_CONFIG) --libs` ++GTK_INCLUDE = `gtk-config --cflags` ++GTK_LIB = `gtk-config --libs` + + IMLIB_INCLUDE = `imlib-config --cflags-gdk` + IMLIB_LIB = `imlib-config --libs-gdk` + +-FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(GKRELLM_INCLUDE) +-LIBS = $(GTK_LIB) $(IMLIB_LIB) $(SYSLIB) +-LFLAGS = -shared ++CFLAGS+= -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(GKRELLM_INCLUDE) ++LIBS+= $(GTK_LIB) $(IMLIB_LIB) $(SYSLIB) ++LFLAGS+= -shared -lpthread -lossaudio + +-CC = gcc $(CFLAGS) $(FLAGS) ++CC = gcc $(CFLAGS) + + INSTALL = install -c + INSTALL_PROGRAM = $(INSTALL) -s +@@ -30,9 +22,6 @@ + + all: volume.so + +-freebsd: +- make GTK_CONFIG=gtk12-config SYSLIB=all +- + volume.so: $(OBJS) + $(CC) $(OBJS) -o volume.so $(LIBS) $(LFLAGS) + +@@ -40,6 +29,7 @@ + rm -f *.o core *.so* *.bak *~ + + install: ++ mkdir -p $(PLUGIN_DIR) + $(INSTALL_PROGRAM) volume.so $(PLUGIN_DIR) + + volume.c.o: volume.c diff --git a/audio/gkrellm-volume/patches/patch-ab b/audio/gkrellm-volume/patches/patch-ab new file mode 100644 index 00000000000..42a93152c46 --- /dev/null +++ b/audio/gkrellm-volume/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.2.2.2 2002/06/23 18:37:46 jlam Exp $ + +--- volume.c.orig Wed Nov 22 21:35:42 2000 ++++ volume.c +@@ -19,6 +19,8 @@ + + #ifdef __FreeBSD__ + #include <machine/soundcard.h> ++#elif __NetBSD__ ++#include <soundcard.h> + #else + #include <sys/soundcard.h> + #endif diff --git a/audio/gkrellm-xmms/Makefile b/audio/gkrellm-xmms/Makefile index 812901c7480..177519f28d3 100644 --- a/audio/gkrellm-xmms/Makefile +++ b/audio/gkrellm-xmms/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.3 2002/03/13 17:36:36 fredb Exp $ +# $NetBSD: Makefile,v 1.3.2.1 2002/06/23 18:37:47 jlam Exp $ -DISTNAME= gkrellmms-0.5.5 -PKGNAME= gkrellm-xmms-0.5.5 -PKGREVISION= 1 +DISTNAME= gkrellmms-0.5.6 +PKGNAME= gkrellm-xmms-0.5.6 WRKSRC= ${WRKDIR}/gkrellmms CATEGORIES= audio MASTER_SITES= http://gkrellm.luon.net/files/ @@ -12,7 +11,7 @@ HOMEPAGE= http://gkrellm.luon.net/gkrellmms.phtml COMMENT= gkrellm xmms plugin DEPENDS+= xmms>=1.2.5:../xmms -DEPENDS+= gkrellm-1.2.*:../../sysutils/gkrellm +DEPENDS+= gkrellm>=1.2.11:../../sysutils/gkrellm pre-install: ${INSTALL_DATA_DIR} ${PREFIX}/lib/gkrellm/plugins diff --git a/audio/gkrellm-xmms/distinfo b/audio/gkrellm-xmms/distinfo index 34e017311c6..76c3bc2a3b6 100644 --- a/audio/gkrellm-xmms/distinfo +++ b/audio/gkrellm-xmms/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2001/10/30 13:22:05 damon Exp $ +$NetBSD: distinfo,v 1.1.1.1.2.1 2002/06/23 18:37:47 jlam Exp $ -SHA1 (gkrellmms-0.5.5.tar.gz) = afdf60b51f2cd974943364c377ea6f45edeb7ea8 -Size (gkrellmms-0.5.5.tar.gz) = 26721 bytes +SHA1 (gkrellmms-0.5.6.tar.gz) = a657f47c5e8f5a874c0ad0b91e238147065593bc +Size (gkrellmms-0.5.6.tar.gz) = 27249 bytes SHA1 (patch-aa) = f0b0c9266046bcea9b97fd9ae57f41b595d1eb11 diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile index 3175efa1c21..5d7df20571b 100644 --- a/audio/gnome-media/Makefile +++ b/audio/gnome-media/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2002/03/13 17:36:36 fredb Exp $ +# $NetBSD: Makefile,v 1.11.2.1 2002/06/23 18:37:48 jlam Exp $ DISTNAME= gnome-media-1.2.3 PKGREVISION= 1 @@ -15,6 +15,7 @@ GNU_CONFIGURE= YES USE_LIBTOOL= YES USE_X11BASE= YES USE_GMAKE= YES +BUILD_USES_MSGFMT= YES CONFIGURE_ENV+= XGETTEXT="${LOCALBASE}/bin/xgettext" CPPFLAGS+= -I${LOCALBASE}/include diff --git a/audio/icecast/Makefile b/audio/icecast/Makefile index f381f387376..c030e3a8260 100644 --- a/audio/icecast/Makefile +++ b/audio/icecast/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.6 2002/03/18 01:41:31 mrg Exp $ +# $NetBSD: Makefile,v 1.6.2.1 2002/06/23 18:37:49 jlam Exp $ # -DISTNAME= icecast-1.3.11 +DISTNAME= icecast-1.3.12 CATEGORIES= audio MASTER_SITES= http://www.icecast.org/releases/ diff --git a/audio/icecast/distinfo b/audio/icecast/distinfo index cb660bfa7aa..b95ddb50254 100644 --- a/audio/icecast/distinfo +++ b/audio/icecast/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.4 2002/03/18 01:41:31 mrg Exp $ +$NetBSD: distinfo,v 1.4.2.1 2002/06/23 18:37:49 jlam Exp $ -SHA1 (icecast-1.3.11.tar.gz) = 20191e1baff1becf9f28b2fd6e0395aa475b5b39 -Size (icecast-1.3.11.tar.gz) = 267709 bytes +SHA1 (icecast-1.3.12.tar.gz) = bacb760390453718de536b85979ff3a9a73c7710 +Size (icecast-1.3.12.tar.gz) = 269822 bytes SHA1 (patch-aa) = 169202f563e4e2812d8d532264dcdb4f9ffc8df2 -SHA1 (patch-ab) = 8724c2085a36caf4908067a29267bbd7a0f4e103 +SHA1 (patch-ab) = 80d2bb39512bffadf8015e6804a32212762b8294 diff --git a/audio/icecast/patches/patch-ab b/audio/icecast/patches/patch-ab index e550dbf19b0..2f5bb86e48d 100644 --- a/audio/icecast/patches/patch-ab +++ b/audio/icecast/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.1.1.1 2000/11/21 06:02:28 hubertf Exp $ +$NetBSD: patch-ab,v 1.1.1.1.2.1 2002/06/23 18:37:50 jlam Exp $ ---- configure.orig Tue Nov 21 06:35:44 2000 -+++ configure -@@ -880,15 +880,15 @@ +--- configure.orig Thu Apr 11 00:50:20 2002 ++++ configure Wed May 15 09:22:11 2002 +@@ -877,15 +877,15 @@ ICECAST_BINDIR=${prefix}/bin ICECAST_SBINDIR=${prefix}/bin ICECAST_ETCDIR=conf diff --git a/audio/id3lib/Makefile b/audio/id3lib/Makefile index cef37cd4d8b..59f7a031d2f 100644 --- a/audio/id3lib/Makefile +++ b/audio/id3lib/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.3 2002/01/08 17:49:12 drochner Exp $ +# $NetBSD: Makefile,v 1.3.2.1 2002/06/23 18:37:51 jlam Exp $ # DISTNAME= id3lib-3.8.0pre2 PKGNAME= id3lib-3.8.0.0.2 CATEGORIES= audio -MASTER_SITES= http://prdownloads.sourceforge.net/id3lib/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=id3lib/} MAINTAINER= packages@netbsd.org HOMEPAGE= http://id3lib.sourceforge.net/ diff --git a/audio/id3v2/Makefile b/audio/id3v2/Makefile index e427a86fa55..d6c39f635c8 100644 --- a/audio/id3v2/Makefile +++ b/audio/id3v2/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/04/19 14:35:29 zuntum Exp $ +# $NetBSD: Makefile,v 1.1.1.1.2.1 2002/06/23 18:37:52 jlam Exp $ -DISTNAME= id3v2-0.1.6 +DISTNAME= id3v2-0.1.7 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=id3v2/} MAINTAINER= jmmv@hispabsd.org -HOMEPAGE= http://id3v2.sourceforge.net +HOMEPAGE= http://id3v2.sourceforge.net/ COMMENT= Command line editor for id3v2 tags .include "../../audio/id3lib/buildlink.mk" diff --git a/audio/id3v2/PLIST b/audio/id3v2/PLIST index 24944cf5648..925e9ff161e 100644 --- a/audio/id3v2/PLIST +++ b/audio/id3v2/PLIST @@ -1,2 +1,3 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/04/19 14:35:29 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.1.1.1.2.1 2002/06/23 18:37:52 jlam Exp $ bin/id3v2 +man/man1/id3v2.1 diff --git a/audio/id3v2/distinfo b/audio/id3v2/distinfo index b9d91351c9a..265fda29686 100644 --- a/audio/id3v2/distinfo +++ b/audio/id3v2/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/04/19 14:35:29 zuntum Exp $ +$NetBSD: distinfo,v 1.1.1.1.2.1 2002/06/23 18:37:53 jlam Exp $ -SHA1 (id3v2-0.1.6.tar.gz) = 66bf3f40ac56f88e3d9358c73dec739d5757ff85 -Size (id3v2-0.1.6.tar.gz) = 20998 bytes -SHA1 (patch-aa) = 002bed6cf9de5a5c6ce33362676536237f464464 +SHA1 (id3v2-0.1.7.tar.gz) = 1d9766fda33d0bcdde46751e89bf1cfb6c23716e +Size (id3v2-0.1.7.tar.gz) = 54132 bytes +SHA1 (patch-aa) = 64eac05e1894a811fd3518ec4a7799117e640f60 diff --git a/audio/id3v2/patches/patch-aa b/audio/id3v2/patches/patch-aa index 56c1d823fb6..54b884f3ff5 100644 --- a/audio/id3v2/patches/patch-aa +++ b/audio/id3v2/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/04/19 14:35:29 zuntum Exp $ +$NetBSD: patch-aa,v 1.1.1.1.2.1 2002/06/23 18:37:54 jlam Exp $ ---- Makefile.orig Sat Apr 13 12:07:11 2002 -+++ Makefile Sat Apr 13 12:07:47 2002 -@@ -1,10 +1,10 @@ +--- Makefile.orig Tue Apr 16 11:35:31 2002 ++++ Makefile Thu Jun 13 00:28:19 2002 +@@ -1,10 +1,11 @@ all: id3v2 id3v2: Makefile convert.cpp list.cpp id3v2.cpp convert.cpp @@ -12,6 +12,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/04/19 14:35:29 zuntum Exp $ install: all - cp id3v2 /usr/local/bin/ + cp id3v2 ${LOCALBASE}/bin ++ cp id3v2.1 ${LOCALBASE}/man/man1 clean: rm -f id3v2 core diff --git a/audio/kdemultimedia2/Makefile b/audio/kdemultimedia2/Makefile index 978ec648c23..372346a0aeb 100644 --- a/audio/kdemultimedia2/Makefile +++ b/audio/kdemultimedia2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2002/03/13 17:36:37 fredb Exp $ +# $NetBSD: Makefile,v 1.10.2.1 2002/06/23 18:37:55 jlam Exp $ DISTNAME= kdemultimedia-2.2.2 PKGREVISION= 1 @@ -10,8 +10,8 @@ COMMENT= KDE audio tools BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb2:../../x11/qt2-designer-kde DEPENDS+= xanim>=2.80.0:../../graphics/xanim -BUILDLINK_DEPENDS.pth= pth>=1.4.0 USE_BUILDLINK_ONLY= YES +USE_PTHREAD= native pth CONFIGURE_ENV+= ac_cv_path_kde_artsplug_compiles="${ARTSCCONFIG}" @@ -21,7 +21,7 @@ CONFIGURE_ENV+= ac_cv_path_kde_artsplug_compiles="${ARTSCCONFIG}" LIBS= -Wl,--export-dynamic .endif -.include "../../devel/pth/buildlink.mk" +.include "../../mk/pthread.buildlink.mk" .include "../../x11/kde2/buildlink.mk" .include "../../x11/kdebase2/buildlink.mk" .include "../../mk/x11.buildlink.mk" diff --git a/audio/kdemultimedia3/DESCR b/audio/kdemultimedia3/DESCR new file mode 100644 index 00000000000..4e93cb4097a --- /dev/null +++ b/audio/kdemultimedia3/DESCR @@ -0,0 +1,2 @@ +The kdemultimedia module of KDE provides various sound and movie +format players. diff --git a/audio/kdemultimedia3/Makefile b/audio/kdemultimedia3/Makefile new file mode 100644 index 00000000000..dd8da531d17 --- /dev/null +++ b/audio/kdemultimedia3/Makefile @@ -0,0 +1,32 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:37:56 jlam Exp $ + +DISTNAME= kdemultimedia-3.0.1 +CATEGORIES= audio +COMMENT= Audio tools for the KDE integrated X11 desktop + +.include "../../x11/kde3/Makefile.kde3" + +DEPENDS+= xanim>=2.80.0:../../graphics/xanim + +USE_BUILDLINK_ONLY= YES + +#USE_CONFIG_WRAPPER= yes # $GTK_CONFIG +#CONFIGURE_ENV+= ac_cv_path_kde_artsplug_compiles="${ARTSC_CONFIG}" + +USE_PTHREAD= native pth-syscall +.include "../../mk/bsd.prefs.mk" + +.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "none" +CONFIGURE_ARGS+= --disable-threading +.endif + +.if ${OPSYS} == "NetBSD" +LIBS= -Wl,--export-dynamic +.endif + +.include "../../mk/pthread.buildlink.mk" +.include "../../audio/arts/buildlink.mk" +.include "../../x11/kde3/buildlink.mk" +.include "../../x11/kdebase3/buildlink.mk" +.include "../../mk/x11.buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/audio/kdemultimedia3/PLIST b/audio/kdemultimedia3/PLIST new file mode 100644 index 00000000000..702678e22a1 --- /dev/null +++ b/audio/kdemultimedia3/PLIST @@ -0,0 +1,1155 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.2.2 2002/06/23 18:37:57 jlam Exp $ +bin/aktion +bin/artsbuilder +bin/artscontrol +bin/kaboodle +bin/kmid +bin/kmidi +bin/kmix +bin/kmixctrl +bin/kscd +bin/midisend +bin/mpeglibartsplay +bin/noatun +bin/sf2cfg +bin/timidity +bin/workman2cddb.pl +bin/yaf-cdda +bin/yaf-mpgplay +bin/yaf-splay +bin/yaf-tplay +bin/yaf-vorbis +bin/yaf-yuv +include/arts/artsbuilder.h +include/arts/artsbuilder.idl +include/arts/artsgui.h +include/arts/artsgui.idl +include/arts/artsmidi.h +include/arts/artsmidi.idl +include/arts/artsmodules.h +include/arts/artsmodules.idl +include/arts/kartswidget.h +include/cmodule.h +include/effectview.h +include/equalizerview.h +include/ksaver.h +include/mimetypetree.h +include/mpeglib/decoder/cddaPlugin.h +include/mpeglib/decoder/command.h +include/mpeglib/decoder/commandPipe.h +include/mpeglib/decoder/decoderPlugin.h +include/mpeglib/decoder/mpegPlugin.h +include/mpeglib/decoder/mpgPlugin.h +include/mpeglib/decoder/nukePlugin.h +include/mpeglib/decoder/splayPlugin.h +include/mpeglib/decoder/tplayPlugin.h +include/mpeglib/decoder/vorbisPlugin.h +include/mpeglib/decoder/yuvPlugin.h +include/mpeglib/frame/IOFrameQueue.h +include/mpeglib/frame/audioFrame.h +include/mpeglib/frame/audioFrameQueue.h +include/mpeglib/frame/floatFrame.h +include/mpeglib/frame/frame.h +include/mpeglib/frame/frameQueue.h +include/mpeglib/frame/framer.h +include/mpeglib/frame/pcmFrame.h +include/mpeglib/frame/rawDataBuffer.h +include/mpeglib/frame/rawFrame.h +include/mpeglib/input/bufferInputStream.h +include/mpeglib/input/cddaInputStream.h +include/mpeglib/input/cdromInputStream.h +include/mpeglib/input/fileInputStream.h +include/mpeglib/input/httpInputStream.h +include/mpeglib/input/inputDetector.h +include/mpeglib/input/inputPlugin.h +include/mpeglib/input/inputStream.h +include/mpeglib/input/threadSafeInputStream.h +include/mpeglib/mpegutil/mpegStreamPlayer.h +include/mpeglib/mpegutil/mpegSystemHeader.h +include/mpeglib/mpegutil/mpegSystemStream.h +include/mpeglib/mpegutil/mpegVideoLength.h +include/mpeglib/mpegutil/pesSystemStream.h +include/mpeglib/mpegutil/psSystemStream.h +include/mpeglib/mpegutil/tsSystemStream.h +include/mpeglib/oggvorbis/oggFrame.h +include/mpeglib/oggvorbis/ovFramer.h +include/mpeglib/oggvorbis/vorbisDecoder.h +include/mpeglib/oggvorbis/vorbisInfo.h +include/mpeglib/output/artsOutputStream.h +include/mpeglib/output/audioTime.h +include/mpeglib/output/avSyncer.h +include/mpeglib/output/dspX11OutputStream.h +include/mpeglib/output/outPlugin.h +include/mpeglib/output/outputStream.h +include/mpeglib/output/pluginInfo.h +include/mpeglib/output/threadSafeOutputStream.h +include/mpeglib/splay/mpegAudioFrame.h +include/mpeglib/splay/mpegAudioInfo.h +include/mpeglib/splay/splayDecoder.h +include/mpeglib/util/abstract/abs_thread.h +include/mpeglib/util/abstract/threadQueue.h +include/mpeglib/util/dynBuffer.h +include/mpeglib/util/file/fileAccess.h +include/mpeglib/util/render/pictureArray.h +include/mpeglib/util/render/yuvPicture.h +include/mpeglib/util/syncClock.h +include/mpeglib/util/timeStamp.h +include/mpeglib/util/timeStampArray.h +include/mpeglib/util/timeWrapper.h +include/mpeglib/util/yaf/yafcore/buffer.h +include/mpeglib/util/yaf/yafcore/inputDecoder.h +include/mpeglib/util/yaf/yafcore/inputInterface.h +include/mpeglib/util/yaf/yafcore/outputInterface.h +include/mpeglib/util/yaf/yafcore/yaf_control.h +include/mpeglib/util/yaf/yafxplayer/inputDecoderXPlayer.h +include/mpeglib/util/yaf/yafxplayer/inputDecoderYAF.h +include/mpeglib/util/yaf/yafxplayer/yafOutputStream.h +include/mpeglib_artsplug/decoderBaseObject.h +include/mpeglib_artsplug/decoderBaseObject.idl +include/mpeglib_artsplug/decoderBaseObject_impl.h +include/mpeglib_artsplug/splayPlayObject.h +include/mpeglib_artsplug/splayPlayObject.idl +include/mpeglib_artsplug/splayPlayObject_impl.h +include/noatun/app.h +include/noatun/controls.h +include/noatun/conversion.h +include/noatun/downloader.h +include/noatun/effects.h +include/noatun/engine.h +include/noatun/equalizer.h +include/noatun/noatunarts.h +include/noatun/player.h +include/noatun/playlist.h +include/noatun/playlistsaver.h +include/noatun/plugin.h +include/noatun/pluginloader.h +include/noatun/pref.h +include/noatun/scrollinglabel.h +include/noatun/stdaction.h +include/noatun/stereobuttonaction.h +include/noatun/tags.h +include/noatun/winskinvis.h +include/plugin_deps.h +lib/kaboodle.a +lib/kaboodle.la +lib/kaboodle.so +lib/kde3/kcm_kmix.a +lib/kde3/kcm_kmix.la +lib/kde3/kcm_kmix.so +lib/kde3/kfile_m3u.a +lib/kde3/kfile_m3u.la +lib/kde3/kfile_m3u.so +lib/kde3/kfile_mp3.a +lib/kde3/kfile_mp3.la +lib/kde3/kfile_mp3.so +lib/kde3/kfile_wav.a +lib/kde3/kfile_wav.la +lib/kde3/kfile_wav.so +lib/kde3/kmix_panelapplet.a +lib/kde3/kmix_panelapplet.la +lib/kde3/kmix_panelapplet.so +lib/kde3/kmix_panelapplet.so.1 +lib/kde3/kmix_panelapplet.so.1.0 +lib/kde3/noatun.a +lib/kde3/noatun.la +lib/kde3/noatun.so +lib/kde3/noatun_dcopiface.a +lib/kde3/noatun_dcopiface.la +lib/kde3/noatun_dcopiface.so +lib/kde3/noatun_excellent.a +lib/kde3/noatun_excellent.la +lib/kde3/noatun_excellent.so +lib/kde3/noatun_htmlexport.a +lib/kde3/noatun_htmlexport.la +lib/kde3/noatun_htmlexport.so +lib/kde3/noatun_infrared.a +lib/kde3/noatun_infrared.la +lib/kde3/noatun_infrared.so +lib/kde3/noatun_kaiman.a +lib/kde3/noatun_kaiman.la +lib/kde3/noatun_kaiman.so +lib/kde3/noatun_keyz.a +lib/kde3/noatun_keyz.la +lib/kde3/noatun_keyz.so +lib/kde3/noatun_kjofol.a +lib/kde3/noatun_kjofol.la +lib/kde3/noatun_kjofol.so +lib/kde3/noatun_marquis.a +lib/kde3/noatun_marquis.la +lib/kde3/noatun_marquis.so +lib/kde3/noatun_metatag.a +lib/kde3/noatun_metatag.la +lib/kde3/noatun_metatag.so +lib/kde3/noatun_monoscope.a +lib/kde3/noatun_monoscope.la +lib/kde3/noatun_monoscope.so +lib/kde3/noatun_net.a +lib/kde3/noatun_net.la +lib/kde3/noatun_net.so +lib/kde3/noatun_splitplaylist.a +lib/kde3/noatun_splitplaylist.la +lib/kde3/noatun_splitplaylist.so +lib/kde3/noatun_systray.a +lib/kde3/noatun_systray.la +lib/kde3/noatun_systray.so +lib/kde3/noatun_ui.a +lib/kde3/noatun_ui.la +lib/kde3/noatun_ui.so +lib/kde3/noatun_voiceprint.a +lib/kde3/noatun_voiceprint.la +lib/kde3/noatun_voiceprint.so +lib/kde3/noatun_winskin.a +lib/kde3/noatun_winskin.la +lib/kde3/noatun_winskin.so +lib/kmix.a +lib/kmix.la +lib/kmix.so +lib/kmixctrl.a +lib/kmixctrl.la +lib/kmixctrl.so +lib/libaktion.a +lib/libaktion.la +lib/libaktion.so +lib/libaktion.so.1 +lib/libaktion.so.1.0 +lib/libarts_mpeglib-0.3.0.so +lib/libarts_mpeglib-0.3.0.so.0 +lib/libarts_mpeglib-0.3.0.so.0.3 +lib/libarts_mpeglib.a +lib/libarts_mpeglib.la +lib/libarts_mpeglib.so +lib/libarts_splay.a +lib/libarts_splay.la +lib/libarts_splay.so +lib/libarts_splay.so.0 +lib/libarts_splay.so.0.0 +lib/libartsbuilder.a +lib/libartsbuilder.la +lib/libartsbuilder.so +lib/libartsbuilder.so.0 +lib/libartsbuilder.so.0.0 +lib/libartseffects.a +lib/libartseffects.la +lib/libartseffects.so +lib/libartsgui.a +lib/libartsgui.la +lib/libartsgui.so +lib/libartsgui.so.0 +lib/libartsgui.so.0.0 +lib/libartsgui_idl.a +lib/libartsgui_idl.la +lib/libartsgui_idl.so +lib/libartsgui_idl.so.0 +lib/libartsgui_idl.so.0.0 +lib/libartsgui_kde.a +lib/libartsgui_kde.la +lib/libartsgui_kde.so +lib/libartsgui_kde.so.0 +lib/libartsgui_kde.so.0.0 +lib/libartsmidi.a +lib/libartsmidi.la +lib/libartsmidi.so +lib/libartsmidi.so.0 +lib/libartsmidi.so.0.0 +lib/libartsmidi_idl.a +lib/libartsmidi_idl.la +lib/libartsmidi_idl.so +lib/libartsmidi_idl.so.0 +lib/libartsmidi_idl.so.0.0 +lib/libartsmodules.a +lib/libartsmodules.la +lib/libartsmodules.so +lib/libartsmodules.so.0 +lib/libartsmodules.so.0.0 +lib/libaudiofilearts.a +lib/libaudiofilearts.la +lib/libaudiofilearts.so +lib/libdummy.a +lib/libdummy.la +lib/libdummy.so +lib/libdummy.so.0 +lib/libdummy.so.0.0 +lib/libkaboodle_main.a +lib/libkaboodle_main.la +lib/libkaboodle_main.so +lib/libkaboodle_main.so.0 +lib/libkaboodle_main.so.0.0 +lib/libkaboodlepart.a +lib/libkaboodlepart.la +lib/libkaboodlepart.so +lib/libkmidpart.a +lib/libkmidpart.la +lib/libkmidpart.so +lib/libkmidpart.so.1 +lib/libkmidpart.so.1.0 +lib/libkmix_main.a +lib/libkmix_main.la +lib/libkmix_main.so +lib/libkmix_main.so.0 +lib/libkmix_main.so.0.0 +lib/libkmixctrl_main.a +lib/libkmixctrl_main.la +lib/libkmixctrl_main.so +lib/libkmixctrl_main.so.0 +lib/libkmixctrl_main.so.0.0 +lib/libmpeg-0.3.0.so +lib/libmpeg.a +lib/libmpeg.la +lib/libmpeg.so +lib/libnoatun.a +lib/libnoatun.la +lib/libnoatun.so +lib/libnoatun.so.0 +lib/libnoatun.so.0.0 +lib/libnoatun_main.a +lib/libnoatun_main.la +lib/libnoatun_main.so +lib/libnoatun_main.so.0 +lib/libnoatun_main.so.0.0 +lib/libnoatunarts.a +lib/libnoatunarts.la +lib/libnoatunarts.so +lib/libnoatuncontrols.a +lib/libnoatuncontrols.la +lib/libnoatuncontrols.so +lib/libnoatuncontrols.so.0 +lib/libnoatuncontrols.so.0.0 +lib/libnoatuntags.a +lib/libnoatuntags.la +lib/libnoatuntags.so +lib/libnoatuntags.so.0 +lib/libnoatuntags.so.0.0 +lib/libwinskinvis.a +lib/libwinskinvis.la +lib/libwinskinvis.so +lib/libworkman.a +lib/libworkman.la +lib/libworkman.so +lib/libworkman.so.5 +lib/libworkman.so.5.3 +lib/libyafcore.a +lib/libyafcore.la +lib/libyafcore.so +lib/libyafcore.so.0 +lib/libyafcore.so.0.0 +lib/libyafxplayer.a +lib/libyafxplayer.la +lib/libyafxplayer.so +lib/libyafxplayer.so.0 +lib/libyafxplayer.so.0.0 +lib/mcop/Arts/ArtsBuilderLoader.mcopclass +lib/mcop/Arts/Button.mcopclass +lib/mcop/Arts/Effect_WAVECAPTURE.mcopclass +lib/mcop/Arts/Environment/Container.mcopclass +lib/mcop/Arts/Environment/InstrumentItem.mcopclass +lib/mcop/Arts/Environment/InstrumentItemGuiFactory.mcopclass +lib/mcop/Arts/Environment/MixerItem.mcopclass +lib/mcop/Arts/Fader.mcopclass +lib/mcop/Arts/FreeverbGuiFactory.mcopclass +lib/mcop/Arts/GenericGuiFactory.mcopclass +lib/mcop/Arts/GraphLine.mcopclass +lib/mcop/Arts/HBox.mcopclass +lib/mcop/Arts/LineEdit.mcopclass +lib/mcop/Arts/LocalFactory.mcopclass +lib/mcop/Arts/MidiManager.mcopclass +lib/mcop/Arts/MixerGuiFactory.mcopclass +lib/mcop/Arts/MonoSimpleMixerChannel.mcopclass +lib/mcop/Arts/MonoSimpleMixerChannelGuiFactory.mcopclass +lib/mcop/Arts/Poti.mcopclass +lib/mcop/Arts/SimpleMixerChannel.mcopclass +lib/mcop/Arts/SimpleMixerChannelGuiFactory.mcopclass +lib/mcop/Arts/SpinBox.mcopclass +lib/mcop/Arts/StereoFirEqualizerGuiFactory.mcopclass +lib/mcop/Arts/StructureBuilder.mcopclass +lib/mcop/Arts/StructureDesc.mcopclass +lib/mcop/Arts/Synth_ATAN_SATURATE.mcopclass +lib/mcop/Arts/Synth_AUTOPANNER.mcopclass +lib/mcop/Arts/Synth_BRICKWALL_LIMITER.mcopclass +lib/mcop/Arts/Synth_CAPTURE_WAV.mcopclass +lib/mcop/Arts/Synth_CDELAY.mcopclass +lib/mcop/Arts/Synth_COMPRESSOR.mcopclass +lib/mcop/Arts/Synth_DATA.mcopclass +lib/mcop/Arts/Synth_DEBUG.mcopclass +lib/mcop/Arts/Synth_DELAY.mcopclass +lib/mcop/Arts/Synth_ENVELOPE_ADSR.mcopclass +lib/mcop/Arts/Synth_FM_SOURCE.mcopclass +lib/mcop/Arts/Synth_FREEVERB.mcopclass +lib/mcop/Arts/Synth_FX_CFLANGER.mcopclass +lib/mcop/Arts/Synth_MIDI_DEBUG.mcopclass +lib/mcop/Arts/Synth_MIDI_TEST.mcopclass +lib/mcop/Arts/Synth_MOOG_VCF.mcopclass +lib/mcop/Arts/Synth_NIL.mcopclass +lib/mcop/Arts/Synth_NOISE.mcopclass +lib/mcop/Arts/Synth_PITCH_SHIFT.mcopclass +lib/mcop/Arts/Synth_PLAY_PAT.mcopclass +lib/mcop/Arts/Synth_PSCALE.mcopclass +lib/mcop/Arts/Synth_RC.mcopclass +lib/mcop/Arts/Synth_SEQUENCE.mcopclass +lib/mcop/Arts/Synth_SHELVE_CUTOFF.mcopclass +lib/mcop/Arts/Synth_STD_EQUALIZER.mcopclass +lib/mcop/Arts/Synth_STEREO_FIR_EQUALIZER.mcopclass +lib/mcop/Arts/Synth_STEREO_PITCH_SHIFT.mcopclass +lib/mcop/Arts/Synth_TREMOLO.mcopclass +lib/mcop/Arts/Synth_WAVE_PULSE.mcopclass +lib/mcop/Arts/Synth_WAVE_SOFTSAW.mcopclass +lib/mcop/Arts/Synth_WAVE_SQUARE.mcopclass +lib/mcop/Arts/Synth_WAVE_TRI.mcopclass +lib/mcop/Arts/Synth_XFADE.mcopclass +lib/mcop/Arts/VBox.mcopclass +lib/mcop/Arts/Widget.mcopclass +lib/mcop/Arts/audiofilePlayObject.mcopclass +lib/mcop/CDDAPlayObject.mcopclass +lib/mcop/ExtraStereo.mcopclass +lib/mcop/ExtraStereoGuiFactory.mcopclass +lib/mcop/MP3PlayObject.mcopclass +lib/mcop/MPGPlayObject.mcopclass +lib/mcop/NULLPlayObject.mcopclass +lib/mcop/Noatun/Equalizer.mcopclass +lib/mcop/Noatun/EqualizerSSE.mcopclass +lib/mcop/Noatun/FFTScope.mcopclass +lib/mcop/Noatun/FFTScopeStereo.mcopclass +lib/mcop/Noatun/Listener.mcopclass +lib/mcop/Noatun/RawScope.mcopclass +lib/mcop/Noatun/RawScopeStereo.mcopclass +lib/mcop/Noatun/Session.mcopclass +lib/mcop/Noatun/StereoEffectStack.mcopclass +lib/mcop/Noatun/StereoVolumeControl.mcopclass +lib/mcop/Noatun/StereoVolumeControlSSE.mcopclass +lib/mcop/Noatun/WinSkinFFT.mcopclass +lib/mcop/OGGPlayObject.mcopclass +lib/mcop/RawWriter.mcopclass +lib/mcop/SplayPlayObject.mcopclass +lib/mcop/VCDPlayObject.mcopclass +lib/mcop/VoiceRemoval.mcopclass +lib/mcop/WAVPlayObject.mcopclass +lib/mcop/artsbuilder.mcopclass +lib/mcop/artsbuilder.mcoptype +lib/mcop/artseffects.mcopclass +lib/mcop/artseffects.mcoptype +lib/mcop/artsgui.mcopclass +lib/mcop/artsgui.mcoptype +lib/mcop/artsmidi.mcopclass +lib/mcop/artsmidi.mcoptype +lib/mcop/artsmodules.mcopclass +lib/mcop/artsmodules.mcoptype +lib/mcop/audiofilearts.mcopclass +lib/mcop/audiofilearts.mcoptype +lib/mcop/noatunarts.mcopclass +lib/mcop/noatunarts.mcoptype +lib/mcop/winskinvis.mcopclass +lib/mcop/winskinvis.mcoptype +share/doc/kde/HTML/en/aktion/aktion.png +share/doc/kde/HTML/en/aktion/aktiontoolbar.png +share/doc/kde/HTML/en/aktion/common +share/doc/kde/HTML/en/aktion/index.cache.bz2 +share/doc/kde/HTML/en/aktion/index.docbook +share/doc/kde/HTML/en/artsbuilder/apis.docbook +share/doc/kde/HTML/en/artsbuilder/arts-structure.png +share/doc/kde/HTML/en/artsbuilder/artsbuilder.docbook +share/doc/kde/HTML/en/artsbuilder/common +share/doc/kde/HTML/en/artsbuilder/detail.docbook +share/doc/kde/HTML/en/artsbuilder/digitalaudio.docbook +share/doc/kde/HTML/en/artsbuilder/faq.docbook +share/doc/kde/HTML/en/artsbuilder/future.docbook +share/doc/kde/HTML/en/artsbuilder/glossary.docbook +share/doc/kde/HTML/en/artsbuilder/gui.docbook +share/doc/kde/HTML/en/artsbuilder/helping.docbook +share/doc/kde/HTML/en/artsbuilder/images/Doc_MODUL.png +share/doc/kde/HTML/en/artsbuilder/images/Gui_AUDIO_MANAGER.png +share/doc/kde/HTML/en/artsbuilder/images/Gui_INSTRUMENT_MAPPER.png +share/doc/kde/HTML/en/artsbuilder/images/Gui_LABEL.png +share/doc/kde/HTML/en/artsbuilder/images/Gui_MIXER.png +share/doc/kde/HTML/en/artsbuilder/images/Gui_PANEL.png +share/doc/kde/HTML/en/artsbuilder/images/Gui_POTI.png +share/doc/kde/HTML/en/artsbuilder/images/Gui_SLIDER.png +share/doc/kde/HTML/en/artsbuilder/images/Gui_SUBPANEL.png +share/doc/kde/HTML/en/artsbuilder/images/Gui_WINDOW.png +share/doc/kde/HTML/en/artsbuilder/images/Interface_MIDI_NOTE.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_ADD.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_ATAN_SATURATE.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_BUS_DOWNLINK.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_BUS_UPLINK.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_CDELAY.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_COMPRESSOR.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_DEBUG.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_DELAY.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_ENVELOPE_ADSR.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_FILEPLAY.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_FM_SOURCE.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_FREQUENCY.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_MIDI_DEBUG.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_MIDI_ROUTER.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_MUL.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_NIL.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_PLAY.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_PLAY_AKAI.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_PLAY_AKAIS.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_PLAY_WAV.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_PSCALE.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_RC.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_SEQUENCE.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_SHELVE_CUTOFF.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_STD_EQUALIZER.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_STRUCT_KILL.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_WAVE_SIN.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_WAVE_SQUARE.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_WAVE_TRI.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_XFADE.png +share/doc/kde/HTML/en/artsbuilder/images/schema1.png +share/doc/kde/HTML/en/artsbuilder/images/schema2.png +share/doc/kde/HTML/en/artsbuilder/images/schema3.png +share/doc/kde/HTML/en/artsbuilder/images/schema4.png +share/doc/kde/HTML/en/artsbuilder/index.cache.bz2 +share/doc/kde/HTML/en/artsbuilder/index.docbook +share/doc/kde/HTML/en/artsbuilder/mcop.docbook +share/doc/kde/HTML/en/artsbuilder/midi.docbook +share/doc/kde/HTML/en/artsbuilder/midiintro.docbook +share/doc/kde/HTML/en/artsbuilder/modules.docbook +share/doc/kde/HTML/en/artsbuilder/porting.docbook +share/doc/kde/HTML/en/artsbuilder/references.docbook +share/doc/kde/HTML/en/artsbuilder/tools.docbook +share/doc/kde/HTML/en/kmid/common +share/doc/kde/HTML/en/kmid/index.cache.bz2 +share/doc/kde/HTML/en/kmid/index.docbook +share/doc/kde/HTML/en/kmidi/FAQ +share/doc/kde/HTML/en/kmidi/common +share/doc/kde/HTML/en/kmidi/index.cache.bz2 +share/doc/kde/HTML/en/kmidi/index.docbook +share/doc/kde/HTML/en/kmix/common +share/doc/kde/HTML/en/kmix/index.cache.bz2 +share/doc/kde/HTML/en/kmix/index.docbook +share/doc/kde/HTML/en/kscd/common +share/doc/kde/HTML/en/kscd/index.cache.bz2 +share/doc/kde/HTML/en/kscd/index.docbook +share/doc/kde/HTML/en/kscd/kscd.png +share/doc/kde/HTML/en/kscd/kscd11.png +share/doc/kde/HTML/en/kscd/kscd12.png +share/doc/kde/HTML/en/kscd/kscd13.png +share/doc/kde/HTML/en/kscd/kscd14.png +share/doc/kde/HTML/en/kscd/kscd15.png +share/doc/kde/HTML/en/kscd/kscd16.png +share/doc/kde/HTML/en/kscd/kscd18.png +share/doc/kde/HTML/en/kscd/kscd19.png +share/doc/kde/HTML/en/kscd/kscd2.png +share/doc/kde/HTML/en/kscd/kscd2a.png +share/doc/kde/HTML/en/kscd/kscd3.png +share/doc/kde/HTML/en/kscd/kscd4.png +share/doc/kde/HTML/en/kscd/kscd5.png +share/doc/kde/HTML/en/kscd/kscd6.png +share/doc/kde/HTML/en/kscd/kscd7.png +share/doc/kde/HTML/en/kscd/kscd8.png +share/doc/kde/HTML/en/kscd/kscd9.png +share/doc/kde/HTML/en/noatun/common +share/doc/kde/HTML/en/noatun/index.cache.bz2 +share/doc/kde/HTML/en/noatun/index.docbook +share/kde/applnk/Multimedia/aktion.desktop +share/kde/applnk/Multimedia/artsbuilder.desktop +share/kde/applnk/Multimedia/artscontrol.desktop +share/kde/applnk/Multimedia/kaboodle.desktop +share/kde/applnk/Multimedia/kmid.desktop +share/kde/applnk/Multimedia/kmidi.desktop +share/kde/applnk/Multimedia/kmix.desktop +share/kde/applnk/Multimedia/kscd.desktop +share/kde/applnk/Multimedia/noatun.desktop +share/kde/applnk/Multimedia/timidity.desktop +share/kde/applnk/Settings/Sound/kmixcfg.desktop +share/kde/apps/aktion/aktion_part.rc +share/kde/apps/aktion/toolbar/ak_maximize.png +share/kde/apps/aktion/toolbar/ak_setup.png +share/kde/apps/aktion/toolbar/aktion_logo.png +share/kde/apps/aktion/toolbar/avanzar.png +share/kde/apps/aktion/toolbar/ayuda.png +share/kde/apps/aktion/toolbar/double.png +share/kde/apps/aktion/toolbar/fullscreen.png +share/kde/apps/aktion/toolbar/half.png +share/kde/apps/aktion/toolbar/original.png +share/kde/apps/aktion/toolbar/parar.png +share/kde/apps/aktion/toolbar/pause.png +share/kde/apps/aktion/toolbar/retroceder.png +share/kde/apps/aktion/toolbar/tocar.png +share/kde/apps/artsbuilder/artsbuilderui.rc +share/kde/apps/artsbuilder/examples/README +share/kde/apps/artsbuilder/examples/example_adsr.arts +share/kde/apps/artsbuilder/examples/example_atan_saturate.arts +share/kde/apps/artsbuilder/examples/example_autopanner.arts +share/kde/apps/artsbuilder/examples/example_brickwall.arts +share/kde/apps/artsbuilder/examples/example_bus.arts +share/kde/apps/artsbuilder/examples/example_capture_wav.arts +share/kde/apps/artsbuilder/examples/example_cdelay.arts +share/kde/apps/artsbuilder/examples/example_cflanger.arts +share/kde/apps/artsbuilder/examples/example_data.arts +share/kde/apps/artsbuilder/examples/example_delay.arts +share/kde/apps/artsbuilder/examples/example_dtmf1.arts +share/kde/apps/artsbuilder/examples/example_equalizer.arts +share/kde/apps/artsbuilder/examples/example_fm.arts +share/kde/apps/artsbuilder/examples/example_freeverb.arts +share/kde/apps/artsbuilder/examples/example_moog.arts +share/kde/apps/artsbuilder/examples/example_multi_add.arts +share/kde/apps/artsbuilder/examples/example_noise.arts +share/kde/apps/artsbuilder/examples/example_pitchshift.arts +share/kde/apps/artsbuilder/examples/example_play_wave.arts +share/kde/apps/artsbuilder/examples/example_pscale.arts +share/kde/apps/artsbuilder/examples/example_pulse.arts +share/kde/apps/artsbuilder/examples/example_rc.arts +share/kde/apps/artsbuilder/examples/example_record.arts +share/kde/apps/artsbuilder/examples/example_sequence.arts +share/kde/apps/artsbuilder/examples/example_shelve_cutoff.arts +share/kde/apps/artsbuilder/examples/example_sine.arts +share/kde/apps/artsbuilder/examples/example_softsaw.arts +share/kde/apps/artsbuilder/examples/example_square.arts +share/kde/apps/artsbuilder/examples/example_stereobeep.arts +share/kde/apps/artsbuilder/examples/example_tremolo.arts +share/kde/apps/artsbuilder/examples/example_tri.arts +share/kde/apps/artsbuilder/examples/example_xfade.arts +share/kde/apps/artsbuilder/examples/instrument_arts_all.arts-map +share/kde/apps/artsbuilder/examples/instrument_chirpdrum.arts +share/kde/apps/artsbuilder/examples/instrument_deepdrum.arts +share/kde/apps/artsbuilder/examples/instrument_full_square.arts +share/kde/apps/artsbuilder/examples/instrument_hihat.arts +share/kde/apps/artsbuilder/examples/instrument_neworgan.arts +share/kde/apps/artsbuilder/examples/instrument_nokind.arts +share/kde/apps/artsbuilder/examples/instrument_organ2.arts +share/kde/apps/artsbuilder/examples/instrument_simple_sin.arts +share/kde/apps/artsbuilder/examples/instrument_simple_square.arts +share/kde/apps/artsbuilder/examples/instrument_simple_tri.arts +share/kde/apps/artsbuilder/examples/instrument_slide.arts +share/kde/apps/artsbuilder/examples/instrument_slide1.arts +share/kde/apps/artsbuilder/examples/instrument_square.arts +share/kde/apps/artsbuilder/examples/instrument_tri.arts +share/kde/apps/artsbuilder/examples/template_Empty_Structure.arts +share/kde/apps/artsbuilder/examples/template_Instrument.arts +share/kde/apps/artsbuilder/examples/todo/effect_delay.arts +share/kde/apps/artsbuilder/examples/todo/effect_delay_alone.arts +share/kde/apps/artsbuilder/examples/todo/effect_flanger_alone.arts +share/kde/apps/artsbuilder/examples/todo/instrument_flexible_slide.arts +share/kde/apps/artsbuilder/examples/todo/instrument_flexible_slide_GUI.arts +share/kde/apps/artsbuilder/examples/todo/instrument_fm_horn.arts +share/kde/apps/artsbuilder/examples/todo/instrument_moog_vcf_tune.arts +share/kde/apps/artsbuilder/examples/todo/instrument_moog_vcf_tune_GUI.arts +share/kde/apps/artsbuilder/examples/todo/mixer_element_eq.arts +share/kde/apps/artsbuilder/examples/todo/mixer_element_eqfx.arts +share/kde/apps/artsbuilder/examples/todo/mixer_element_simple.arts +share/kde/apps/artsbuilder/examples/todo/template_Instrument_GUI.arts +share/kde/apps/artsbuilder/examples/todo/template_Mixer_Element.arts +share/kde/apps/artsbuilder/pics/Synth_ADD.xpm +share/kde/apps/artsbuilder/pics/Synth_AMAN_PLAY.xpm +share/kde/apps/artsbuilder/pics/Synth_ATAN_SATURATE.xpm +share/kde/apps/artsbuilder/pics/Synth_BUS_DOWNLINK.xpm +share/kde/apps/artsbuilder/pics/Synth_BUS_UPLINK.xpm +share/kde/apps/artsbuilder/pics/Synth_DEBUG.xpm +share/kde/apps/artsbuilder/pics/Synth_ENVELOPE_ADSR.xpm +share/kde/apps/artsbuilder/pics/Synth_FILEPLAY.xpm +share/kde/apps/artsbuilder/pics/Synth_MIDI_DEBUG.xpm +share/kde/apps/artsbuilder/pics/Synth_MOOG_VCF.xpm +share/kde/apps/artsbuilder/pics/Synth_MUL.xpm +share/kde/apps/artsbuilder/pics/Synth_MULTI_ADD.xpm +share/kde/apps/artsbuilder/pics/Synth_PLAY.xpm +share/kde/apps/artsbuilder/pics/Synth_PLAY_WAV.xpm +share/kde/apps/artsbuilder/pics/Synth_PSCALE.xpm +share/kde/apps/artsbuilder/pics/Synth_RC.xpm +share/kde/apps/artsbuilder/pics/Synth_SEQUENCE.xpm +share/kde/apps/artsbuilder/pics/Synth_SHELVE_CUTOFF.xpm +share/kde/apps/artsbuilder/pics/Synth_WAVE_SAW.xpm +share/kde/apps/artsbuilder/pics/Synth_WAVE_SIN.xpm +share/kde/apps/artsbuilder/pics/Synth_WAVE_SQUARE.xpm +share/kde/apps/artsbuilder/pics/Synth_WAVE_TRI.xpm +share/kde/apps/artsbuilder/pics/Synth_XFADE.xpm +share/kde/apps/artscontrol/artscontrol.rc +share/kde/apps/artscontrol/artsmidimanagerview.rc +share/kde/apps/kaboodle/icons/hicolor/16x16/actions/kaboodleloop.png +share/kde/apps/kaboodle/icons/hicolor/22x22/actions/kaboodleloop.png +share/kde/apps/kaboodle/kaboodlepartui.rc +share/kde/apps/kaboodle/kaboodleui.rc +share/kde/apps/kconf_update/noatun.upd +share/kde/apps/kconf_update/noatun20update +share/kde/apps/kicker/applets/kmixapplet.desktop +share/kde/apps/kmid/DiesIrae.kar +share/kde/apps/kmid/Guantanamera.kar +share/kde/apps/kmid/MariaDeLasMercedes.kar +share/kde/apps/kmid/OFortuna.kar +share/kde/apps/kmid/fm/drums.o3 +share/kde/apps/kmid/fm/drums.sb +share/kde/apps/kmid/fm/std.o3 +share/kde/apps/kmid/fm/std.sb +share/kde/apps/kmid/icons/button1.xpm +share/kde/apps/kmid/icons/button2.xpm +share/kde/apps/kmid/icons/hicolor/16x16/actions/piano.png +share/kde/apps/kmid/icons/hicolor/16x16/actions/volume.png +share/kde/apps/kmid/icons/hicolor/22x22/actions/piano.png +share/kde/apps/kmid/icons/hicolor/22x22/actions/volume.png +share/kde/apps/kmid/icons/hicolor/32x32/actions/piano.png +share/kde/apps/kmid/icons/hicolor/32x32/actions/volume.png +share/kde/apps/kmid/icons/keyboard.xpm +share/kde/apps/kmid/kmid_partui.rc +share/kde/apps/kmid/kmidui.rc +share/kde/apps/kmid/maps/YamahaPSR500.map +share/kde/apps/kmid/maps/YamahaPSS790.map +share/kde/apps/kmid/maps/YamahaQY10.map +share/kde/apps/kmid/maps/gm.map +share/kde/apps/kmidi/Axel_Elf.mid +share/kde/apps/kmidi/Cavatina.mid +share/kde/apps/kmidi/Georgia.mid +share/kde/apps/kmidi/Malaguena.mid +share/kde/apps/kmidi/Mission_Impossible.mid +share/kde/apps/kmidi/Mr_Postman.mid +share/kde/apps/kmidi/Take_The_A_Train-Seq_by_Dianne_Lewandowski.mid +share/kde/apps/kmidi/Vangelis-Chung_Kuo.mid +share/kde/apps/kmidi/config/BITMAPS/arrow.xbm +share/kde/apps/kmidi/config/BITMAPS/back.xbm +share/kde/apps/kmidi/config/BITMAPS/check.xbm +share/kde/apps/kmidi/config/BITMAPS/fwd.xbm +share/kde/apps/kmidi/config/BITMAPS/fwrd.xbm +share/kde/apps/kmidi/config/BITMAPS/next.xbm +share/kde/apps/kmidi/config/BITMAPS/off.xbm +share/kde/apps/kmidi/config/BITMAPS/on.xbm +share/kde/apps/kmidi/config/BITMAPS/pause.xbm +share/kde/apps/kmidi/config/BITMAPS/play.xbm +share/kde/apps/kmidi/config/BITMAPS/prev.xbm +share/kde/apps/kmidi/config/BITMAPS/quit.xbm +share/kde/apps/kmidi/config/BITMAPS/restart.xbm +share/kde/apps/kmidi/config/BITMAPS/stop.xbm +share/kde/apps/kmidi/config/BITMAPS/tback.xbm +share/kde/apps/kmidi/config/BITMAPS/timidity.xbm +share/kde/apps/kmidi/config/BITMAPS/tnext.xbm +share/kde/apps/kmidi/config/BITMAPS/tpause.xbm +share/kde/apps/kmidi/config/BITMAPS/tprev.xbm +share/kde/apps/kmidi/config/BITMAPS/tquit.xbm +share/kde/apps/kmidi/config/chaos12-voices +share/kde/apps/kmidi/config/chaos8-voices +share/kde/apps/kmidi/config/drums +share/kde/apps/kmidi/config/gravis.cfg +share/kde/apps/kmidi/config/gsdrum.cfg +share/kde/apps/kmidi/config/guitar +share/kde/apps/kmidi/config/megadrum +share/kde/apps/kmidi/config/megainst +share/kde/apps/kmidi/config/midia.cfg +share/kde/apps/kmidi/config/mt32.cfg +share/kde/apps/kmidi/config/patch/acbass.pat +share/kde/apps/kmidi/config/patch/cymride1.pat +share/kde/apps/kmidi/config/patch/hihatcl.pat +share/kde/apps/kmidi/config/patch/kick1.pat +share/kde/apps/kmidi/config/patch/kick2.pat +share/kde/apps/kmidi/config/patch/nylongt2.pat +share/kde/apps/kmidi/config/patch/sologrnd.pat +share/kde/apps/kmidi/config/piano +share/kde/apps/kmidi/config/piano+guitar +share/kde/apps/kmidi/config/pila-voices +share/kde/apps/kmidi/config/sound-canvas-drums +share/kde/apps/kmidi/config/timidity.cfg +share/kde/apps/kmidi/config/wowpats.cfg +share/kde/apps/kmidi/pics/kmidilogo.png +share/kde/apps/kmix/kmixui.rc +share/kde/apps/kmix/pics/kmixdocked.png +share/kde/apps/kmix/pics/mix_audio.png +share/kde/apps/kmix/pics/mix_bass.png +share/kde/apps/kmix/pics/mix_cd.png +share/kde/apps/kmix/pics/mix_ext.png +share/kde/apps/kmix/pics/mix_microphone.png +share/kde/apps/kmix/pics/mix_midi.png +share/kde/apps/kmix/pics/mix_recmon.png +share/kde/apps/kmix/pics/mix_surround.png +share/kde/apps/kmix/pics/mix_treble.png +share/kde/apps/kmix/pics/mix_unknown.png +share/kde/apps/kmix/pics/mix_video.png +share/kde/apps/kmix/pics/mix_volume.png +share/kde/apps/kscd/pics/cdsmall.xpm +share/kde/apps/kscd/pics/kscdlogo.xpm +share/kde/apps/noatun/dcopiface.plugin +share/kde/apps/noatun/eq.preset/preset.dance +share/kde/apps/noatun/eq.preset/preset.jazz +share/kde/apps/noatun/eq.preset/preset.metal +share/kde/apps/noatun/eq.preset/preset.trance +share/kde/apps/noatun/eq.preset/preset.zero +share/kde/apps/noatun/excellent.plugin +share/kde/apps/noatun/excellentui.rc +share/kde/apps/noatun/htmlexport.plugin +share/kde/apps/noatun/icons/hicolor/16x16/actions/effect.png +share/kde/apps/noatun/icons/hicolor/16x16/actions/noatunback.png +share/kde/apps/noatun/icons/hicolor/16x16/actions/noatunforward.png +share/kde/apps/noatun/icons/hicolor/16x16/actions/noatunpause.png +share/kde/apps/noatun/icons/hicolor/16x16/actions/noatunplay.png +share/kde/apps/noatun/icons/hicolor/16x16/actions/noatunplaylist.png +share/kde/apps/noatun/icons/hicolor/16x16/actions/noatunstop.png +share/kde/apps/noatun/icons/hicolor/16x16/actions/noatuntray.png +share/kde/apps/noatun/icons/hicolor/16x16/actions/noatuntraypause.png +share/kde/apps/noatun/icons/hicolor/16x16/actions/noatuntrayplay.png +share/kde/apps/noatun/icons/hicolor/16x16/actions/noatuntraystop.png +share/kde/apps/noatun/icons/hicolor/22x22/actions/noatunback.png +share/kde/apps/noatun/icons/hicolor/22x22/actions/noatunfback.png +share/kde/apps/noatun/icons/hicolor/22x22/actions/noatunfforward.png +share/kde/apps/noatun/icons/hicolor/22x22/actions/noatunforward.png +share/kde/apps/noatun/icons/hicolor/22x22/actions/noatunloopnone.png +share/kde/apps/noatun/icons/hicolor/22x22/actions/noatunloopplaylist.png +share/kde/apps/noatun/icons/hicolor/22x22/actions/noatunlooprandom.png +share/kde/apps/noatun/icons/hicolor/22x22/actions/noatunloopsong.png +share/kde/apps/noatun/icons/hicolor/22x22/actions/noatunpause.png +share/kde/apps/noatun/icons/hicolor/22x22/actions/noatunplay.png +share/kde/apps/noatun/icons/hicolor/22x22/actions/noatunplaylist.png +share/kde/apps/noatun/icons/hicolor/22x22/actions/noatunstop.png +share/kde/apps/noatun/icons/hicolor/22x22/actions/noatuntiny.png +share/kde/apps/noatun/icons/hicolor/32x32/actions/effect.png +share/kde/apps/noatun/icons/hicolor/48x48/actions/effect.png +share/kde/apps/noatun/infrared.plugin +share/kde/apps/noatun/kaiman.plugin +share/kde/apps/noatun/kaimanui.rc +share/kde/apps/noatun/keyz.plugin +share/kde/apps/noatun/kjofolui.plugin +share/kde/apps/noatun/kjskins/HexoBronx/HexoBronx.rc +share/kde/apps/noatun/kjskins/HexoBronx/Makefile.am +share/kde/apps/noatun/kjskins/HexoBronx/README.txt +share/kde/apps/noatun/kjskins/HexoBronx/active.png +share/kde/apps/noatun/kjskins/HexoBronx/eckig_font.png +share/kde/apps/noatun/kjskins/HexoBronx/font.png +share/kde/apps/noatun/kjskins/HexoBronx/inactive.png +share/kde/apps/noatun/kjskins/HexoBronx/mask.png +share/kde/apps/noatun/kjskins/HexoBronx/pitch.png +share/kde/apps/noatun/kjskins/HexoBronx/splash.png +share/kde/apps/noatun/kjskins/HexoBronx/time_font.png +share/kde/apps/noatun/kjskins/HexoBronx/volume.png +share/kde/apps/noatun/kjskins/HexoBronx/volume_pitch_font.png +share/kde/apps/noatun/kjskins/kjofol/Makefile.am +share/kde/apps/noatun/kjskins/kjofol/kjofol.dck +share/kde/apps/noatun/kjskins/kjofol/kjofol.pl +share/kde/apps/noatun/kjskins/kjofol/kjofol.rc +share/kde/apps/noatun/kjskins/kjofol/kjofol.wsh +share/kde/apps/noatun/kjskins/kjofol/sg.png +share/kde/apps/noatun/kjskins/kjofol/sg_num.png +share/kde/apps/noatun/kjskins/kjofol/sg_seek.bmp +share/kde/apps/noatun/kjskins/kjofol/sg_seek.png +share/kde/apps/noatun/kjskins/kjofol/sg_text.png +share/kde/apps/noatun/kjskins/kjofol/sgdock.png +share/kde/apps/noatun/kjskins/kjofol/sgdock2.png +share/kde/apps/noatun/kjskins/kjofol/sgdocksk.png +share/kde/apps/noatun/kjskins/kjofol/sgdockvp.png +share/kde/apps/noatun/kjskins/kjofol/sgeq.png +share/kde/apps/noatun/kjskins/kjofol/sgpitch.png +share/kde/apps/noatun/kjskins/kjofol/sgpitchp.png +share/kde/apps/noatun/kjskins/kjofol/sgplist.png +share/kde/apps/noatun/kjskins/kjofol/sgplist2.png +share/kde/apps/noatun/kjskins/kjofol/sgpres1.png +share/kde/apps/noatun/kjskins/kjofol/sgpres2.png +share/kde/apps/noatun/kjskins/kjofol/sgpres3.png +share/kde/apps/noatun/kjskins/kjofol/sgvol.png +share/kde/apps/noatun/kjskins/kjofol/sgvolnum.png +share/kde/apps/noatun/kjskins/kjofol/sgvolpos.png +share/kde/apps/noatun/kjskins/kjofol/sgwshad.png +share/kde/apps/noatun/kjskins/kjofol/sgwshad2.png +share/kde/apps/noatun/kjskins/kjofol/sgwshdsk.png +share/kde/apps/noatun/kjskins/kjofol/sgwshvol.png +share/kde/apps/noatun/kjskins/kjofol/sgwshvp.png +share/kde/apps/noatun/kjskins/phong/p_eq.png +share/kde/apps/noatun/kjskins/phong/p_main.png +share/kde/apps/noatun/kjskins/phong/p_mainback.png +share/kde/apps/noatun/kjskins/phong/p_numbers.png +share/kde/apps/noatun/kjskins/phong/p_playback.png +share/kde/apps/noatun/kjskins/phong/p_playlist.png +share/kde/apps/noatun/kjskins/phong/p_propos.png +share/kde/apps/noatun/kjskins/phong/p_text.png +share/kde/apps/noatun/kjskins/phong/p_volbar.png +share/kde/apps/noatun/kjskins/phong/p_volpos.png +share/kde/apps/noatun/kjskins/phong/phong.dck +share/kde/apps/noatun/kjskins/phong/phong.rc +share/kde/apps/noatun/kjskins/phong/phong.wsh +share/kde/apps/noatun/kjskins/phong/phong_readme.txt +share/kde/apps/noatun/kjskins/vibrocentric/i_base.png +share/kde/apps/noatun/kjskins/vibrocentric/i_base2.png +share/kde/apps/noatun/kjskins/vibrocentric/i_eq.png +share/kde/apps/noatun/kjskins/vibrocentric/i_font.png +share/kde/apps/noatun/kjskins/vibrocentric/i_pl.png +share/kde/apps/noatun/kjskins/vibrocentric/i_pl2.png +share/kde/apps/noatun/kjskins/vibrocentric/i_pro.png +share/kde/apps/noatun/kjskins/vibrocentric/i_text.png +share/kde/apps/noatun/kjskins/vibrocentric/i_vol.png +share/kde/apps/noatun/kjskins/vibrocentric/i_volpos.png +share/kde/apps/noatun/kjskins/vibrocentric/vibrocentric.dck +share/kde/apps/noatun/kjskins/vibrocentric/vibrocentric.rc +share/kde/apps/noatun/kjskins/vibrocentric/vibrocentric.wsh +share/kde/apps/noatun/kjskins/vibrocentric/vibrocentric_readme.txt +share/kde/apps/noatun/magictable +share/kde/apps/noatun/marquis.plugin +share/kde/apps/noatun/metatag.plugin +share/kde/apps/noatun/monoscope.plugin +share/kde/apps/noatun/net.plugin +share/kde/apps/noatun/noatunui.plugin +share/kde/apps/noatun/skins/kaiman/car-preset/btn_exit.png +share/kde/apps/noatun/skins/kaiman/car-preset/btn_iconify.png +share/kde/apps/noatun/skins/kaiman/car-preset/btn_list.png +share/kde/apps/noatun/skins/kaiman/car-preset/btn_next.png +share/kde/apps/noatun/skins/kaiman/car-preset/btn_p1.png +share/kde/apps/noatun/skins/kaiman/car-preset/btn_p2.png +share/kde/apps/noatun/skins/kaiman/car-preset/btn_p3.png +share/kde/apps/noatun/skins/kaiman/car-preset/btn_p4.png +share/kde/apps/noatun/skins/kaiman/car-preset/btn_p5.png +share/kde/apps/noatun/skins/kaiman/car-preset/btn_p6.png +share/kde/apps/noatun/skins/kaiman/car-preset/btn_play.png +share/kde/apps/noatun/skins/kaiman/car-preset/btn_prev.png +share/kde/apps/noatun/skins/kaiman/car-preset/btn_sml.png +share/kde/apps/noatun/skins/kaiman/car-preset/btn_stop.png +share/kde/apps/noatun/skins/kaiman/car-preset/btn_voldn.png +share/kde/apps/noatun/skins/kaiman/car-preset/btn_volup.png +share/kde/apps/noatun/skins/kaiman/car-preset/digbig.png +share/kde/apps/noatun/skins/kaiman/car-preset/digmed.png +share/kde/apps/noatun/skins/kaiman/car-preset/letters.png +share/kde/apps/noatun/skins/kaiman/car-preset/main.png +share/kde/apps/noatun/skins/kaiman/car-preset/monoster.png +share/kde/apps/noatun/skins/kaiman/car-preset/posbar.png +share/kde/apps/noatun/skins/kaiman/car-preset/random.png +share/kde/apps/noatun/skins/kaiman/car-preset/repeat.png +share/kde/apps/noatun/skins/kaiman/car-preset/skindata +share/kde/apps/noatun/skins/kaiman/car-preset/status.png +share/kde/apps/noatun/skins/kaiman/car-preset/volume.png +share/kde/apps/noatun/skins/kaiman/circle/back.png +share/kde/apps/noatun/skins/kaiman/circle/back_mask.png +share/kde/apps/noatun/skins/kaiman/circle/back_sm.png +share/kde/apps/noatun/skins/kaiman/circle/back_sm_mask.png +share/kde/apps/noatun/skins/kaiman/circle/bar_pos.png +share/kde/apps/noatun/skins/kaiman/circle/bar_vol.png +share/kde/apps/noatun/skins/kaiman/circle/btn_exit.png +share/kde/apps/noatun/skins/kaiman/circle/btn_iconify.png +share/kde/apps/noatun/skins/kaiman/circle/btn_list.png +share/kde/apps/noatun/skins/kaiman/circle/btn_mode.png +share/kde/apps/noatun/skins/kaiman/circle/btn_next.png +share/kde/apps/noatun/skins/kaiman/circle/btn_play.png +share/kde/apps/noatun/skins/kaiman/circle/btn_pref.png +share/kde/apps/noatun/skins/kaiman/circle/btn_prev.png +share/kde/apps/noatun/skins/kaiman/circle/btn_repeat.png +share/kde/apps/noatun/skins/kaiman/circle/btn_shuffle.png +share/kde/apps/noatun/skins/kaiman/circle/btn_sm_exit.png +share/kde/apps/noatun/skins/kaiman/circle/btn_sm_iconify.png +share/kde/apps/noatun/skins/kaiman/circle/btn_sm_mode.png +share/kde/apps/noatun/skins/kaiman/circle/btn_sm_next.png +share/kde/apps/noatun/skins/kaiman/circle/btn_sm_play.png +share/kde/apps/noatun/skins/kaiman/circle/btn_sm_prev.png +share/kde/apps/noatun/skins/kaiman/circle/btn_sm_stop.png +share/kde/apps/noatun/skins/kaiman/circle/btn_stop.png +share/kde/apps/noatun/skins/kaiman/circle/dig.png +share/kde/apps/noatun/skins/kaiman/circle/digsml.png +share/kde/apps/noatun/skins/kaiman/circle/letters.png +share/kde/apps/noatun/skins/kaiman/circle/skindata +share/kde/apps/noatun/skins/kaiman/circle/status.png +share/kde/apps/noatun/skins/kaiman/k9/README +share/kde/apps/noatun/skins/kaiman/k9/conf.jpg +share/kde/apps/noatun/skins/kaiman/k9/conf.png +share/kde/apps/noatun/skins/kaiman/k9/eject.jpg +share/kde/apps/noatun/skins/kaiman/k9/icon.jpg +share/kde/apps/noatun/skins/kaiman/k9/icon.png +share/kde/apps/noatun/skins/kaiman/k9/kill.jpg +share/kde/apps/noatun/skins/kaiman/k9/kill.png +share/kde/apps/noatun/skins/kaiman/k9/knine-nfont.jpg +share/kde/apps/noatun/skins/kaiman/k9/knine-nfont.png +share/kde/apps/noatun/skins/kaiman/k9/knine-nfont2.jpg +share/kde/apps/noatun/skins/kaiman/k9/knine-nfont2.png +share/kde/apps/noatun/skins/kaiman/k9/knine-normal2.jpg +share/kde/apps/noatun/skins/kaiman/k9/knine-normal2.png +share/kde/apps/noatun/skins/kaiman/k9/knine-vfont.jpg +share/kde/apps/noatun/skins/kaiman/k9/knine-vfont.png +share/kde/apps/noatun/skins/kaiman/k9/long2.jpg +share/kde/apps/noatun/skins/kaiman/k9/mask.png +share/kde/apps/noatun/skins/kaiman/k9/newtext.jpg +share/kde/apps/noatun/skins/kaiman/k9/newtext.png +share/kde/apps/noatun/skins/kaiman/k9/next.jpg +share/kde/apps/noatun/skins/kaiman/k9/pause.jpg +share/kde/apps/noatun/skins/kaiman/k9/play.jpg +share/kde/apps/noatun/skins/kaiman/k9/pos_item.jpg +share/kde/apps/noatun/skins/kaiman/k9/repeat.jpg +share/kde/apps/noatun/skins/kaiman/k9/repeat.png +share/kde/apps/noatun/skins/kaiman/k9/reverse.jpg +share/kde/apps/noatun/skins/kaiman/k9/shuffle.jpg +share/kde/apps/noatun/skins/kaiman/k9/shuffle.png +share/kde/apps/noatun/skins/kaiman/k9/skindata +share/kde/apps/noatun/skins/kaiman/k9/small-k.jpg +share/kde/apps/noatun/skins/kaiman/k9/small-k.png +share/kde/apps/noatun/skins/kaiman/k9/square.jpg +share/kde/apps/noatun/skins/kaiman/k9/square.png +share/kde/apps/noatun/skins/kaiman/k9/status.jpg +share/kde/apps/noatun/skins/kaiman/k9/status.png +share/kde/apps/noatun/skins/kaiman/k9/stop.jpg +share/kde/apps/noatun/skins/kaiman/k9/trans-pos.png +share/kde/apps/noatun/skins/kaiman/k9/trans-slide.png +share/kde/apps/noatun/skins/winamp/Winamp/BALANCE.BMP +share/kde/apps/noatun/skins/winamp/Winamp/CBUTTONS.BMP +share/kde/apps/noatun/skins/winamp/Winamp/FONT.BMP +share/kde/apps/noatun/skins/winamp/Winamp/MAIN.BMP +share/kde/apps/noatun/skins/winamp/Winamp/MONOSTER.BMP +share/kde/apps/noatun/skins/winamp/Winamp/NUMS_EX.BMP +share/kde/apps/noatun/skins/winamp/Winamp/PLAYPAUS.BMP +share/kde/apps/noatun/skins/winamp/Winamp/POSBAR.BMP +share/kde/apps/noatun/skins/winamp/Winamp/SHUFREP.BMP +share/kde/apps/noatun/skins/winamp/Winamp/SPEC.BMP +share/kde/apps/noatun/skins/winamp/Winamp/TEXT.BMP +share/kde/apps/noatun/skins/winamp/Winamp/TITLEBAR.BMP +share/kde/apps/noatun/skins/winamp/Winamp/VISCOLOR.TXT +share/kde/apps/noatun/skins/winamp/Winamp/VOLUME.BMP +share/kde/apps/noatun/splitplaylist.plugin +share/kde/apps/noatun/systray.plugin +share/kde/apps/noatun/systrayui.rc +share/kde/apps/noatun/voiceprint.plugin +share/kde/apps/noatun/winskin.plugin +share/kde/config/aktionrc +share/kde/icons/hicolor/16x16/actions/artsbuilderexecute.png +share/kde/icons/hicolor/16x16/apps/aktion.png +share/kde/icons/hicolor/16x16/apps/artsbuilder.png +share/kde/icons/hicolor/16x16/apps/artscontrol.png +share/kde/icons/hicolor/16x16/apps/kaboodle.png +share/kde/icons/hicolor/16x16/apps/kmid.png +share/kde/icons/hicolor/16x16/apps/kmidi.png +share/kde/icons/hicolor/16x16/apps/kmix.png +share/kde/icons/hicolor/16x16/apps/kscd.png +share/kde/icons/hicolor/16x16/apps/noatun.png +share/kde/icons/hicolor/22x22/actions/artsbuilderexecute.png +share/kde/icons/hicolor/22x22/apps/kaboodle.png +share/kde/icons/hicolor/22x22/apps/noatun.png +share/kde/icons/hicolor/32x32/apps/aktion.png +share/kde/icons/hicolor/32x32/apps/kaboodle.png +share/kde/icons/hicolor/32x32/apps/kmid.png +share/kde/icons/hicolor/32x32/apps/kmidi.png +share/kde/icons/hicolor/32x32/apps/kmix.png +share/kde/icons/hicolor/32x32/apps/kscd.png +share/kde/icons/hicolor/32x32/apps/noatun.png +share/kde/icons/hicolor/48x48/apps/kaboodle.png +share/kde/icons/hicolor/48x48/apps/kmid.png +share/kde/icons/hicolor/48x48/apps/kmidi.png +share/kde/icons/hicolor/48x48/apps/kmix.png +share/kde/icons/hicolor/48x48/apps/kscd.png +share/kde/icons/hicolor/48x48/apps/noatun.png +share/kde/icons/locolor/32x32/apps/kaboodle.png +share/kde/mimelnk/application/x-artsbuilder.desktop +share/kde/mimelnk/audio/x-karaoke.desktop +share/kde/mimelnk/text/xmcd.desktop +share/kde/services/kaboodle_component.desktop +share/kde/services/kfile_m3u.desktop +share/kde/services/kfile_mp3.desktop +share/kde/services/kfile_wav.desktop +share/kde/services/kmixctrl_restore.desktop +share/kde/servicetypes/audiomidi.desktop +@comment dirrm share/kde/servicetypes +@comment dirrm share/kde/services +@comment dirrm share/kde/mimelnk/text +@comment dirrm share/kde/mimelnk/audio +@comment dirrm share/kde/mimelnk/application +@comment dirrm share/kde/icons/locolor/32x32/apps +@comment dirrm share/kde/icons/hicolor/48x48/apps +@comment dirrm share/kde/icons/hicolor/32x32/apps +@comment dirrm share/kde/icons/hicolor/22x22/apps +@comment dirrm share/kde/icons/hicolor/22x22/actions +@comment dirrm share/kde/icons/hicolor/16x16/apps +@comment dirrm share/kde/icons/hicolor/16x16/actions +@comment dirrm share/kde/config +@dirrm share/kde/apps/noatun/skins/winamp/Winamp +@dirrm share/kde/apps/noatun/skins/winamp +@dirrm share/kde/apps/noatun/skins/kaiman/k9 +@dirrm share/kde/apps/noatun/skins/kaiman/circle +@dirrm share/kde/apps/noatun/skins/kaiman/car-preset +@dirrm share/kde/apps/noatun/skins/kaiman +@dirrm share/kde/apps/noatun/skins +@dirrm share/kde/apps/noatun/kjskins/vibrocentric +@dirrm share/kde/apps/noatun/kjskins/phong +@dirrm share/kde/apps/noatun/kjskins/kjofol +@dirrm share/kde/apps/noatun/kjskins/HexoBronx +@dirrm share/kde/apps/noatun/kjskins +@dirrm share/kde/apps/noatun/icons/hicolor/48x48/actions +@dirrm share/kde/apps/noatun/icons/hicolor/48x48 +@dirrm share/kde/apps/noatun/icons/hicolor/32x32/actions +@dirrm share/kde/apps/noatun/icons/hicolor/32x32 +@dirrm share/kde/apps/noatun/icons/hicolor/22x22/actions +@dirrm share/kde/apps/noatun/icons/hicolor/22x22 +@dirrm share/kde/apps/noatun/icons/hicolor/16x16/actions +@dirrm share/kde/apps/noatun/icons/hicolor/16x16 +@dirrm share/kde/apps/noatun/icons/hicolor +@dirrm share/kde/apps/noatun/icons +@dirrm share/kde/apps/noatun/eq.preset +@dirrm share/kde/apps/noatun +@dirrm share/kde/apps/kscd/pics +@exec ${MKDIR} %D/share/kde/apps/kscd/cddb/soundtrack +@dirrm share/kde/apps/kscd/cddb/soundtrack +@exec ${MKDIR} %D/share/kde/apps/kscd/cddb/rock +@dirrm share/kde/apps/kscd/cddb/rock +@exec ${MKDIR} %D/share/kde/apps/kscd/cddb/reggae +@dirrm share/kde/apps/kscd/cddb/reggae +@exec ${MKDIR} %D/share/kde/apps/kscd/cddb/newage +@dirrm share/kde/apps/kscd/cddb/newage +@exec ${MKDIR} %D/share/kde/apps/kscd/cddb/misc +@dirrm share/kde/apps/kscd/cddb/misc +@exec ${MKDIR} %D/share/kde/apps/kscd/cddb/jazz +@dirrm share/kde/apps/kscd/cddb/jazz +@exec ${MKDIR} %D/share/kde/apps/kscd/cddb/folk +@dirrm share/kde/apps/kscd/cddb/folk +@exec ${MKDIR} %D/share/kde/apps/kscd/cddb/data +@dirrm share/kde/apps/kscd/cddb/data +@exec ${MKDIR} %D/share/kde/apps/kscd/cddb/country +@dirrm share/kde/apps/kscd/cddb/country +@exec ${MKDIR} %D/share/kde/apps/kscd/cddb/classical +@dirrm share/kde/apps/kscd/cddb/classical +@exec ${MKDIR} %D/share/kde/apps/kscd/cddb/blues +@dirrm share/kde/apps/kscd/cddb/blues +@dirrm share/kde/apps/kscd/cddb +@dirrm share/kde/apps/kscd +@dirrm share/kde/apps/kmix/pics +@dirrm share/kde/apps/kmix +@dirrm share/kde/apps/kmidi/pics +@dirrm share/kde/apps/kmidi/config/patch +@dirrm share/kde/apps/kmidi/config/BITMAPS +@dirrm share/kde/apps/kmidi/config +@dirrm share/kde/apps/kmidi +@dirrm share/kde/apps/kmid/maps +@dirrm share/kde/apps/kmid/icons/hicolor/32x32/actions +@dirrm share/kde/apps/kmid/icons/hicolor/32x32 +@dirrm share/kde/apps/kmid/icons/hicolor/22x22/actions +@dirrm share/kde/apps/kmid/icons/hicolor/22x22 +@dirrm share/kde/apps/kmid/icons/hicolor/16x16/actions +@dirrm share/kde/apps/kmid/icons/hicolor/16x16 +@dirrm share/kde/apps/kmid/icons/hicolor +@dirrm share/kde/apps/kmid/icons +@dirrm share/kde/apps/kmid/fm +@dirrm share/kde/apps/kmid +@comment dirrm share/kde/apps/kicker/applets +@comment dirrm share/kde/apps/kconf_update +@dirrm share/kde/apps/kaboodle/icons/hicolor/22x22/actions +@dirrm share/kde/apps/kaboodle/icons/hicolor/22x22 +@dirrm share/kde/apps/kaboodle/icons/hicolor/16x16/actions +@dirrm share/kde/apps/kaboodle/icons/hicolor/16x16 +@dirrm share/kde/apps/kaboodle/icons/hicolor +@dirrm share/kde/apps/kaboodle/icons +@dirrm share/kde/apps/kaboodle +@dirrm share/kde/apps/artscontrol +@dirrm share/kde/apps/artsbuilder/pics +@dirrm share/kde/apps/artsbuilder/examples/todo +@dirrm share/kde/apps/artsbuilder/examples +@dirrm share/kde/apps/artsbuilder +@dirrm share/kde/apps/aktion/toolbar +@dirrm share/kde/apps/aktion +@comment dirrm share/kde/apps +@comment dirrm share/kde/applnk/Settings/Sound +@comment dirrm share/kde/applnk/Multimedia +@dirrm share/doc/kde/HTML/en/noatun +@dirrm share/doc/kde/HTML/en/kscd +@dirrm share/doc/kde/HTML/en/kmix +@dirrm share/doc/kde/HTML/en/kmidi +@dirrm share/doc/kde/HTML/en/kmid +@dirrm share/doc/kde/HTML/en/artsbuilder/images +@dirrm share/doc/kde/HTML/en/artsbuilder +@dirrm share/doc/kde/HTML/en/aktion +@comment dirrm share/doc/kde/HTML/en +@dirrm lib/mcop/Noatun +@dirrm lib/mcop/Arts/Environment +@comment dirrm lib/mcop/Arts +@comment dirrm lib/mcop +@comment dirrm lib/kde3 +@dirrm include/noatun +@dirrm include/mpeglib_artsplug +@dirrm include/mpeglib/util/yaf/yafxplayer +@dirrm include/mpeglib/util/yaf/yafcore +@dirrm include/mpeglib/util/yaf +@dirrm include/mpeglib/util/render +@dirrm include/mpeglib/util/file +@dirrm include/mpeglib/util/abstract +@dirrm include/mpeglib/util +@dirrm include/mpeglib/splay +@dirrm include/mpeglib/output +@dirrm include/mpeglib/oggvorbis +@dirrm include/mpeglib/mpegutil +@dirrm include/mpeglib/input +@dirrm include/mpeglib/frame +@dirrm include/mpeglib/decoder +@dirrm include/mpeglib +@comment dirrm include/arts diff --git a/audio/kdemultimedia3/distinfo b/audio/kdemultimedia3/distinfo new file mode 100644 index 00000000000..015a32be1d0 --- /dev/null +++ b/audio/kdemultimedia3/distinfo @@ -0,0 +1,32 @@ +$NetBSD: distinfo,v 1.1.1.1.2.2 2002/06/23 18:37:58 jlam Exp $ + +SHA1 (kdemultimedia-3.0.1.tar.bz2) = 0d957474431d636d429f64003f38beee48dd97f3 +Size (kdemultimedia-3.0.1.tar.bz2) = 5789849 bytes +SHA1 (patch-aa) = e7b1587d8efb48c48484ca90ed9c7d8fe8d7bc94 +SHA1 (patch-ab) = 85b8216b50ab22435835b07e068d326563d0e217 +SHA1 (patch-ac) = ffc738496170c34c8c3ee84544ec1eeac27992ec +SHA1 (patch-ad) = 7821e0466fb29f7ca9692df817fcdd833a12b791 +SHA1 (patch-ae) = 23ccdd4f77aae953bc0ab3ab88c73dbcb3d2ba62 +SHA1 (patch-af) = 07038f3523e1fbc44aa999c9d7ba7b4e9d4f3367 +SHA1 (patch-ag) = aee2716c219e7e6c977cf74b0640ae7528f0755e +SHA1 (patch-ah) = 1dd023976df014a217fcaf39f7ea4280b9f011d8 +SHA1 (patch-ai) = 6d4ff2feecbe66380dc3d08f7a95076c0b0524e2 +SHA1 (patch-aj) = 4da67d4d4a509f933335baa4395d08ae406958ab +SHA1 (patch-ak) = c55b86b33aadc563360b4dfddf46ef1110a79765 +SHA1 (patch-al) = dece03fdff70a1414fb2bb566170092188285536 +SHA1 (patch-am) = a2119b0882b3d4790c8dcfe925e05157844478fa +SHA1 (patch-an) = 2ec87bdfea4d19c71bfece3a58ce2bd8c5c1eee6 +SHA1 (patch-ao) = a31e51c87c76664188515fd1640608cef3a33927 +SHA1 (patch-ap) = 3f072d45cfe5b0d57eab27c90a37afec3bd0d5c0 +SHA1 (patch-aq) = 6918d9ff057873dc0e25fa8e37c64160d4a19302 +SHA1 (patch-ar) = a0f31a40a2e671dacfe3c00706bc5068e648a472 +SHA1 (patch-as) = 434f297212876a0f189221a2b09fbb2c04676fd7 +SHA1 (patch-at) = 33a3f9b2d6b1890150c39294354e71d0d571ab85 +SHA1 (patch-au) = 877c2150000dc7c7344f5e4ab86ebc3b691f3e34 +SHA1 (patch-av) = 1b14a5c0bb9ae5979cc6e07c34dffe0fbefdc2be +SHA1 (patch-aw) = 87444988e9109f2d59dc7168c4f2337d0c1a7168 +SHA1 (patch-ax) = efd01de997033aa2cebd0ba5d875b4d547bfd624 +SHA1 (patch-ay) = d4f6d85e802d9b05b00a659bf9b4fbf96d3b81bc +SHA1 (patch-az) = 90f457bb6d4c5b7186533c168aefde4abd4ba94b +SHA1 (patch-ba) = 5cee048125a71eb5a1358966c0a61c4553eff24c +SHA1 (patch-bb) = f8d2ad72945566dd575f21c7f3f25ca7a720ecb3 diff --git a/audio/kdemultimedia3/patches/patch-aa b/audio/kdemultimedia3/patches/patch-aa new file mode 100644 index 00000000000..a7ce5c4266f --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-aa @@ -0,0 +1,172 @@ +$NetBSD: patch-aa,v 1.1.1.1.2.2 2002/06/23 18:38:00 jlam Exp $ + +--- configure.orig Tue May 14 01:53:41 2002 ++++ configure +@@ -22016,6 +22016,40 @@ + echo "$as_me:22016: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "ac_cv_lib_vm='-lXxf86dga -lXxf86vm'" ++ ++ lib=Xxf86dga ++ shared_lib_found=no ++ for i in ${LDFLAGS}; do ++ case "$i" in ++ -L*) ++ dir=`echo $i | sed "s,^-L,,"` ++ if [ -e $dir/lib${lib}.so ] || ++ [ "`echo $dir/lib${lib}.so.*`" != "$dir/lib${lib}.so.*" ]; then ++ shared_lib_found=yes ++ break; ++ fi ++ esac ++ done ++ if [ "$shared_lib_found" = "no" ]; then ++ eval "ac_cv_lib_vm=no" ++ fi ++ ++ lib=Xxf86vm ++ shared_lib_found=no ++ for i in ${LDFLAGS}; do ++ case "$i" in ++ -L*) ++ dir=`echo $i | sed "s,^-L,,"` ++ if [ -e $dir/lib${lib}.so ] || ++ [ "`echo $dir/lib${lib}.so.*`" != "$dir/lib${lib}.so.*" ]; then ++ shared_lib_found=yes ++ break; ++ fi ++ esac ++ done ++ if [ "$shared_lib_found" = "no" ]; then ++ eval "ac_cv_lib_vm=no" ++ fi + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +@@ -22767,7 +22801,7 @@ + au_enable_sun=yes + ;; + *-*-netbsd*) +- au_enable_sun=yes ++ au_enable_oss=yes + ;; + *-*-openbsd*) + au_enable_sun=yes +@@ -22788,7 +22822,7 @@ + echo "${ECHO_T}yes - <sys/soundcard.h>" >&6 + else + case "$target" in +- *linux*|*freebsd*|*bsdi*) ++ *linux*|*freebsd*|*bsdi*|*netbsd*) + echo "$as_me:22792: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + ;; +@@ -26625,6 +26659,7 @@ + *-*-*bsdi*) kscd_compile=yes;; + *-*-*freebsd*) kscd_compile=yes;; + *-*-*openbsd*) kscd_compile=yes;; ++ *-*-*netbsd*) kscd_compile=yes;; + *-*-*bsd*) kscd_compile=no;; + *) kscd_compile=yes;; + esac +@@ -26688,7 +26723,7 @@ + fi + done + +-for ac_header in sys/soundcard.h machine/soundcard.h linux/soundcard.h ++for ac_header in soundcard.h sys/soundcard.h machine/soundcard.h linux/soundcard.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` + echo "$as_me:26694: checking for $ac_header" >&5 +@@ -27007,7 +27042,22 @@ + echo "$as_me:27007: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ++ lib=Xxf86dga ++ shared_lib_found=no ++ for i in ${LDFLAGS}; do ++ case "$i" in ++ -L*) ++ dir=`echo $i | sed "s,^-L,,"` ++ if [ -e $dir/lib${lib}.so ] || ++ [ "`echo $dir/lib${lib}.so.*`" != "$dir/lib${lib}.so.*" ]; then ++ shared_lib_found=yes ++ break; ++ fi ++ esac ++ done ++ if [ "$shared_lib_found" = "yes" ]; then + x11_dga2=yes ++ fi + + else + echo "$as_me: failed program was:" >&5 +@@ -27056,7 +27106,22 @@ + echo "$as_me:27056: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ++ lib=Xv ++ shared_lib_found=no ++ for i in ${LDFLAGS}; do ++ case "$i" in ++ -L*) ++ dir=`echo $i | sed "s,^-L,,"` ++ if [ -e $dir/lib${lib}.so ] || ++ [ "`echo $dir/lib${lib}.so.*`" != "$dir/lib${lib}.so.*" ]; then ++ shared_lib_found=yes ++ break; ++ fi ++ esac ++ done ++ if [ "$shared_lib_found" = "yes" ]; then + x11_xv=yes ++ fi + + else + echo "$as_me: failed program was:" >&5 +@@ -27105,7 +27170,22 @@ + echo "$as_me:27105: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ++ lib=Xxf86vm ++ shared_lib_found=no ++ for i in ${LDFLAGS}; do ++ case "$i" in ++ -L*) ++ dir=`echo $i | sed "s,^-L,,"` ++ if [ -e $dir/lib${lib}.so ] || ++ [ "`echo $dir/lib${lib}.so.*`" != "$dir/lib${lib}.so.*" ]; then ++ shared_lib_found=yes ++ break; ++ fi ++ esac ++ done ++ if [ "$shared_lib_found" = "yes" ]; then + x11_xvidmode=yes ++ fi + + else + echo "$as_me: failed program was:" >&5 +@@ -27381,6 +27461,9 @@ + kde_mpeglib_compiles=no + + case "$OS_TYPE" in ++ NetBSD) ++ kde_mpeglib_compiles=yes ++ ;; + FreeBSD) + kde_mpeglib_compiles=yes + ;; +@@ -27647,9 +27730,10 @@ + ;; + + NetBSD) +- echo "$as_me:27650: result: NetBSD :Unknown hardware. You will have problems!!" >&5 +-echo "${ECHO_T}NetBSD :Unknown hardware. You will have problems!!" >&6 ++ echo "$as_me:27650: result: using -lpthread" >&5 ++echo $ECHO_N "using -lpthread... $ECHO_C" >&6 + OS_TYPE="BSD" ++ LIBPTHREAD="-lpthread" + + cat >>confdefs.h <<\EOF + #define OS_BSD 1 diff --git a/audio/kdemultimedia3/patches/patch-ab b/audio/kdemultimedia3/patches/patch-ab new file mode 100644 index 00000000000..e9471b891ba --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-ab @@ -0,0 +1,48 @@ +$NetBSD: patch-ab,v 1.1.1.1.2.2 2002/06/23 18:38:00 jlam Exp $ + +--- kaboodle/Makefile.am.orig Fri Jul 27 01:53:45 2001 ++++ kaboodle/Makefile.am +@@ -2,7 +2,7 @@ + + SUBDIRS = pics actions + +-lib_LTLIBRARIES = libkaboodlepart.la kaboodle.la ++lib_LTLIBRARIES = libkaboodlepart.la libkaboodle_main.la kaboodle.la + + libkaboodlepart_la_SOURCES = conf.cpp \ + controls.cpp \ +@@ -15,25 +15,24 @@ + libkaboodlepart_la_LDFLAGS = $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries) + libkaboodlepart_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -lqtmcop -lkmedia2_idl -lsoundserver_idl -lartskde + +-kaboodle_la_SOURCES = main.cpp \ ++kaboodle_la_SOURCES = kaboodle_main.cpp ++kaboodle_la_LIBADD = libkaboodle_main.la ++kaboodle_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version ++ ++libkaboodle_main_la_SOURCES = main.cpp \ + kaboodleapp.cpp \ + userinterface.cpp + +-kaboodle_la_LIBADD = libkaboodlepart.la +-kaboodle_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version ++libkaboodle_main_la_LIBADD = libkaboodlepart.la ++libkaboodle_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) + + bin_PROGRAMS = kaboodle + +-kaboodle_LDADD = kaboodle.la ++kaboodle_LDADD = libkaboodle_main.la + kaboodle_LDFLAGS = $(all_libraries) $(KDE_RPATH) +-kaboodle_SOURCES = dummy.cpp ++kaboodle_SOURCES = kaboodle_main.cpp + + libkaboodlepart_la_METASOURCES = AUTO +- +-CLEANFILES = dummy.cpp +- +-dummy.cpp: +- echo > dummy.cpp + + applnk_DATA = kaboodle.desktop + applnkdir = $(kde_appsdir)/Multimedia diff --git a/audio/kdemultimedia3/patches/patch-ac b/audio/kdemultimedia3/patches/patch-ac new file mode 100644 index 00000000000..0b9a088fafc --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-ac @@ -0,0 +1,275 @@ +$NetBSD: patch-ac,v 1.1.1.1.2.2 2002/06/23 18:38:01 jlam Exp $ + +--- kaboodle/Makefile.in.orig Tue May 14 01:53:25 2002 ++++ kaboodle/Makefile.in +@@ -293,7 +293,7 @@ + + SUBDIRS = pics actions + +-lib_LTLIBRARIES = libkaboodlepart.la kaboodle.la ++lib_LTLIBRARIES = libkaboodlepart.la libkaboodle_main.la kaboodle.la + + libkaboodlepart_la_SOURCES = conf.cpp \ + controls.cpp \ +@@ -307,24 +307,26 @@ + libkaboodlepart_la_LDFLAGS = $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries) + libkaboodlepart_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -lqtmcop -lkmedia2_idl -lsoundserver_idl -lartskde + +-kaboodle_la_SOURCES = main.cpp \ ++kaboodle_la_SOURCES = kaboodle_main.cpp ++kaboodle_la_LIBADD = libkaboodle_main.la ++kaboodle_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version ++ ++libkaboodle_main_la_SOURCES = main.cpp \ + kaboodleapp.cpp \ + userinterface.cpp + + +-kaboodle_la_LIBADD = libkaboodlepart.la +-kaboodle_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version ++libkaboodle_main_la_LIBADD = libkaboodlepart.la ++libkaboodle_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) + + bin_PROGRAMS = kaboodle + +-kaboodle_LDADD = kaboodle.la ++kaboodle_LDADD = libkaboodle_main.la + kaboodle_LDFLAGS = $(all_libraries) $(KDE_RPATH) +-kaboodle_SOURCES = dummy.cpp ++kaboodle_SOURCES = kaboodle_main.cpp + + #>- libkaboodlepart_la_METASOURCES = AUTO + +-CLEANFILES = dummy.cpp +- + applnk_DATA = kaboodle.desktop + applnkdir = $(kde_appsdir)/Multimedia + +@@ -337,15 +339,20 @@ + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(lib_LTLIBRARIES) + +-kaboodle_la_DEPENDENCIES = libkaboodlepart.la +-am_kaboodle_la_OBJECTS = main.lo kaboodleapp.lo userinterface.lo ++kaboodle_la_DEPENDENCIES = libkaboodle_main.la ++am_kaboodle_la_OBJECTS = kaboodle_main.lo + #>- kaboodle_la_OBJECTS = $(am_kaboodle_la_OBJECTS) ++#>+ 1 ++kaboodle_la_OBJECTS = kaboodle_main.lo ++libkaboodle_main_la_DEPENDENCIES = libkaboodlepart.la ++am_libkaboodle_main_la_OBJECTS = main.lo kaboodleapp.lo userinterface.lo ++#>- libkaboodle_main_la_OBJECTS = $(am_libkaboodle_main_la_OBJECTS) + #>+ 5 +-kaboodle_la_final_OBJECTS = kaboodle_la.all_cpp.lo +-kaboodle_la_nofinal_OBJECTS = main.lo kaboodleapp.lo userinterface.lo \ +- kaboodle_la_meta_unload.lo +-@KDE_USE_FINAL_FALSE@kaboodle_la_OBJECTS = $(kaboodle_la_nofinal_OBJECTS) +-@KDE_USE_FINAL_TRUE@kaboodle_la_OBJECTS = $(kaboodle_la_final_OBJECTS) ++libkaboodle_main_la_final_OBJECTS = libkaboodle_main_la.all_cpp.lo ++libkaboodle_main_la_nofinal_OBJECTS = main.lo kaboodleapp.lo userinterface.lo \ ++ libkaboodle_main_la_meta_unload.lo ++@KDE_USE_FINAL_FALSE@libkaboodle_main_la_OBJECTS = $(libkaboodle_main_la_nofinal_OBJECTS) ++@KDE_USE_FINAL_TRUE@libkaboodle_main_la_OBJECTS = $(libkaboodle_main_la_final_OBJECTS) + libkaboodlepart_la_DEPENDENCIES = + am_libkaboodlepart_la_OBJECTS = conf.lo controls.lo engine.lo \ + kaboodle_factory.lo kaboodle_part.lo player.lo videoembed.lo +@@ -360,11 +367,11 @@ + bin_PROGRAMS = kaboodle$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) + +-am_kaboodle_OBJECTS = dummy.$(OBJEXT) ++am_kaboodle_OBJECTS = kaboodle_main.$(OBJEXT) + #>- kaboodle_OBJECTS = $(am_kaboodle_OBJECTS) + #>+ 1 +-kaboodle_OBJECTS = dummy.$(OBJEXT) +-kaboodle_DEPENDENCIES = kaboodle.la ++kaboodle_OBJECTS = kaboodle_main.$(OBJEXT) ++kaboodle_DEPENDENCIES = libkaboodle_main.la + + DEFS = @DEFS@ + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +@@ -373,8 +380,9 @@ + LIBS = @LIBS@ + depcomp = $(SHELL) $(top_srcdir)/admin/depcomp + @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/conf.Plo $(DEPDIR)/controls.Plo \ +- @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/engine.Plo \ +- @AMDEP_TRUE@ $(DEPDIR)/kaboodle_factory.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/engine.Plo $(DEPDIR)/kaboodle_factory.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/kaboodle_main.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/kaboodle_main.Po \ + @AMDEP_TRUE@ $(DEPDIR)/kaboodle_part.Plo \ + @AMDEP_TRUE@ $(DEPDIR)/kaboodleapp.Plo $(DEPDIR)/main.Plo \ + @AMDEP_TRUE@ $(DEPDIR)/player.Plo $(DEPDIR)/userinterface.Plo \ +@@ -398,8 +406,8 @@ + CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ + CXXFLAGS = @CXXFLAGS@ +-DIST_SOURCES = $(kaboodle_la_SOURCES) $(libkaboodlepart_la_SOURCES) \ +- $(kaboodle_SOURCES) ++DIST_SOURCES = $(kaboodle_la_SOURCES) $(libkaboodle_main_la_SOURCES) \ ++ $(libkaboodlepart_la_SOURCES) $(kaboodle_SOURCES) + DATA = $(applnk_DATA) $(data_DATA) $(kde_services_DATA) + + +@@ -409,7 +417,7 @@ + uninstall-recursive check-recursive installcheck-recursive + DIST_COMMON = AUTHORS Makefile.am Makefile.in + DIST_SUBDIRS = $(SUBDIRS) +-SOURCES = $(kaboodle_la_SOURCES) $(libkaboodlepart_la_SOURCES) $(kaboodle_SOURCES) ++SOURCES = $(kaboodle_la_SOURCES) $(libkaboodle_main_la_SOURCES) $(libkaboodlepart_la_SOURCES) $(kaboodle_SOURCES) + + #>- all: all-recursive + #>+ 1 +@@ -458,6 +466,8 @@ + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + kaboodle.la: $(kaboodle_la_OBJECTS) $(kaboodle_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(kaboodle_la_LDFLAGS) $(kaboodle_la_OBJECTS) $(kaboodle_la_LIBADD) $(LIBS) ++libkaboodle_main.la: $(libkaboodle_main_la_OBJECTS) $(libkaboodle_main_la_DEPENDENCIES) ++ $(CXXLINK) -rpath $(libdir) $(libkaboodle_main_la_LDFLAGS) $(libkaboodle_main_la_OBJECTS) $(libkaboodle_main_la_LIBADD) $(LIBS) + #>- libkaboodlepart.la: $(libkaboodlepart_la_OBJECTS) $(libkaboodlepart_la_DEPENDENCIES) + #>+ 2 + @KDE_USE_CLOSURE_TRUE@libkaboodlepart.la: libkaboodlepart.la.closure $(libkaboodlepart_la_OBJECTS) $(libkaboodlepart_la_DEPENDENCIES) +@@ -499,9 +509,10 @@ + + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/conf.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/controls.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/engine.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kaboodle_factory.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kaboodle_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kaboodle_main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kaboodle_part.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kaboodleapp.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Plo@am__quote@ +@@ -677,7 +688,7 @@ + + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=README-USERS kaboodle.desktop kaboodle_part.h conf.h kaboodle_factory.h engine.h kaboodlepartui.rc kaboodle_component.desktop videoembed.h player.h kaboodleapp.h kaboodleui.rc controls.h userinterface.h ++KDE_DIST=kaboodleapp.h kaboodle_factory.h libkaboodlepart.la.closure engine.h controls.h kaboodlepartui.rc kaboodleui.rc README-USERS kaboodle.desktop kaboodle_component.desktop kaboodle_part.h conf.h videoembed.h player.h dummy.cpp userinterface.h + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + +@@ -739,7 +750,6 @@ + mostlyclean-generic: + + clean-generic: +- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* +@@ -818,9 +828,6 @@ + uninstall-libLTLIBRARIES uninstall-recursive + + +-dummy.cpp: +- echo > dummy.cpp +- + messages: rc.cpp + $(XGETTEXT) rc.cpp *.cpp *.h -o $(podir)/kaboodle.pot + # Tell versions [3.59,3.63) of GNU make to not export all variables. +@@ -891,16 +898,16 @@ + + + #>+ 12 +-kaboodle_la_meta_unload.cpp: kaboodleapp.moc userinterface.moc +- @echo 'creating kaboodle_la_meta_unload.cpp' +- @-rm -f kaboodle_la_meta_unload.cpp ++libkaboodle_main_la_meta_unload.cpp: kaboodleapp.moc userinterface.moc ++ @echo 'creating libkaboodle_main_la_meta_unload.cpp' ++ @-rm -f libkaboodle_main_la_meta_unload.cpp + @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_kaboodle_la[] = {' > kaboodle_la_meta_unload.cpp ;\ +- cat kaboodleapp.moc userinterface.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kaboodle_la_meta_unload.cpp ;\ +- echo '0};' >> kaboodle_la_meta_unload.cpp ;\ +- echo '#include <kunload.h>' >> kaboodle_la_meta_unload.cpp ;\ +- echo '_UNLOAD(kaboodle_la)' >> kaboodle_la_meta_unload.cpp ;\ +- else echo > kaboodle_la_meta_unload.cpp; fi ++ echo 'static const char * _metalist_libkaboodle_main_la[] = {' > libkaboodle_main_la_meta_unload.cpp ;\ ++ cat kaboodleapp.moc userinterface.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkaboodle_main_la_meta_unload.cpp ;\ ++ echo '0};' >> libkaboodle_main_la_meta_unload.cpp ;\ ++ echo '#include <kunload.h>' >> libkaboodle_main_la_meta_unload.cpp ;\ ++ echo '_UNLOAD(libkaboodle_main_la)' >> libkaboodle_main_la_meta_unload.cpp ;\ ++ else echo > libkaboodle_main_la_meta_unload.cpp; fi + + + #>+ 12 +@@ -918,14 +925,14 @@ + + #>+ 3 + clean-moc-classes: +- -rm -f kaboodle_la_meta_unload.cpp libkaboodlepart_la_meta_unload.cpp ++ -rm -f libkaboodle_main_la_meta_unload.cpp libkaboodlepart_la_meta_unload.cpp + + #>+ 11 +-kaboodle_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kaboodleapp.cpp $(srcdir)/userinterface.cpp kaboodle_la_meta_unload.cpp ++kaboodle_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaboodle_main.cpp + @echo 'creating kaboodle_la.all_cpp.cpp ...'; \ + rm -f kaboodle_la.all_cpp.files kaboodle_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kaboodle_la.all_cpp.final; \ +- for file in main.cpp kaboodleapp.cpp userinterface.cpp kaboodle_la_meta_unload.cpp ; do \ ++ for file in kaboodle_main.cpp ; do \ + echo "#include \"$$file\"" >> kaboodle_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kaboodle_la.all_cpp.final; \ + done; \ +@@ -933,7 +940,19 @@ + rm -f kaboodle_la.all_cpp.final kaboodle_la.all_cpp.files + + #>+ 11 +-libkaboodlepart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/conf.cpp $(srcdir)/controls.cpp $(srcdir)/engine.cpp $(srcdir)/kaboodle_factory.cpp $(srcdir)/kaboodle_part.cpp $(srcdir)/player.cpp $(srcdir)/videoembed.cpp libkaboodlepart_la_meta_unload.cpp kaboodle_part.moc controls.moc kaboodleapp.moc userinterface.moc kaboodle_factory.moc conf.moc player.moc videoembed.moc engine.moc ++libkaboodle_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kaboodleapp.cpp $(srcdir)/userinterface.cpp libkaboodle_main_la_meta_unload.cpp ++ @echo 'creating libkaboodle_main_la.all_cpp.cpp ...'; \ ++ rm -f libkaboodle_main_la.all_cpp.files libkaboodle_main_la.all_cpp.final; \ ++ echo "#define KDE_USE_FINAL 1" >> libkaboodle_main_la.all_cpp.final; \ ++ for file in main.cpp kaboodleapp.cpp userinterface.cpp libkaboodle_main_la_meta_unload.cpp ; do \ ++ echo "#include \"$$file\"" >> libkaboodle_main_la.all_cpp.files; \ ++ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkaboodle_main_la.all_cpp.final; \ ++ done; \ ++ cat libkaboodle_main_la.all_cpp.final libkaboodle_main_la.all_cpp.files > libkaboodle_main_la.all_cpp.cpp; \ ++ rm -f libkaboodle_main_la.all_cpp.final libkaboodle_main_la.all_cpp.files ++ ++#>+ 11 ++libkaboodlepart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/conf.cpp $(srcdir)/controls.cpp $(srcdir)/engine.cpp $(srcdir)/kaboodle_factory.cpp $(srcdir)/kaboodle_part.cpp $(srcdir)/player.cpp $(srcdir)/videoembed.cpp $(srcdir)/libkaboodlepart_la_meta_unload.cpp kaboodle_part.moc controls.moc kaboodleapp.moc userinterface.moc kaboodle_factory.moc conf.moc player.moc videoembed.moc engine.moc + @echo 'creating libkaboodlepart_la.all_cpp.cpp ...'; \ + rm -f libkaboodlepart_la.all_cpp.files libkaboodlepart_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkaboodlepart_la.all_cpp.final; \ +@@ -945,11 +964,11 @@ + rm -f libkaboodlepart_la.all_cpp.final libkaboodlepart_la.all_cpp.files + + #>+ 11 +-kaboodle.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp ++kaboodle.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaboodle_main.cpp + @echo 'creating kaboodle.all_cpp.cpp ...'; \ + rm -f kaboodle.all_cpp.files kaboodle.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kaboodle.all_cpp.final; \ +- for file in dummy.cpp ; do \ ++ for file in kaboodle_main.cpp ; do \ + echo "#include \"$$file\"" >> kaboodle.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kaboodle.all_cpp.final; \ + done; \ +@@ -958,20 +977,20 @@ + + #>+ 3 + clean-final: +- -rm -f kaboodle_la.all_cpp.cpp libkaboodlepart_la.all_cpp.cpp kaboodle.all_cpp.cpp ++ -rm -f kaboodle_la.all_cpp.cpp libkaboodle_main_la.all_cpp.cpp libkaboodlepart_la.all_cpp.cpp kaboodle.all_cpp.cpp + + #>+ 2 + final: +- $(MAKE) kaboodle_la_OBJECTS="$(kaboodle_la_final_OBJECTS)" libkaboodlepart_la_OBJECTS="$(libkaboodlepart_la_final_OBJECTS)" all-am ++ $(MAKE) libkaboodle_main_la_OBJECTS="$(libkaboodle_main_la_final_OBJECTS)" libkaboodlepart_la_OBJECTS="$(libkaboodlepart_la_final_OBJECTS)" all-am + #>+ 2 + final-install: +- $(MAKE) kaboodle_la_OBJECTS="$(kaboodle_la_final_OBJECTS)" libkaboodlepart_la_OBJECTS="$(libkaboodlepart_la_final_OBJECTS)" install-am ++ $(MAKE) libkaboodle_main_la_OBJECTS="$(libkaboodle_main_la_final_OBJECTS)" libkaboodlepart_la_OBJECTS="$(libkaboodlepart_la_final_OBJECTS)" install-am + #>+ 2 + no-final: +- $(MAKE) kaboodle_la_OBJECTS="$(kaboodle_la_nofinal_OBJECTS)" libkaboodlepart_la_OBJECTS="$(libkaboodlepart_la_nofinal_OBJECTS)" all-am ++ $(MAKE) libkaboodle_main_la_OBJECTS="$(libkaboodle_main_la_nofinal_OBJECTS)" libkaboodlepart_la_OBJECTS="$(libkaboodlepart_la_nofinal_OBJECTS)" all-am + #>+ 2 + no-final-install: +- $(MAKE) kaboodle_la_OBJECTS="$(kaboodle_la_nofinal_OBJECTS)" libkaboodlepart_la_OBJECTS="$(libkaboodlepart_la_nofinal_OBJECTS)" install-am ++ $(MAKE) libkaboodle_main_la_OBJECTS="$(libkaboodle_main_la_nofinal_OBJECTS)" libkaboodlepart_la_OBJECTS="$(libkaboodlepart_la_nofinal_OBJECTS)" install-am + #>+ 3 + cvs-clean: + $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/audio/kdemultimedia3/patches/patch-ad b/audio/kdemultimedia3/patches/patch-ad new file mode 100644 index 00000000000..308bba312da --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-ad @@ -0,0 +1,34 @@ +$NetBSD: patch-ad,v 1.1.1.1.2.2 2002/06/23 18:38:02 jlam Exp $ + +--- kaboodle/kaboodle_main.cpp.orig Thu May 30 20:46:07 2002 ++++ kaboodle/kaboodle_main.cpp +@@ -0,0 +1,29 @@ ++/* ++ * ++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a copy ++ * of this software and associated documentation files (the "Software"), to deal ++ * in the Software without restriction, including without limitation the rights ++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++ * copies of the Software, and to permit persons to whom the Software is ++ * furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in ++ * all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ * ++ */ ++ ++extern "C" int kdemain(int argc, char* argv[]); ++ ++int main( int argc, char* argv[] ) ++{ ++ return kdemain(argc, argv); ++} diff --git a/audio/kdemultimedia3/patches/patch-ae b/audio/kdemultimedia3/patches/patch-ae new file mode 100644 index 00000000000..2225c8fb376 --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-ae @@ -0,0 +1,15 @@ +$NetBSD: patch-ae,v 1.1.1.1.2.2 2002/06/23 18:38:03 jlam Exp $ + +--- kaboodle/main.cpp.orig Fri Aug 31 13:34:04 2001 ++++ kaboodle/main.cpp +@@ -42,7 +42,9 @@ + { 0, 0, 0} + }; + +-int main(int argc, char **argv) ++extern "C" int kdemain(int, char**); ++ ++int kdemain(int argc, char **argv) + { + KCmdLineArgs::init( argc, argv, KaboodleFactory::aboutData()); + KCmdLineArgs::addCmdLineOptions(options); diff --git a/audio/kdemultimedia3/patches/patch-af b/audio/kdemultimedia3/patches/patch-af new file mode 100644 index 00000000000..f8e61194694 --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.1.1.1.2.2 2002/06/23 18:38:04 jlam Exp $ + +--- kmidi/Makefile.in.orig Tue May 14 01:53:26 2002 ++++ kmidi/Makefile.in +@@ -409,7 +409,7 @@ + kmidiframe.$(OBJEXT) kmidifiledlg.$(OBJEXT) \ + qttableview.$(OBJEXT) \ + kmidi_meta_unload.o +-kmidi_LDADD = $(LDADD) ++kmidi_LDADD = $(LIBOSSAUDIO) $(LDADD) + kmidi_DEPENDENCIES = + kmidi_LDFLAGS = + am_sf2cfg_OBJECTS = sf2cfg.$(OBJEXT) readsbk.$(OBJEXT) diff --git a/audio/kdemultimedia3/patches/patch-ag b/audio/kdemultimedia3/patches/patch-ag new file mode 100644 index 00000000000..e07fed95fbe --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-ag @@ -0,0 +1,23 @@ +$NetBSD: patch-ag,v 1.1.1.1.2.2 2002/06/23 18:38:05 jlam Exp $ + +--- kmidi/TIMIDITY/Makefile.in.orig Tue May 14 01:53:26 2002 ++++ kmidi/TIMIDITY/Makefile.in +@@ -300,8 +300,8 @@ + + INCLUDES = $(X_INCLUDES) `$(ARTSCCONFIG) --cflags` + AM_CFLAGS = -DDEFAULT_PATH=\"$(TIMID_DIR)\" $(EXTRATDEFS) $(EXTRATCFLAGS) +-LDFLAGS = `$(ARTSCCONFIG) --libs` +-LDADD = $(LIBALIB) $(LIBAUDIO) $(LIBMME) $(EXTRATLIBS) $(X_LIBS) -lm ++timidity_LDFLAGS = `$(ARTSCCONFIG) --libs` ++LDADD = $(LIBOSSAUDIO) $(LIBALIB) $(LIBAUDIO) $(LIBMME) $(EXTRATLIBS) $(X_LIBS) -lm + + # Where to install the patches, config files, and MIDI files. + # If you change this, it's a good idea to recompile the binary, +@@ -386,7 +386,6 @@ + @KDE_USE_FINAL_TRUE@timidity_OBJECTS = $(timidity_final_OBJECTS) + timidity_LDADD = $(LDADD) + timidity_DEPENDENCIES = +-timidity_LDFLAGS = + + DEFS = @DEFS@ + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) diff --git a/audio/kdemultimedia3/patches/patch-ah b/audio/kdemultimedia3/patches/patch-ah new file mode 100644 index 00000000000..9bc5f111556 --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-ah @@ -0,0 +1,16 @@ +$NetBSD: patch-ah,v 1.1.1.1.2.2 2002/06/23 18:38:05 jlam Exp $ + +--- kmidi/b_out.cpp.orig Thu Apr 12 10:09:23 2001 ++++ kmidi/b_out.cpp +@@ -16,6 +16,11 @@ + #include <linux/soundcard.h> + #endif + ++#ifdef __NetBSD__ ++#include <sys/ioctl.h> ++#include <soundcard.h> ++#endif ++ + #ifdef __FreeBSD__ + #include <machine/soundcard.h> + #endif diff --git a/audio/kdemultimedia3/patches/patch-ai b/audio/kdemultimedia3/patches/patch-ai new file mode 100644 index 00000000000..4e86bb72274 --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-ai @@ -0,0 +1,50 @@ +$NetBSD: patch-ai,v 1.1.1.1.2.2 2002/06/23 18:38:06 jlam Exp $ + +--- kmidi/linux_a.cpp.orig Fri Jan 19 09:17:50 2001 ++++ kmidi/linux_a.cpp +@@ -36,6 +36,13 @@ + #include <linux/soundcard.h> + #endif + ++#ifdef __NetBSD__ ++#include <stdio.h> ++#include <sys/ioctl.h> ++#include <soundcard.h> ++#endif ++ ++ + #ifdef __FreeBSD__ + #include <stdio.h> + #include <machine/soundcard.h> +@@ -76,6 +83,9 @@ + #ifdef LINUX_SECOND_DEVICE + "Linux 2nd dsp device", 'D', + "/dev/dsp1", ++#elif defined(__NetBSD__) ++ "NetBSD audio device", 'd', ++ "/dev/sound", + #else + "Linux dsp device", 'd', + "/dev/dsp", +@@ -320,13 +330,21 @@ + static void flush_output(void) + { + output_data(0, 0); ++#if defined(__NetBSD__) ++ ioctl(dpm.fd, SNDCTL_DSP_SYNC, NULL); ++#else + ioctl(dpm.fd, SNDCTL_DSP_SYNC); ++#endif + } + + static void purge_output(void) + { + b_out(dpm.id_character, dpm.fd, 0, -1); ++#if defined(__NetBSD__) ++ ioctl(dpm.fd, SNDCTL_DSP_RESET, NULL); ++#else + ioctl(dpm.fd, SNDCTL_DSP_RESET); ++#endif + } + + #endif /* defined(__linux__) || defined(__FreeBSD__) || defined(__bsdi__) */ diff --git a/audio/kdemultimedia3/patches/patch-aj b/audio/kdemultimedia3/patches/patch-aj new file mode 100644 index 00000000000..6eb57f7a395 --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-aj @@ -0,0 +1,59 @@ +$NetBSD: patch-aj,v 1.1.1.1.2.2 2002/06/23 18:38:07 jlam Exp $ + +--- kmix/Makefile.am.orig Wed May 8 19:29:16 2002 ++++ kmix/Makefile.am +@@ -2,7 +2,7 @@ + INCLUDES= $(all_includes) + + bin_PROGRAMS = kmix kmixctrl +-lib_LTLIBRARIES = kmix.la kmixctrl.la ++lib_LTLIBRARIES = libkmix_main.la kmix.la libkmixctrl_main.la kmixctrl.la + kde_module_LTLIBRARIES = kmix_panelapplet.la + + +@@ -12,22 +12,30 @@ + + + METASOURCES = AUTO +-kmix_la_SOURCES = main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp \ ++libkmix_main_la_SOURCES = main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp \ + kmixerwidget.cpp channel.cpp mixer.cpp ksmallslider.cpp \ + volume.cpp kledbutton.cpp mixdevicewidget.cpp +-kmix_la_LIBADD = $(LIB_KDEUI) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) ++libkmix_main_la_LIBADD = $(LIB_KDEUI) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) ++libkmix_main_la_LDFLAGS = $(all_libraries) ++ ++kmix_la_SOURCES = kmix_main.cpp ++kmix_la_LIBADD = libkmix_main.la + kmix_la_LDFLAGS = $(all_libraries) -module -avoid-version + +-kmix_SOURCES = dummy.cpp +-kmix_LDADD = kmix.la ++kmix_SOURCES = kmix_main.cpp ++kmix_LDADD = libkmix_main.la + kmix_LDFLAGS = $(all_libraries) $(KDE_RPATH) + +-kmixctrl_SOURCES = dummy.cpp +-kmixctrl_LDADD = kmixctrl.la ++kmixctrl_SOURCES = kmixctrl_main.cpp ++kmixctrl_LDADD = libkmixctrl_main.la + kmixctrl_LDFLAGS = $(all_libraries) $(KDE_RPATH) + +-kmixctrl_la_SOURCES = kmixctrl.cpp channel.cpp mixer.cpp volume.cpp +-kmixctrl_la_LIBADD = $(LIB_KDEUI) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) ++libkmixctrl_main_la_SOURCES = kmixctrl.cpp channel.cpp mixer.cpp volume.cpp ++libkmixctrl_main_la_LIBADD = $(LIB_KDEUI) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) ++libkmixctrl_main_la_LDFLAGS = $(all_libraries) ++ ++kmixctrl_la_SOURCES = kmixctrl_main.cpp ++kmixctrl_la_LIBADD = libkmixctrl_main.la + kmixctrl_la_LDFLAGS = $(all_libraries) -module -avoid-version + + kmix_panelapplet_la_METASOURCES=AUTO +@@ -58,6 +66,3 @@ + + messages: rc.cpp + $(XGETTEXT) *.cpp -o $(podir)/kmix.pot +- +-dummy.cpp: +- echo > dummy.cpp diff --git a/audio/kdemultimedia3/patches/patch-ak b/audio/kdemultimedia3/patches/patch-ak new file mode 100644 index 00000000000..f3f3b027668 --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-ak @@ -0,0 +1,387 @@ +$NetBSD: patch-ak,v 1.1.1.1.2.2 2002/06/23 18:38:07 jlam Exp $ + +--- kmix/Makefile.in.orig Tue May 14 01:53:26 2002 ++++ kmix/Makefile.in +@@ -293,7 +293,7 @@ + INCLUDES = $(all_includes) + + bin_PROGRAMS = kmix kmixctrl +-lib_LTLIBRARIES = kmix.la kmixctrl.la ++lib_LTLIBRARIES = libkmix_main.la kmix.la libkmixctrl_main.la kmixctrl.la + kde_module_LTLIBRARIES = kmix_panelapplet.la + + noinst_HEADERS = kmix.h kmixdockwidget.h kmixprefdlg.h kmixerwidget.h \ +@@ -302,23 +302,31 @@ + + + METASOURCES = AUTO +-kmix_la_SOURCES = main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp \ ++libkmix_main_la_SOURCES = main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp \ + kmixerwidget.cpp channel.cpp mixer.cpp ksmallslider.cpp \ + volume.cpp kledbutton.cpp mixdevicewidget.cpp + +-kmix_la_LIBADD = $(LIB_KDEUI) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) ++libkmix_main_la_LIBADD = $(LIB_KDEUI) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) ++libkmix_main_la_LDFLAGS = $(all_libraries) ++ ++kmix_la_SOURCES = kmix_main.cpp ++kmix_la_LIBADD = libkmix_main.la + kmix_la_LDFLAGS = $(all_libraries) -module -avoid-version + +-kmix_SOURCES = dummy.cpp +-kmix_LDADD = kmix.la ++kmix_SOURCES = kmix_main.cpp ++kmix_LDADD = libkmix_main.la + kmix_LDFLAGS = $(all_libraries) $(KDE_RPATH) + +-kmixctrl_SOURCES = dummy.cpp +-kmixctrl_LDADD = kmixctrl.la ++kmixctrl_SOURCES = kmixctrl_main.cpp ++kmixctrl_LDADD = libkmixctrl_main.la + kmixctrl_LDFLAGS = $(all_libraries) $(KDE_RPATH) + +-kmixctrl_la_SOURCES = kmixctrl.cpp channel.cpp mixer.cpp volume.cpp +-kmixctrl_la_LIBADD = $(LIB_KDEUI) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) ++libkmixctrl_main_la_SOURCES = kmixctrl.cpp channel.cpp mixer.cpp volume.cpp ++libkmixctrl_main_la_LIBADD = $(LIB_KDEUI) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) ++libkmixctrl_main_la_LDFLAGS = $(all_libraries) ++ ++kmixctrl_la_SOURCES = kmixctrl_main.cpp ++kmixctrl_la_LIBADD = libkmixctrl_main.la + kmixctrl_la_LDFLAGS = $(all_libraries) -module -avoid-version + + #>- kmix_panelapplet_la_METASOURCES = AUTO +@@ -352,19 +360,11 @@ + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES) + +-kmix_la_DEPENDENCIES = +-am_kmix_la_OBJECTS = main.lo kmix.lo kmixdockwidget.lo kmixprefdlg.lo \ +- kmixerwidget.lo channel.lo mixer.lo ksmallslider.lo volume.lo \ +- kledbutton.lo mixdevicewidget.lo ++kmix_la_DEPENDENCIES = libkmix_main.la ++am_kmix_la_OBJECTS = kmix_main.lo + #>- kmix_la_OBJECTS = $(am_kmix_la_OBJECTS) +-#>+ 7 +-kmix_la_final_OBJECTS = kmix_la.all_cpp.lo +-kmix_la_nofinal_OBJECTS = main.lo kmix.lo kmixdockwidget.lo kmixprefdlg.lo \ +- kmixerwidget.lo channel.lo mixer.lo ksmallslider.lo volume.lo \ +- kledbutton.lo mixdevicewidget.lo \ +- kmix_la_meta_unload.lo +-@KDE_USE_FINAL_FALSE@kmix_la_OBJECTS = $(kmix_la_nofinal_OBJECTS) +-@KDE_USE_FINAL_TRUE@kmix_la_OBJECTS = $(kmix_la_final_OBJECTS) ++#>+ 1 ++kmix_la_OBJECTS = kmix_main.lo + kmix_panelapplet_la_DEPENDENCIES = + am_kmix_panelapplet_la_OBJECTS = kmixapplet.lo kmixerwidget.lo \ + channel.lo mixer.lo ksmallslider.lo volume.lo kledbutton.lo \ +@@ -378,28 +378,48 @@ + kmix_panelapplet_la_meta_unload.lo + @KDE_USE_FINAL_FALSE@kmix_panelapplet_la_OBJECTS = $(kmix_panelapplet_la_nofinal_OBJECTS) + @KDE_USE_FINAL_TRUE@kmix_panelapplet_la_OBJECTS = $(kmix_panelapplet_la_final_OBJECTS) +-kmixctrl_la_DEPENDENCIES = +-am_kmixctrl_la_OBJECTS = kmixctrl.lo channel.lo mixer.lo volume.lo ++kmixctrl_la_DEPENDENCIES = libkmixctrl_main.la ++am_kmixctrl_la_OBJECTS = kmixctrl_main.lo + #>- kmixctrl_la_OBJECTS = $(am_kmixctrl_la_OBJECTS) +-#>+ 5 +-kmixctrl_la_final_OBJECTS = kmixctrl_la.all_cpp.lo +-kmixctrl_la_nofinal_OBJECTS = kmixctrl.lo channel.lo mixer.lo volume.lo \ +- kmixctrl_la_meta_unload.lo +-@KDE_USE_FINAL_FALSE@kmixctrl_la_OBJECTS = $(kmixctrl_la_nofinal_OBJECTS) +-@KDE_USE_FINAL_TRUE@kmixctrl_la_OBJECTS = $(kmixctrl_la_final_OBJECTS) ++#>+ 1 ++kmixctrl_la_OBJECTS = kmixctrl_main.lo ++libkmix_main_la_DEPENDENCIES = ++am_libkmix_main_la_OBJECTS = main.lo kmix.lo kmixdockwidget.lo \ ++ kmixprefdlg.lo kmixerwidget.lo channel.lo mixer.lo \ ++ ksmallslider.lo volume.lo kledbutton.lo mixdevicewidget.lo ++#>- libkmix_main_la_OBJECTS = $(am_libkmix_main_la_OBJECTS) ++#>+ 7 ++libkmix_main_la_final_OBJECTS = libkmix_main_la.all_cpp.lo ++libkmix_main_la_nofinal_OBJECTS = main.lo kmix.lo kmixdockwidget.lo \ ++ kmixprefdlg.lo kmixerwidget.lo channel.lo mixer.lo \ ++ ksmallslider.lo volume.lo kledbutton.lo mixdevicewidget.lo \ ++ libkmix_main_la_meta_unload.lo ++@KDE_USE_FINAL_FALSE@libkmix_main_la_OBJECTS = $(libkmix_main_la_nofinal_OBJECTS) ++@KDE_USE_FINAL_TRUE@libkmix_main_la_OBJECTS = $(libkmix_main_la_final_OBJECTS) ++libkmixctrl_main_la_DEPENDENCIES = ++am_libkmixctrl_main_la_OBJECTS = kmixctrl.lo channel.lo mixer.lo \ ++ volume.lo ++#>- libkmixctrl_main_la_OBJECTS = $(am_libkmixctrl_main_la_OBJECTS) ++#>+ 6 ++libkmixctrl_main_la_final_OBJECTS = libkmixctrl_main_la.all_cpp.lo ++libkmixctrl_main_la_nofinal_OBJECTS = kmixctrl.lo channel.lo mixer.lo \ ++ volume.lo \ ++ libkmixctrl_main_la_meta_unload.lo ++@KDE_USE_FINAL_FALSE@libkmixctrl_main_la_OBJECTS = $(libkmixctrl_main_la_nofinal_OBJECTS) ++@KDE_USE_FINAL_TRUE@libkmixctrl_main_la_OBJECTS = $(libkmixctrl_main_la_final_OBJECTS) + bin_PROGRAMS = kmix$(EXEEXT) kmixctrl$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) + +-am_kmix_OBJECTS = dummy.$(OBJEXT) ++am_kmix_OBJECTS = kmix_main.$(OBJEXT) + #>- kmix_OBJECTS = $(am_kmix_OBJECTS) + #>+ 1 +-kmix_OBJECTS = dummy.$(OBJEXT) +-kmix_DEPENDENCIES = kmix.la +-am_kmixctrl_OBJECTS = dummy.$(OBJEXT) ++kmix_OBJECTS = kmix_main.$(OBJEXT) ++kmix_DEPENDENCIES = libkmix_main.la ++am_kmixctrl_OBJECTS = kmixctrl_main.$(OBJEXT) + #>- kmixctrl_OBJECTS = $(am_kmixctrl_OBJECTS) + #>+ 1 +-kmixctrl_OBJECTS = dummy.$(OBJEXT) +-kmixctrl_DEPENDENCIES = kmixctrl.la ++kmixctrl_OBJECTS = kmixctrl_main.$(OBJEXT) ++kmixctrl_DEPENDENCIES = libkmixctrl_main.la + + DEFS = @DEFS@ + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +@@ -407,9 +427,11 @@ + LDFLAGS = @LDFLAGS@ + LIBS = @LIBS@ + depcomp = $(SHELL) $(top_srcdir)/admin/depcomp +-@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/channel.Plo $(DEPDIR)/dummy.Po \ +- @AMDEP_TRUE@ $(DEPDIR)/kledbutton.Plo $(DEPDIR)/kmix.Plo \ +- @AMDEP_TRUE@ $(DEPDIR)/kmixapplet.Plo $(DEPDIR)/kmixctrl.Plo \ ++@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/channel.Plo $(DEPDIR)/kledbutton.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/kmix.Plo $(DEPDIR)/kmix_main.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/kmix_main.Po $(DEPDIR)/kmixapplet.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/kmixctrl.Plo $(DEPDIR)/kmixctrl_main.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/kmixctrl_main.Po \ + @AMDEP_TRUE@ $(DEPDIR)/kmixdockwidget.Plo \ + @AMDEP_TRUE@ $(DEPDIR)/kmixerwidget.Plo \ + @AMDEP_TRUE@ $(DEPDIR)/kmixprefdlg.Plo \ +@@ -436,7 +458,9 @@ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ + CXXFLAGS = @CXXFLAGS@ + DIST_SOURCES = $(kmix_la_SOURCES) $(kmix_panelapplet_la_SOURCES) \ +- $(kmixctrl_la_SOURCES) $(kmix_SOURCES) $(kmixctrl_SOURCES) ++ $(kmixctrl_la_SOURCES) $(libkmix_main_la_SOURCES) \ ++ $(libkmixctrl_main_la_SOURCES) $(kmix_SOURCES) \ ++ $(kmixctrl_SOURCES) + DATA = $(apps_DATA) $(lnk_DATA) $(rc_DATA) $(services_DATA) + + HEADERS = $(noinst_HEADERS) +@@ -448,7 +472,7 @@ + uninstall-recursive check-recursive installcheck-recursive + DIST_COMMON = $(noinst_HEADERS) AUTHORS Makefile.am Makefile.in + DIST_SUBDIRS = $(SUBDIRS) +-SOURCES = $(kmix_la_SOURCES) $(kmix_panelapplet_la_SOURCES) $(kmixctrl_la_SOURCES) $(kmix_SOURCES) $(kmixctrl_SOURCES) ++SOURCES = $(kmix_la_SOURCES) $(kmix_panelapplet_la_SOURCES) $(kmixctrl_la_SOURCES) $(libkmix_main_la_SOURCES) $(libkmixctrl_main_la_SOURCES) $(kmix_SOURCES) $(kmixctrl_SOURCES) + + #>- all: all-recursive + #>+ 1 +@@ -523,6 +547,10 @@ + $(CXXLINK) -rpath $(kde_moduledir) $(kmix_panelapplet_la_LDFLAGS) $(kmix_panelapplet_la_OBJECTS) $(kmix_panelapplet_la_LIBADD) $(LIBS) + kmixctrl.la: $(kmixctrl_la_OBJECTS) $(kmixctrl_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(kmixctrl_la_LDFLAGS) $(kmixctrl_la_OBJECTS) $(kmixctrl_la_LIBADD) $(LIBS) ++libkmix_main.la: $(libkmix_main_la_OBJECTS) $(libkmix_main_la_DEPENDENCIES) ++ $(CXXLINK) -rpath $(libdir) $(libkmix_main_la_LDFLAGS) $(libkmix_main_la_OBJECTS) $(libkmix_main_la_LIBADD) $(LIBS) ++libkmixctrl_main.la: $(libkmixctrl_main_la_OBJECTS) $(libkmixctrl_main_la_DEPENDENCIES) ++ $(CXXLINK) -rpath $(libdir) $(libkmixctrl_main_la_LDFLAGS) $(libkmixctrl_main_la_OBJECTS) $(libkmixctrl_main_la_LIBADD) $(LIBS) + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(bindir) +@@ -561,11 +589,14 @@ + -rm -f *.tab.c + + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/channel.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kledbutton.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kmix.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kmix_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kmix_main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kmixapplet.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kmixctrl.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kmixctrl_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kmixctrl_main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kmixdockwidget.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kmixerwidget.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kmixprefdlg.Plo@am__quote@ +@@ -760,7 +791,7 @@ + + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=mixer_irix.h mixer_hpux.cpp resource.h mixer_irix.cpp mixer_sun.h mixer_none.cpp mixer_none.h mixer_alsa.cpp kmixapplet.desktop colorwidget.ui kmix-platforms.cpp configure.in.in mixer_hpux.h kmixui.rc kmixctrl_restore.desktop mixer_oss.cpp mixer_sun.cpp mixer_oss.h mixer_alsa.h ++KDE_DIST=colorwidget.ui kmix-platforms.cpp configure.in.in mixer_hpux.h mixer_irix.h mixer_hpux.cpp kmixui.rc kmixctrl_restore.desktop resource.h mixer_oss.cpp mixer_irix.cpp mixer_sun.h mixer_sun.cpp mixer_none.cpp mixer_none.h mixer_oss.h mixer_alsa.cpp kmixapplet.desktop mixer_alsa.h + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + +@@ -914,9 +945,6 @@ + + messages: rc.cpp + $(XGETTEXT) *.cpp -o $(podir)/kmix.pot +- +-dummy.cpp: +- echo > dummy.cpp + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +@@ -1003,19 +1031,6 @@ + + + #>+ 12 +-kmix_la_meta_unload.cpp: kmixdockwidget.moc mixdevicewidget.moc ksmallslider.moc kmixprefdlg.moc mixer.moc kmix.moc kledbutton.moc kmixerwidget.moc +- @echo 'creating kmix_la_meta_unload.cpp' +- @-rm -f kmix_la_meta_unload.cpp +- @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_kmix_la[] = {' > kmix_la_meta_unload.cpp ;\ +- cat kmixdockwidget.moc mixdevicewidget.moc ksmallslider.moc kmixprefdlg.moc mixer.moc kmix.moc kledbutton.moc kmixerwidget.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kmix_la_meta_unload.cpp ;\ +- echo '0};' >> kmix_la_meta_unload.cpp ;\ +- echo '#include <kunload.h>' >> kmix_la_meta_unload.cpp ;\ +- echo '_UNLOAD(kmix_la)' >> kmix_la_meta_unload.cpp ;\ +- else echo > kmix_la_meta_unload.cpp; fi +- +- +-#>+ 12 + kmix_panelapplet_la_meta_unload.cpp: mixdevicewidget.moc ksmallslider.moc colorwidget.moc mixer.moc kmixapplet.moc kledbutton.moc kmixerwidget.moc + @echo 'creating kmix_panelapplet_la_meta_unload.cpp' + @-rm -f kmix_panelapplet_la_meta_unload.cpp +@@ -1029,28 +1044,41 @@ + + + #>+ 12 +-kmixctrl_la_meta_unload.cpp: mixer.moc +- @echo 'creating kmixctrl_la_meta_unload.cpp' +- @-rm -f kmixctrl_la_meta_unload.cpp ++libkmix_main_la_meta_unload.cpp: kmixdockwidget.moc mixdevicewidget.moc ksmallslider.moc kmixprefdlg.moc mixer.moc kmix.moc kledbutton.moc kmixerwidget.moc ++ @echo 'creating libkmix_main_la_meta_unload.cpp' ++ @-rm -f libkmix_main_la_meta_unload.cpp ++ @if test ${kde_qtver} = 2; then \ ++ echo 'static const char * _metalist_libkmix_main_la[] = {' > libkmix_main_la_meta_unload.cpp ;\ ++ cat kmixdockwidget.moc mixdevicewidget.moc ksmallslider.moc kmixprefdlg.moc mixer.moc kmix.moc kledbutton.moc kmixerwidget.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkmix_main_la_meta_unload.cpp ;\ ++ echo '0};' >> libkmix_main_la_meta_unload.cpp ;\ ++ echo '#include <kunload.h>' >> libkmix_main_la_meta_unload.cpp ;\ ++ echo '_UNLOAD(libkmix_main_la)' >> libkmix_main_la_meta_unload.cpp ;\ ++ else echo > libkmix_main_la_meta_unload.cpp; fi ++ ++ ++#>+ 12 ++libkmixctrl_main_la_meta_unload.cpp: mixer.moc ++ @echo 'creating libkmixctrl_main_la_meta_unload.cpp' ++ @-rm -f libkmixctrl_main_la_meta_unload.cpp + @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_kmixctrl_la[] = {' > kmixctrl_la_meta_unload.cpp ;\ +- cat mixer.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kmixctrl_la_meta_unload.cpp ;\ +- echo '0};' >> kmixctrl_la_meta_unload.cpp ;\ +- echo '#include <kunload.h>' >> kmixctrl_la_meta_unload.cpp ;\ +- echo '_UNLOAD(kmixctrl_la)' >> kmixctrl_la_meta_unload.cpp ;\ +- else echo > kmixctrl_la_meta_unload.cpp; fi ++ echo 'static const char * _metalist_libkmixctrl_main_la[] = {' > libkmixctrl_main_la_meta_unload.cpp ;\ ++ cat mixer.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkmixctrl_main_la_meta_unload.cpp ;\ ++ echo '0};' >> libkmixctrl_main_la_meta_unload.cpp ;\ ++ echo '#include <kunload.h>' >> libkmixctrl_main_la_meta_unload.cpp ;\ ++ echo '_UNLOAD(libkmixctrl_main_la)' >> libkmixctrl_main_la_meta_unload.cpp ;\ ++ else echo > libkmixctrl_main_la_meta_unload.cpp; fi + + + #>+ 3 + clean-moc-classes: +- -rm -f kmix_la_meta_unload.cpp kmix_panelapplet_la_meta_unload.cpp kmixctrl_la_meta_unload.cpp ++ -rm -f kmix_panelapplet_la_meta_unload.cpp libkmix_main_la_meta_unload.cpp libkmixctrl_main_la_meta_unload.cpp + + #>+ 11 +-kmix_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kmix.cpp $(srcdir)/kmixdockwidget.cpp $(srcdir)/kmixprefdlg.cpp $(srcdir)/kmixerwidget.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/ksmallslider.cpp $(srcdir)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/mixdevicewidget.cpp kmix_la_meta_unload.cpp ++kmix_la.all_cpp.cpp: $(srcdir)/Makefile.in kmix_main.cpp + @echo 'creating kmix_la.all_cpp.cpp ...'; \ + rm -f kmix_la.all_cpp.files kmix_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kmix_la.all_cpp.final; \ +- for file in main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp kmixerwidget.cpp channel.cpp mixer.cpp ksmallslider.cpp volume.cpp kledbutton.cpp mixdevicewidget.cpp kmix_la_meta_unload.cpp ; do \ ++ for file in kmix_main.cpp ; do \ + echo "#include \"$$file\"" >> kmix_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kmix_la.all_cpp.final; \ + done; \ +@@ -1070,11 +1098,11 @@ + rm -f kmix_panelapplet_la.all_cpp.final kmix_panelapplet_la.all_cpp.files + + #>+ 11 +-kmixctrl_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmixctrl.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/volume.cpp kmixctrl_la_meta_unload.cpp ++kmixctrl_la.all_cpp.cpp: $(srcdir)/Makefile.in kmixctrl_main.cpp + @echo 'creating kmixctrl_la.all_cpp.cpp ...'; \ + rm -f kmixctrl_la.all_cpp.files kmixctrl_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kmixctrl_la.all_cpp.final; \ +- for file in kmixctrl.cpp channel.cpp mixer.cpp volume.cpp kmixctrl_la_meta_unload.cpp ; do \ ++ for file in kmixctrl_main.cpp ; do \ + echo "#include \"$$file\"" >> kmixctrl_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kmixctrl_la.all_cpp.final; \ + done; \ +@@ -1082,11 +1110,35 @@ + rm -f kmixctrl_la.all_cpp.final kmixctrl_la.all_cpp.files + + #>+ 11 +-kmix.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp ++libkmix_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kmix.cpp $(srcdir)/kmixdockwidget.cpp $(srcdir)/kmixprefdlg.cpp $(srcdir)/kmixerwidget.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/ksmallslider.cpp $(srcdir)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/mixdevicewidget.cpp libkmix_main_la_meta_unload.cpp ++ @echo 'creating libkmix_main_la.all_cpp.cpp ...'; \ ++ rm -f libkmix_main_la.all_cpp.files libkmix_main_la.all_cpp.final; \ ++ echo "#define KDE_USE_FINAL 1" >> libkmix_main_la.all_cpp.final; \ ++ for file in main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp kmixerwidget.cpp channel.cpp mixer.cpp ksmallslider.cpp volume.cpp kledbutton.cpp mixdevicewidget.cpp libkmix_main_la_meta_unload.cpp ; do \ ++ echo "#include \"$$file\"" >> libkmix_main_la.all_cpp.files; \ ++ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkmix_main_la.all_cpp.final; \ ++ done; \ ++ cat libkmix_main_la.all_cpp.final libkmix_main_la.all_cpp.files > libkmix_main_la.all_cpp.cpp; \ ++ rm -f libkmix_main_la.all_cpp.final libkmix_main_la.all_cpp.files ++ ++#>+ 11 ++libkmixctrl_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmixctrl.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/volume.cpp libkmixctrl_main_la_meta_unload.cpp ++ @echo 'creating libkmixctrl_main_la.all_cpp.cpp ...'; \ ++ rm -f libkmixctrl_main_la.all_cpp.files libkmixctrl_main_la.all_cpp.final; \ ++ echo "#define KDE_USE_FINAL 1" >> libkmixctrl_main_la.all_cpp.final; \ ++ for file in kmixctrl.cpp channel.cpp mixer.cpp volume.cpp libkmixctrl_main_la_meta_unload.cpp ; do \ ++ echo "#include \"$$file\"" >> libkmixctrl_main_la.all_cpp.files; \ ++ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkmixctrl_main_la.all_cpp.final; \ ++ done; \ ++ cat libkmixctrl_main_la.all_cpp.final libkmixctrl_main_la.all_cpp.files > libkmixctrl_main_la.all_cpp.cpp; \ ++ rm -f libkmixctrl_main_la.all_cpp.final libkmixctrl_main_la.all_cpp.files ++ ++#>+ 11 ++kmix.all_cpp.cpp: $(srcdir)/Makefile.in kmix_main.cpp + @echo 'creating kmix.all_cpp.cpp ...'; \ + rm -f kmix.all_cpp.files kmix.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kmix.all_cpp.final; \ +- for file in dummy.cpp ; do \ ++ for file in kmix_main.cpp ; do \ + echo "#include \"$$file\"" >> kmix.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kmix.all_cpp.final; \ + done; \ +@@ -1094,11 +1146,11 @@ + rm -f kmix.all_cpp.final kmix.all_cpp.files + + #>+ 11 +-kmixctrl.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp ++kmixctrl.all_cpp.cpp: $(srcdir)/Makefile.in kmixctrl_main.cpp + @echo 'creating kmixctrl.all_cpp.cpp ...'; \ + rm -f kmixctrl.all_cpp.files kmixctrl.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kmixctrl.all_cpp.final; \ +- for file in dummy.cpp ; do \ ++ for file in kmixctrl_main.cpp ; do \ + echo "#include \"$$file\"" >> kmixctrl.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kmixctrl.all_cpp.final; \ + done; \ +@@ -1107,20 +1159,20 @@ + + #>+ 3 + clean-final: +- -rm -f kmix_la.all_cpp.cpp kmix_panelapplet_la.all_cpp.cpp kmixctrl_la.all_cpp.cpp kmix.all_cpp.cpp kmixctrl.all_cpp.cpp ++ -rm -f kmix_la.all_cpp.cpp kmix_panelapplet_la.all_cpp.cpp kmixctrl_la.all_cpp.cpp libkmix_main_la.all_cpp.cpp libkmixctrl_main_la.all_cpp.cpp kmix.all_cpp.cpp kmixctrl.all_cpp.cpp + + #>+ 2 + final: +- $(MAKE) kmix_la_OBJECTS="$(kmix_la_final_OBJECTS)" kmix_panelapplet_la_OBJECTS="$(kmix_panelapplet_la_final_OBJECTS)" kmixctrl_la_OBJECTS="$(kmixctrl_la_final_OBJECTS)" all-am ++ $(MAKE) kmix_panelapplet_la_OBJECTS="$(kmix_panelapplet_la_final_OBJECTS)" libkmix_main_la_OBJECTS="$(libkmix_main_la_final_OBJECTS)" libkmixctrl_main_la_OBJECTS="$(libkmixctrl_main_la_final_OBJECTS)" all-am + #>+ 2 + final-install: +- $(MAKE) kmix_la_OBJECTS="$(kmix_la_final_OBJECTS)" kmix_panelapplet_la_OBJECTS="$(kmix_panelapplet_la_final_OBJECTS)" kmixctrl_la_OBJECTS="$(kmixctrl_la_final_OBJECTS)" install-am ++ $(MAKE) kmix_panelapplet_la_OBJECTS="$(kmix_panelapplet_la_final_OBJECTS)" libkmix_main_la_OBJECTS="$(libkmix_main_la_final_OBJECTS)" libkmixctrl_main_la_OBJECTS="$(libkmixctrl_main_la_final_OBJECTS)" install-am + #>+ 2 + no-final: +- $(MAKE) kmix_la_OBJECTS="$(kmix_la_nofinal_OBJECTS)" kmix_panelapplet_la_OBJECTS="$(kmix_panelapplet_la_nofinal_OBJECTS)" kmixctrl_la_OBJECTS="$(kmixctrl_la_nofinal_OBJECTS)" all-am ++ $(MAKE) kmix_panelapplet_la_OBJECTS="$(kmix_panelapplet_la_nofinal_OBJECTS)" libkmix_main_la_OBJECTS="$(libkmix_main_la_nofinal_OBJECTS)" libkmixctrl_main_la_OBJECTS="$(libkmixctrl_main_la_nofinal_OBJECTS)" all-am + #>+ 2 + no-final-install: +- $(MAKE) kmix_la_OBJECTS="$(kmix_la_nofinal_OBJECTS)" kmix_panelapplet_la_OBJECTS="$(kmix_panelapplet_la_nofinal_OBJECTS)" kmixctrl_la_OBJECTS="$(kmixctrl_la_nofinal_OBJECTS)" install-am ++ $(MAKE) kmix_panelapplet_la_OBJECTS="$(kmix_panelapplet_la_nofinal_OBJECTS)" libkmix_main_la_OBJECTS="$(libkmix_main_la_nofinal_OBJECTS)" libkmixctrl_main_la_OBJECTS="$(libkmixctrl_main_la_nofinal_OBJECTS)" install-am + #>+ 3 + cvs-clean: + $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/audio/kdemultimedia3/patches/patch-al b/audio/kdemultimedia3/patches/patch-al new file mode 100644 index 00000000000..f3e855d85c8 --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-al @@ -0,0 +1,34 @@ +$NetBSD: patch-al,v 1.1.1.1.2.2 2002/06/23 18:38:08 jlam Exp $ + +--- kmix/kmix_main.cpp.orig Thu May 30 20:46:07 2002 ++++ kmix/kmix_main.cpp +@@ -0,0 +1,29 @@ ++/* ++ * ++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a copy ++ * of this software and associated documentation files (the "Software"), to deal ++ * in the Software without restriction, including without limitation the rights ++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++ * copies of the Software, and to permit persons to whom the Software is ++ * furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in ++ * all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ * ++ */ ++ ++extern "C" int kdemain(int argc, char* argv[]); ++ ++int main( int argc, char* argv[] ) ++{ ++ return kdemain(argc, argv); ++} diff --git a/audio/kdemultimedia3/patches/patch-am b/audio/kdemultimedia3/patches/patch-am new file mode 100644 index 00000000000..4c727eec5bb --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-am @@ -0,0 +1,15 @@ +$NetBSD: patch-am,v 1.1.1.1.4.2 2002/06/23 18:38:08 jlam Exp $ + +--- kmix/kmixctrl.cpp.orig Sun Jan 6 04:17:43 2002 ++++ kmix/kmixctrl.cpp +@@ -44,7 +44,9 @@ + // INSERT YOUR COMMANDLINE OPTIONS HERE + }; + +-int main(int argc, char *argv[]) ++extern "C" int kdemain(int argc, char *argv[]); ++ ++int kdemain(int argc, char *argv[]) + { + KLocale::setMainCatalogue("kmix"); + KAboutData aboutData( "kmixctrl", I18N_NOOP("KMixCtrl"), diff --git a/audio/kdemultimedia3/patches/patch-an b/audio/kdemultimedia3/patches/patch-an new file mode 100644 index 00000000000..37675560556 --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-an @@ -0,0 +1,34 @@ +$NetBSD: patch-an,v 1.1.1.1.2.2 2002/06/23 18:38:08 jlam Exp $ + +--- kmix/kmixctrl_main.cpp.orig Thu May 30 20:46:08 2002 ++++ kmix/kmixctrl_main.cpp +@@ -0,0 +1,29 @@ ++/* ++ * ++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a copy ++ * of this software and associated documentation files (the "Software"), to deal ++ * in the Software without restriction, including without limitation the rights ++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++ * copies of the Software, and to permit persons to whom the Software is ++ * furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in ++ * all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ * ++ */ ++ ++extern "C" int kdemain(int argc, char* argv[]); ++ ++int main( int argc, char* argv[] ) ++{ ++ return kdemain(argc, argv); ++} diff --git a/audio/kdemultimedia3/patches/patch-ao b/audio/kdemultimedia3/patches/patch-ao new file mode 100644 index 00000000000..2430913f2a8 --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-ao @@ -0,0 +1,15 @@ +$NetBSD: patch-ao,v 1.1.1.1.4.2 2002/06/23 18:38:09 jlam Exp $ + +--- kmix/main.cpp.orig Sun Jan 6 04:17:43 2002 ++++ kmix/main.cpp +@@ -37,7 +37,9 @@ + // INSERT YOUR COMMANDLINE OPTIONS HERE + }; + +-int main(int argc, char *argv[]) ++extern "C" int kdemain(int, char *[]); ++ ++int kdemain(int argc, char *argv[]) + { + KAboutData aboutData( "kmix", I18N_NOOP("KMix"), + APP_VERSION, description, KAboutData::License_GPL, diff --git a/audio/kdemultimedia3/patches/patch-ap b/audio/kdemultimedia3/patches/patch-ap new file mode 100644 index 00000000000..67884472b16 --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-ap @@ -0,0 +1,37 @@ +$NetBSD: patch-ap,v 1.1.1.1.2.2 2002/06/23 18:38:10 jlam Exp $ + +--- kscd/libwm/include/wm_config.h.orig Wed May 8 19:29:23 2002 ++++ kscd/libwm/include/wm_config.h +@@ -128,11 +128,31 @@ + *** ****** ** ** ****** ****** ** ****** ** * ********** + *** ****** ** ** ** ** **** *** *********** + ******************************************************************/ +-#if defined(__FreeBSD__) || defined(__FreeBSD) || defined(__NetBSD__) || defined(__NetBSD) ++#if defined(__FreeBSD__) || defined(__FreeBSD) + + #define DEFAULT_CD_DEVICE "/dev/rmatcd0c" + ++ + #endif /* freebsd */ ++ ++/****************************************************************** ++ * NetBSD ++ ****************************************************************** ++ *** *** ** ** ** **** *** ***************** ++ *** ** ** ******** **** ** ** ****** * **************** ++ *** * * ** ****** **** ****** **** ** *************** ++ *** ** ** ******** **** ** ****** ** * **************** ++ *** *** ** **** **** **** *** ***************** ++ ******************************************************************/ ++#if defined(__NetBSD__) || defined(__NetBSD) ++ ++#if defined(__i386__) ++#define DEFAULT_CD_DEVICE "/dev/rcd0d" ++#else ++#define DEFAULT_CD_DEVICE "/dev/rcd0c" ++#endif ++ ++#endif /* netbsd */ + + /****************************************************************** + * HP-UX diff --git a/audio/kdemultimedia3/patches/patch-aq b/audio/kdemultimedia3/patches/patch-aq new file mode 100644 index 00000000000..044ba30b22e --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-aq @@ -0,0 +1,44 @@ +$NetBSD: patch-aq,v 1.1.1.1.2.2 2002/06/23 18:38:11 jlam Exp $ + +--- kscd/libwm/plat_freebsd.c.orig Fri Jan 11 03:19:57 2002 ++++ kscd/libwm/plat_freebsd.c +@@ -34,3 +34,3 @@ + +-#if defined(__FreeBSD__) || defined(__FreeBSD) || defined(__NetBSD__) || defined (__NetBSD) ++#if defined(__FreeBSD__) || defined(__FreeBSD) || defined(__NetBSD__) + +@@ -52,3 +52,3 @@ + +-#if defined(__NetBSD__) || defined(__OpenBSD__) ++#if defined(__OpenBSD__) + # define MSF_MINUTES 1 +@@ -59,2 +59,5 @@ + # include "/sys/scsi/scsi_cd.h" ++#elif defined(__NetBSD__) ++#include <sys/scsiio.h> ++#include <dev/scsipi/scsipi_cd.h> + #else +@@ -235,7 +238,2 @@ + dopos: +-#ifdef __NetBSD__ +- *pos = scd.what.position.absaddr[MSF_MINUTES] * 60 * 75 + +- scd.what.position.absaddr[MSF_SECONDS] * 75 + +- scd.what.position.absaddr[MSF_FRAMES]; +-#else + *pos = scd.what.position.absaddr.msf.minute * 60 * 75 + +@@ -243,3 +241,2 @@ + scd.what.position.absaddr.msf.frame; +-#endif + *track = scd.what.position.track_number; +@@ -310,7 +307,2 @@ + +-#ifdef __NetBSD__ +- *startframe = toc_buffer.addr[MSF_MINUTES]*60*75 + +- toc_buffer.addr[MSF_SECONDS] * 75 + +- toc_buffer.addr[MSF_FRAMES]; +-#else + *startframe = toc_buffer.addr.msf.minute*60*75 + +@@ -318,3 +310,2 @@ + toc_buffer.addr.msf.frame; +-#endif + diff --git a/audio/kdemultimedia3/patches/patch-ar b/audio/kdemultimedia3/patches/patch-ar new file mode 100644 index 00000000000..0c67d2173ce --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-ar @@ -0,0 +1,13 @@ +$NetBSD: patch-ar,v 1.1.1.1.4.2 2002/06/23 18:38:12 jlam Exp $ + +--- mpeglib/lib/util/audio/Makefile.in.orig Tue May 14 01:53:27 2002 ++++ mpeglib/lib/util/audio/Makefile.in +@@ -311,7 +311,7 @@ + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(noinst_LTLIBRARIES) + +-libaudio_la_LDFLAGS = ++libaudio_la_LDFLAGS = $(LIBOSSAUDIO) + libaudio_la_LIBADD = + am_libaudio_la_OBJECTS = audioIO.lo dspWrapper.lo + #>- libaudio_la_OBJECTS = $(am_libaudio_la_OBJECTS) diff --git a/audio/kdemultimedia3/patches/patch-as b/audio/kdemultimedia3/patches/patch-as new file mode 100644 index 00000000000..9072639d04f --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-as @@ -0,0 +1,31 @@ +$NetBSD: patch-as,v 1.1.1.1.2.2 2002/06/23 18:38:13 jlam Exp $ + +--- mpeglib/lib/util/audio/audioIO_Linux.cpp.orig Tue Jun 5 19:55:39 2001 ++++ mpeglib/lib/util/audio/audioIO_Linux.cpp +@@ -40,7 +40,7 @@ + #include <sys/soundcard.h> + #else + // fallback: +-#include <linux/soundcard.h> ++#include <soundcard.h> /* NetBSD has <soundcard.h> */ + + #endif + #endif +@@ -48,7 +48,7 @@ + + /* optimal fragment size */ + +-int AUSIZ = 0; ++int ausiz = 0; + + // declare these static to effectively isolate the audio device + +@@ -147,7 +147,7 @@ + exit(0); + } + +- if (ioctl(audio_fd, SNDCTL_DSP_GETBLKSIZE, &AUSIZ) == -1) { ++ if (ioctl(audio_fd, SNDCTL_DSP_GETBLKSIZE, &ausiz) == -1) { + perror("Unable to get fragment size\n"); + exit(0); + } diff --git a/audio/kdemultimedia3/patches/patch-at b/audio/kdemultimedia3/patches/patch-at new file mode 100644 index 00000000000..df3c0da3019 --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-at @@ -0,0 +1,16 @@ +$NetBSD: patch-at,v 1.1.1.1.2.2 2002/06/23 18:38:13 jlam Exp $ + +--- mpeglib/lib/util/render/x11/imageDeskX11.cpp.orig Thu Jan 11 15:40:00 2001 ++++ mpeglib/lib/util/render/x11/imageDeskX11.cpp +@@ -397,7 +397,11 @@ + } + + int bestMode = -1; ++#if defined(__NetBSD__) ++ int border, minBorder = INT_MAX; ++#else + int border, minBorder = MAXINT; ++#endif + + for (i = 0; i < vm_count; i++) { + printf("mode %d: %dx%d\n",i, vm_modelines[i]->hdisplay,vm_modelines[i]->vdisplay); diff --git a/audio/kdemultimedia3/patches/patch-au b/audio/kdemultimedia3/patches/patch-au new file mode 100644 index 00000000000..ed1b16ff9f0 --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-au @@ -0,0 +1,15 @@ +$NetBSD: patch-au,v 1.1.1.1.2.2 2002/06/23 18:38:13 jlam Exp $ + +--- mpeglib/lib/util/render/x11/imageDeskX11.h.orig Wed Dec 6 18:42:08 2000 ++++ mpeglib/lib/util/render/x11/imageDeskX11.h +@@ -13,7 +13,10 @@ + + #ifndef __IMAGEDESKX11_H + #define __IMAGEDESKX11_H ++#if defined(__NetBSD__) ++#else + #include <values.h> ++#endif + #include "xinit.h" + + #include "../imageBase.h" diff --git a/audio/kdemultimedia3/patches/patch-av b/audio/kdemultimedia3/patches/patch-av new file mode 100644 index 00000000000..30fad45166c --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-av @@ -0,0 +1,12 @@ +$NetBSD: patch-av,v 1.1.1.1.2.2 2002/06/23 18:38:14 jlam Exp $ + +--- mpeglib/lib/util/render/x11/imageXVDesk.h.orig Thu Dec 21 17:47:58 2000 ++++ mpeglib/lib/util/render/x11/imageXVDesk.h +@@ -21,7 +21,6 @@ + + #include <iostream.h> + #include <stdio.h> +-#include <semaphore.h> + + //#undef X11_XV + diff --git a/audio/kdemultimedia3/patches/patch-aw b/audio/kdemultimedia3/patches/patch-aw new file mode 100644 index 00000000000..7241720a0da --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-aw @@ -0,0 +1,18 @@ +$NetBSD: patch-aw,v 1.1.1.1.2.2 2002/06/23 18:38:15 jlam Exp $ + +--- mpeglib/lib/util/render/x11/x11Surface.cpp.orig Wed Aug 8 13:04:28 2001 ++++ mpeglib/lib/util/render/x11/x11Surface.cpp +@@ -267,8 +267,13 @@ + XSizeHints hints; + hints.flags = PMaxSize; + if (HAS_RESIZE(newImage)) { ++#if defined(__NetBSD__) ++ hints.max_width = INT_MAX; ++ hints.max_height = INT_MAX; ++#else + hints.max_width = MAXINT; + hints.max_height = MAXINT; ++#endif + } else { + hints.max_width = xWindow->width; + hints.max_height = xWindow->height; diff --git a/audio/kdemultimedia3/patches/patch-ax b/audio/kdemultimedia3/patches/patch-ax new file mode 100644 index 00000000000..8a64db8ce67 --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-ax @@ -0,0 +1,16 @@ +$NetBSD: patch-ax,v 1.1.1.1.2.2 2002/06/23 18:38:16 jlam Exp $ + +--- mpeglib/lib/util/render/x11/x11Surface.h.orig Wed Aug 8 13:04:28 2001 ++++ mpeglib/lib/util/render/x11/x11Surface.h +@@ -14,7 +14,11 @@ + #ifndef __X11SURFACE_H + #define __X11SURFACE_H + ++#if defined(__NetBSD__) ++#include <limits.h> ++#else + #include <values.h> ++#endif + #include "xinit.h" + #include "../surface.h" + #include "initDisplay.h" diff --git a/audio/kdemultimedia3/patches/patch-ay b/audio/kdemultimedia3/patches/patch-ay new file mode 100644 index 00000000000..77dcbe74f31 --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-ay @@ -0,0 +1,36 @@ +$NetBSD: patch-ay,v 1.1.1.1.2.2 2002/06/23 18:38:17 jlam Exp $ + +--- noatun/Makefile.am.orig Sun Mar 3 07:50:51 2002 ++++ noatun/Makefile.am +@@ -4,22 +4,22 @@ + + KDE_ICON = AUTO + ++lib_LTLIBRARIES = libnoatun_main.la + kde_module_LTLIBRARIES = noatun.la +-noatun_la_SOURCES = main.cpp joinhandler.cpp joinhandler.skel ++libnoatun_main_la_SOURCES = main.cpp joinhandler.cpp joinhandler.skel ++libnoatun_main_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) ++libnoatun_main_la_LIBADD = -lqtmcop -lkmedia2_idl -lsoundserver_idl $(top_builddir)/noatun/library/libnoatun.la ++ ++noatun_la_SOURCES = noatun_main.cpp + noatun_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module -avoid-version +-noatun_la_LIBADD = -lqtmcop -lkmedia2_idl -lsoundserver_idl $(top_builddir)/noatun/library/libnoatun.la ++noatun_la_LIBADD = libnoatun_main.la + + bin_PROGRAMS = noatun +-noatun_SOURCES = dummy.cpp ++noatun_SOURCES = noatun_main.cpp + noatun_LDFLAGS = $(all_libraries) $(KDE_RPATH) +-noatun_LDADD = $(LIB_KIO) noatun.la ++noatun_LDADD = libnoatun_main.la + + METASOURCES = AUTO +- +-CLEANFILES = dummy.cpp +- +-dummy.cpp: +- echo > dummy.cpp + + applnk_DATA = noatun.desktop + applnkdir = $(kde_appsdir)/Multimedia diff --git a/audio/kdemultimedia3/patches/patch-az b/audio/kdemultimedia3/patches/patch-az new file mode 100644 index 00000000000..6ff10fc82aa --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-az @@ -0,0 +1,342 @@ +$NetBSD: patch-az,v 1.1.1.1.2.2 2002/06/23 18:38:17 jlam Exp $ + +--- noatun/Makefile.in.orig Tue May 14 01:53:28 2002 ++++ noatun/Makefile.in +@@ -295,22 +295,25 @@ + + KDE_ICON = AUTO + ++lib_LTLIBRARIES = libnoatun_main.la + kde_module_LTLIBRARIES = noatun.la +-#>- noatun_la_SOURCES = main.cpp joinhandler.cpp joinhandler.skel ++#>- libnoatun_main_la_SOURCES = main.cpp joinhandler.cpp joinhandler.skel + #>+ 1 +-noatun_la_SOURCES=main.cpp joinhandler.cpp joinhandler_skel.cpp ++libnoatun_main_la_SOURCES=main.cpp joinhandler.cpp joinhandler_skel.cpp ++libnoatun_main_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) ++libnoatun_main_la_LIBADD = -lqtmcop -lkmedia2_idl -lsoundserver_idl $(top_builddir)/noatun/library/libnoatun.la ++ ++noatun_la_SOURCES = noatun_main.cpp + noatun_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module -avoid-version +-noatun_la_LIBADD = -lqtmcop -lkmedia2_idl -lsoundserver_idl $(top_builddir)/noatun/library/libnoatun.la ++noatun_la_LIBADD = libnoatun_main.la + + bin_PROGRAMS = noatun +-noatun_SOURCES = dummy.cpp ++noatun_SOURCES = noatun_main.cpp + noatun_LDFLAGS = $(all_libraries) $(KDE_RPATH) +-noatun_LDADD = $(LIB_KIO) noatun.la ++noatun_LDADD = libnoatun_main.la + + #>- METASOURCES = AUTO + +-CLEANFILES = dummy.cpp +- + applnk_DATA = noatun.desktop + applnkdir = $(kde_appsdir)/Multimedia + +@@ -328,25 +331,31 @@ + mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = +-LTLIBRARIES = $(kde_module_LTLIBRARIES) ++LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES) + +-noatun_la_DEPENDENCIES = $(top_builddir)/noatun/library/libnoatun.la +-am_noatun_la_OBJECTS = main.lo joinhandler.lo +-#>- noatun_la_OBJECTS = $(am_noatun_la_OBJECTS) ++libnoatun_main_la_DEPENDENCIES = \ ++ $(top_builddir)/noatun/library/libnoatun.la ++am_libnoatun_main_la_OBJECTS = main.lo joinhandler.lo ++#>- libnoatun_main_la_OBJECTS = $(am_libnoatun_main_la_OBJECTS) + #>+ 4 +-noatun_la_final_OBJECTS = noatun_la.all_cpp.lo +-noatun_la_nofinal_OBJECTS = main.lo joinhandler.lo joinhandler_skel.lo +-@KDE_USE_FINAL_FALSE@noatun_la_OBJECTS = $(noatun_la_nofinal_OBJECTS) +-@KDE_USE_FINAL_TRUE@noatun_la_OBJECTS = $(noatun_la_final_OBJECTS) ++libnoatun_main_la_final_OBJECTS = libnoatun_main_la.all_cpp.lo ++libnoatun_main_la_nofinal_OBJECTS = main.lo joinhandler.lo joinhandler_skel.lo ++@KDE_USE_FINAL_FALSE@libnoatun_main_la_OBJECTS = $(libnoatun_main_la_nofinal_OBJECTS) ++@KDE_USE_FINAL_TRUE@libnoatun_main_la_OBJECTS = $(libnoatun_main_la_final_OBJECTS) ++noatun_la_DEPENDENCIES = libnoatun_main.la ++am_noatun_la_OBJECTS = noatun_main.lo ++#>- noatun_la_OBJECTS = $(am_noatun_la_OBJECTS) ++#>+ 1 ++noatun_la_OBJECTS = noatun_main.lo + bin_PROGRAMS = noatun$(EXEEXT) + update_PROGRAMS = noatun20update$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) $(update_PROGRAMS) + +-am_noatun_OBJECTS = dummy.$(OBJEXT) ++am_noatun_OBJECTS = noatun_main.$(OBJEXT) + #>- noatun_OBJECTS = $(am_noatun_OBJECTS) + #>+ 1 +-noatun_OBJECTS = dummy.$(OBJEXT) +-noatun_DEPENDENCIES = noatun.la ++noatun_OBJECTS = noatun_main.$(OBJEXT) ++noatun_DEPENDENCIES = libnoatun_main.la + am_noatun20update_OBJECTS = noatun20update.$(OBJEXT) + #>- noatun20update_OBJECTS = $(am_noatun20update_OBJECTS) + #>+ 1 +@@ -359,8 +368,9 @@ + LDFLAGS = @LDFLAGS@ + LIBS = @LIBS@ + depcomp = $(SHELL) $(top_srcdir)/admin/depcomp +-@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/joinhandler.Plo \ +- @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/noatun20update.Po ++@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/joinhandler.Plo $(DEPDIR)/main.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/noatun20update.Po \ ++ @AMDEP_TRUE@ $(DEPDIR)/noatun_main.Plo $(DEPDIR)/noatun_main.Po + #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + #>+ 2 +@@ -380,8 +390,8 @@ + CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ + CXXFLAGS = @CXXFLAGS@ +-DIST_SOURCES = $(noatun_la_SOURCES) $(noatun_SOURCES) \ +- $(noatun20update_SOURCES) ++DIST_SOURCES = $(libnoatun_main_la_SOURCES) $(noatun_la_SOURCES) \ ++ $(noatun_SOURCES) $(noatun20update_SOURCES) + DATA = $(applnk_DATA) $(presets_DATA) $(update_DATA) + + +@@ -391,7 +401,7 @@ + uninstall-recursive check-recursive installcheck-recursive + DIST_COMMON = COPYING Makefile.am Makefile.in TODO + DIST_SUBDIRS = $(SUBDIRS) +-SOURCES = $(noatun_la_SOURCES) $(noatun_SOURCES) $(noatun20update_SOURCES) ++SOURCES = $(libnoatun_main_la_SOURCES) $(noatun_la_SOURCES) $(noatun_SOURCES) $(noatun20update_SOURCES) + + #>- all: all-recursive + #>+ 1 +@@ -438,6 +448,27 @@ + + clean-kde_moduleLTLIBRARIES: + -test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES) ++install-libLTLIBRARIES: $(lib_LTLIBRARIES) ++ @$(NORMAL_INSTALL) ++ $(mkinstalldirs) $(DESTDIR)$(libdir) ++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ++ if test -f $$p; then \ ++ echo " $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p"; \ ++ $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p; \ ++ else :; fi; \ ++ done ++ ++uninstall-libLTLIBRARIES: ++ @$(NORMAL_UNINSTALL) ++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ ++ done ++ ++clean-libLTLIBRARIES: ++ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) ++libnoatun_main.la: $(libnoatun_main_la_OBJECTS) $(libnoatun_main_la_DEPENDENCIES) ++ $(CXXLINK) -rpath $(libdir) $(libnoatun_main_la_LDFLAGS) $(libnoatun_main_la_OBJECTS) $(libnoatun_main_la_LIBADD) $(LIBS) + noatun.la: $(noatun_la_OBJECTS) $(noatun_la_DEPENDENCIES) + $(CXXLINK) -rpath $(kde_moduledir) $(noatun_la_LDFLAGS) $(noatun_la_OBJECTS) $(noatun_la_LIBADD) $(LIBS) + install-binPROGRAMS: $(bin_PROGRAMS) +@@ -501,10 +532,11 @@ + distclean-compile: + -rm -f *.tab.c + +-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/joinhandler.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/noatun20update.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/noatun_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/noatun_main.Po@am__quote@ + + distclean-depend: + -rm -rf $(DEPDIR) +@@ -674,7 +706,7 @@ + + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=avideoframe.cc hi22-app-noatun.png hi48-app-noatun.png noatun.desktop hi32-app-noatun.png preset.dance CHANGES preset.jazz FILES preset.metal hi16-app-noatun.png preset.trance joinhandler.h noatun.upd configure.in.in avideoframe.h preset.zero artsvideo.idl ++KDE_DIST=preset.trance artsvideo.idl joinhandler.h CHANGES avideoframe.cc noatun.upd configure.in.in preset.jazz hi22-app-noatun.png noatun hi48-app-noatun.png noatun.desktop FILES avideoframe.h preset.metal joinhandler.kidl hi16-app-noatun.png noatun20update preset.zero hi32-app-noatun.png preset.dance dummy.cpp + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + +@@ -714,9 +746,11 @@ + check-am: all-am + check: check-recursive + all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) ++install-binPROGRAMS: install-libLTLIBRARIES ++ + installdirs: installdirs-recursive + installdirs-am: +- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(bindir) $(DESTDIR)$(updatedir) $(DESTDIR)$(applnkdir) $(DESTDIR)$(presetsdir) $(DESTDIR)$(updatedir) ++ $(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(updatedir) $(DESTDIR)$(applnkdir) $(DESTDIR)$(presetsdir) $(DESTDIR)$(updatedir) + + install: install-recursive + install-exec: install-exec-recursive +@@ -734,7 +768,6 @@ + mostlyclean-generic: + + clean-generic: +- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* +@@ -747,10 +780,12 @@ + clean: kde-rpo-clean clean-recursive + + #>- clean-am: clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \ +-#>- clean-libtool clean-updatePROGRAMS mostlyclean-am +-#>+ 2 ++#>- clean-libLTLIBRARIES clean-libtool clean-updatePROGRAMS \ ++#>- mostlyclean-am ++#>+ 3 + clean-am: clean-idl clean-final clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \ +- clean-libtool clean-updatePROGRAMS mostlyclean-am ++ clean-libLTLIBRARIES clean-libtool clean-updatePROGRAMS \ ++ mostlyclean-am + + distclean: distclean-recursive + +@@ -773,9 +808,9 @@ + install-data-am: install-kde-icons install-applnkDATA \ + install-presetsDATA install-updateDATA install-updatePROGRAMS + +-#>- install-exec-am: install-binPROGRAMS ++#>- install-exec-am: install-binPROGRAMS install-libLTLIBRARIES + #>+ 1 +-install-exec-am: install-kde_moduleLTLIBRARIES install-binPROGRAMS ++install-exec-am: install-kde_moduleLTLIBRARIES install-binPROGRAMS install-libLTLIBRARIES + + install-info: install-info-recursive + +@@ -794,43 +829,42 @@ + + #>- uninstall-am: uninstall-applnkDATA uninstall-binPROGRAMS \ + #>- uninstall-info-am uninstall-kde_moduleLTLIBRARIES \ +-#>- uninstall-presetsDATA uninstall-updateDATA \ +-#>- uninstall-updatePROGRAMS ++#>- uninstall-libLTLIBRARIES uninstall-presetsDATA \ ++#>- uninstall-updateDATA uninstall-updatePROGRAMS + #>+ 4 + uninstall-am: uninstall-kde-icons uninstall-applnkDATA uninstall-binPROGRAMS \ + uninstall-info-am uninstall-kde_moduleLTLIBRARIES \ +- uninstall-presetsDATA uninstall-updateDATA \ +- uninstall-updatePROGRAMS ++ uninstall-libLTLIBRARIES uninstall-presetsDATA \ ++ uninstall-updateDATA uninstall-updatePROGRAMS + + uninstall-info: uninstall-info-recursive + + .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ + clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \ +- clean-libtool clean-recursive clean-updatePROGRAMS distclean \ +- distclean-compile distclean-depend distclean-generic \ +- distclean-libtool distclean-recursive distclean-tags distdir \ +- dvi dvi-am dvi-recursive info info-am info-recursive install \ +- install-am install-applnkDATA install-binPROGRAMS install-data \ ++ clean-libLTLIBRARIES clean-libtool clean-recursive \ ++ clean-updatePROGRAMS distclean distclean-compile \ ++ distclean-depend distclean-generic distclean-libtool \ ++ distclean-recursive distclean-tags distdir dvi dvi-am \ ++ dvi-recursive info info-am info-recursive install install-am \ ++ install-applnkDATA install-binPROGRAMS install-data \ + install-data-am install-data-recursive install-exec \ + install-exec-am install-exec-recursive install-info \ + install-info-am install-info-recursive \ +- install-kde_moduleLTLIBRARIES install-man install-presetsDATA \ +- install-recursive install-strip install-updateDATA \ +- install-updatePROGRAMS installcheck installcheck-am installdirs \ +- installdirs-am installdirs-recursive maintainer-clean \ +- maintainer-clean-generic maintainer-clean-recursive mostlyclean \ +- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ +- mostlyclean-recursive tags tags-recursive uninstall \ +- uninstall-am uninstall-applnkDATA uninstall-binPROGRAMS \ +- uninstall-info-am uninstall-info-recursive \ +- uninstall-kde_moduleLTLIBRARIES uninstall-presetsDATA \ ++ install-kde_moduleLTLIBRARIES install-libLTLIBRARIES \ ++ install-man install-presetsDATA install-recursive install-strip \ ++ install-updateDATA install-updatePROGRAMS installcheck \ ++ installcheck-am installdirs installdirs-am \ ++ installdirs-recursive maintainer-clean maintainer-clean-generic \ ++ maintainer-clean-recursive mostlyclean mostlyclean-compile \ ++ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ ++ tags tags-recursive uninstall uninstall-am uninstall-applnkDATA \ ++ uninstall-binPROGRAMS uninstall-info-am \ ++ uninstall-info-recursive uninstall-kde_moduleLTLIBRARIES \ ++ uninstall-libLTLIBRARIES uninstall-presetsDATA \ + uninstall-recursive uninstall-updateDATA \ + uninstall-updatePROGRAMS + + +-dummy.cpp: +- echo > dummy.cpp +- + messages: + $(EXTRACTRC) `find . -name "*.rc"` > rc.cpp + $(XGETTEXT) rc.cpp `find . -name "*.cc" -o -name "*.cpp" -print` -o $(podir)/noatun.pot +@@ -877,11 +911,23 @@ + + + #>+ 11 +-noatun_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/joinhandler.cpp joinhandler_skel.cpp ++libnoatun_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/joinhandler.cpp $(srcdir)/joinhandler_skel.cpp ++ @echo 'creating libnoatun_main_la.all_cpp.cpp ...'; \ ++ rm -f libnoatun_main_la.all_cpp.files libnoatun_main_la.all_cpp.final; \ ++ echo "#define KDE_USE_FINAL 1" >> libnoatun_main_la.all_cpp.final; \ ++ for file in main.cpp joinhandler.cpp joinhandler_skel.cpp ; do \ ++ echo "#include \"$$file\"" >> libnoatun_main_la.all_cpp.files; \ ++ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libnoatun_main_la.all_cpp.final; \ ++ done; \ ++ cat libnoatun_main_la.all_cpp.final libnoatun_main_la.all_cpp.files > libnoatun_main_la.all_cpp.cpp; \ ++ rm -f libnoatun_main_la.all_cpp.final libnoatun_main_la.all_cpp.files ++ ++#>+ 11 ++noatun_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/noatun_main.cpp + @echo 'creating noatun_la.all_cpp.cpp ...'; \ + rm -f noatun_la.all_cpp.files noatun_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> noatun_la.all_cpp.final; \ +- for file in main.cpp joinhandler.cpp joinhandler_skel.cpp ; do \ ++ for file in noatun_main.cpp ; do \ + echo "#include \"$$file\"" >> noatun_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> noatun_la.all_cpp.final; \ + done; \ +@@ -889,11 +935,11 @@ + rm -f noatun_la.all_cpp.final noatun_la.all_cpp.files + + #>+ 11 +-noatun.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp ++noatun.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/noatun_main.cpp + @echo 'creating noatun.all_cpp.cpp ...'; \ + rm -f noatun.all_cpp.files noatun.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> noatun.all_cpp.final; \ +- for file in dummy.cpp ; do \ ++ for file in noatun_main.cpp ; do \ + echo "#include \"$$file\"" >> noatun.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> noatun.all_cpp.final; \ + done; \ +@@ -914,20 +960,20 @@ + + #>+ 3 + clean-final: +- -rm -f noatun_la.all_cpp.cpp noatun.all_cpp.cpp noatun20update.all_cpp.cpp ++ -rm -f libnoatun_main_la.all_cpp.cpp noatun_la.all_cpp.cpp noatun.all_cpp.cpp noatun20update.all_cpp.cpp + + #>+ 2 + final: +- $(MAKE) noatun_la_OBJECTS="$(noatun_la_final_OBJECTS)" all-am ++ $(MAKE) libnoatun_main_la_OBJECTS="$(libnoatun_main_la_final_OBJECTS)" all-am + #>+ 2 + final-install: +- $(MAKE) noatun_la_OBJECTS="$(noatun_la_final_OBJECTS)" install-am ++ $(MAKE) libnoatun_main_la_OBJECTS="$(libnoatun_main_la_final_OBJECTS)" install-am + #>+ 2 + no-final: +- $(MAKE) noatun_la_OBJECTS="$(noatun_la_nofinal_OBJECTS)" all-am ++ $(MAKE) libnoatun_main_la_OBJECTS="$(libnoatun_main_la_nofinal_OBJECTS)" all-am + #>+ 2 + no-final-install: +- $(MAKE) noatun_la_OBJECTS="$(noatun_la_nofinal_OBJECTS)" install-am ++ $(MAKE) libnoatun_main_la_OBJECTS="$(libnoatun_main_la_nofinal_OBJECTS)" install-am + #>+ 3 + cvs-clean: + $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/audio/kdemultimedia3/patches/patch-ba b/audio/kdemultimedia3/patches/patch-ba new file mode 100644 index 00000000000..e293f9946ba --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-ba @@ -0,0 +1,15 @@ +$NetBSD: patch-ba,v 1.1.1.1.2.2 2002/06/23 18:38:18 jlam Exp $ + +--- noatun/main.cpp.orig Wed May 8 19:29:25 2002 ++++ noatun/main.cpp +@@ -24,7 +24,9 @@ + { 0, 0, 0} + }; + +-int main(int argc, char **argv) ++extern "C" int kdemain(int, char **); ++ ++int kdemain(int argc, char **argv) + { + KAboutData aboutData("noatun", I18N_NOOP("Noatun"), + version, description, KAboutData::License_BSD, diff --git a/audio/kdemultimedia3/patches/patch-bb b/audio/kdemultimedia3/patches/patch-bb new file mode 100644 index 00000000000..123b07abbc1 --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-bb @@ -0,0 +1,33 @@ +$NetBSD: patch-bb,v 1.1.1.1.2.2 2002/06/23 18:38:19 jlam Exp $ + +--- noatun/noatun_main.cpp.orig Thu May 30 20:46:08 2002 ++++ noatun/noatun_main.cpp +@@ -0,0 +1,28 @@ ++/* ++ * ++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a copy ++ * of this software and associated documentation files (the "Software"), to deal ++ * in the Software without restriction, including without limitation the rights ++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++ * copies of the Software, and to permit persons to whom the Software is ++ * furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in ++ * all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ */ ++ ++extern "C" int kdemain(int, char* []); ++ ++int main( int argc, char* argv[] ) ++{ ++ return kdemain(argc, argv); ++} diff --git a/audio/lame/Makefile b/audio/lame/Makefile index da64186528e..e845dd4ed43 100644 --- a/audio/lame/Makefile +++ b/audio/lame/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.17 2002/01/07 16:38:31 wiz Exp $ +# $NetBSD: Makefile,v 1.17.2.1 2002/06/23 18:38:20 jlam Exp $ # -VERS= 3.91 +VERS= 3.92 DISTNAME= lame-${VERS} CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lame/} \ diff --git a/audio/lame/distinfo b/audio/lame/distinfo index bceea5faa0d..0b926db236b 100644 --- a/audio/lame/distinfo +++ b/audio/lame/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.5 2002/01/07 16:38:32 wiz Exp $ +$NetBSD: distinfo,v 1.5.2.1 2002/06/23 18:38:20 jlam Exp $ -SHA1 (lame-3.91.tar.gz) = 84759b675f000688cd287fb99a9b407d05df8da4 -Size (lame-3.91.tar.gz) = 873212 bytes +SHA1 (lame-3.92.tar.gz) = 97be7804c7c89b088726124163de94b7432d5ea4 +Size (lame-3.92.tar.gz) = 970894 bytes SHA1 (patch-aa) = cfab96bd36d765cb31c1dcb5259553e10b72af8e SHA1 (patch-ab) = 9cde28d5ab39e3d10a832d49852d059c04af8419 -SHA1 (patch-ac) = d488e6fc8f98362a4750dede9e4c19bcded14ed3 +SHA1 (patch-ac) = 1d84de13fc16187687fe1cd85f61c458df98772b diff --git a/audio/lame/patches/patch-ac b/audio/lame/patches/patch-ac index 15b5dc29476..dab06648186 100644 --- a/audio/lame/patches/patch-ac +++ b/audio/lame/patches/patch-ac @@ -1,13 +1,13 @@ -$NetBSD: patch-ac,v 1.2 2002/01/07 16:38:32 wiz Exp $ +$NetBSD: patch-ac,v 1.2.2.1 2002/06/23 18:38:21 jlam Exp $ ---- frontend/Makefile.in.orig Sun Nov 11 15:57:48 2001 +--- frontend/Makefile.in.orig Fri Apr 12 21:38:18 2002 +++ frontend/Makefile.in -@@ -162,7 +162,7 @@ - @WITH_BRHIST_FALSE@mp3x_SOURCES = mp3x.c gtkanal.c gpkplotting.c $(common_sources) +@@ -166,7 +166,7 @@ + @WITH_BRHIST_FALSE@mp3x__EXEEXT__SOURCES = mp3x.c gtkanal.c gpkplotting.c $(common_sources) CFLAGS = @CFLAGS@ @GTK_CFLAGS@ @FRONTEND_CFLAGS@ -LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ -static +LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ - mp3x_LDADD = $(LDADD) @GTK_LIBS@ + mp3x__EXEEXT__LDADD = $(LDADD) @GTK_LIBS@ diff --git a/audio/liba52/Makefile b/audio/liba52/Makefile index 949a302b271..dda0de7b8ca 100644 --- a/audio/liba52/Makefile +++ b/audio/liba52/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2001/12/11 04:01:34 wiz Exp $ +# $NetBSD: Makefile,v 1.2.2.1 2002/06/23 18:38:21 jlam Exp $ # -DISTNAME= a52dec-0.7.1b -PKGNAME= ${DISTNAME:S/a52dec/liba52/:S/1b/1.2/} +DISTNAME= a52dec-0.7.3 +PKGNAME= ${DISTNAME:S/a52dec/liba52/} CATEGORIES= audio MASTER_SITES= http://liba52.sourceforge.net/files/ diff --git a/audio/liba52/PLIST b/audio/liba52/PLIST index 8ed1e6ef165..12b2158e606 100644 --- a/audio/liba52/PLIST +++ b/audio/liba52/PLIST @@ -1,5 +1,6 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2001/12/10 19:49:46 veego Exp $ +@comment $NetBSD: PLIST,v 1.1.1.1.2.1 2002/06/23 18:38:22 jlam Exp $ include/a52dec/a52.h +include/a52dec/attributes.h include/a52dec/audio_out.h include/a52dec/mm_accel.h lib/liba52.a diff --git a/audio/liba52/distinfo b/audio/liba52/distinfo index 231431f0aad..d4aec2775eb 100644 --- a/audio/liba52/distinfo +++ b/audio/liba52/distinfo @@ -1,10 +1,8 @@ -$NetBSD: distinfo,v 1.2 2002/01/21 21:31:31 wiz Exp $ +$NetBSD: distinfo,v 1.2.2.1 2002/06/23 18:38:22 jlam Exp $ -SHA1 (a52dec-0.7.1b.tar.gz) = 3c46c3acaa922d4c1a246b7390a1c7d64eec5fc0 -Size (a52dec-0.7.1b.tar.gz) = 174184 bytes -SHA1 (patch-aa) = 441e8aa547200e8e32aeabb9a437837ced602b23 -SHA1 (patch-ab) = 50c7507e8a6dd532355377b6049864345beb35fb -SHA1 (patch-ac) = 7f527572156438deac3c6a77a2e631f68f9894d5 -SHA1 (patch-ad) = cba44f6e8cfcdfd8139f33dd84363cfa1bde7a62 -SHA1 (patch-ae) = 59f4c3c666b084e016edbb7efb09a12e217298ba -SHA1 (patch-af) = 2e6ec857bb7b99eb8ea6c27cc997fbf495033575 +SHA1 (a52dec-0.7.3.tar.gz) = cb59c2499215cecd9e79de8cb20b1f3d8232fc6b +Size (a52dec-0.7.3.tar.gz) = 235944 bytes +SHA1 (patch-aa) = f31a0e354ab7f1111c03196bf1a11d7caab0f1e9 +SHA1 (patch-ab) = c51a5d3176705d773e42ceddc1d35c31f112302a +SHA1 (patch-ac) = eb8ef17e2fdb20e34a32c629415b77b123c5a625 +SHA1 (patch-ad) = 2186a4ac36cf44f021fbc1a4d8e7d31b96b71531 diff --git a/audio/liba52/patches/patch-aa b/audio/liba52/patches/patch-aa index 10fa083c0a9..a3fb8f9ad7f 100644 --- a/audio/liba52/patches/patch-aa +++ b/audio/liba52/patches/patch-aa @@ -1,16 +1,13 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/12/10 19:49:46 veego Exp $ +$NetBSD: patch-aa,v 1.1.1.1.2.1 2002/06/23 18:38:23 jlam Exp $ ---- configure-orig Fri Aug 31 11:39:53 2001 -+++ configure Wed Oct 10 21:18:49 2001 -@@ -2663,6 +2663,11 @@ - #define LIBAO_SOLARIS - EOF - ;; +--- libao/configure.incl.orig Sun Feb 17 10:23:15 2002 ++++ libao/configure.incl Thu Jun 13 10:27:49 2002 +@@ -19,6 +19,8 @@ + case "$host" in + *-sun-solaris*) + AC_DEFINE([LIBAO_SOLARIS],,[libao solaris support]);; + *-netbsd*) -+ cat >> confdefs.h <<\EOF -+#define LIBAO_SOLARIS -+EOF -+;; ++ AC_DEFINE([LIBAO_SOLARIS],,[libao solaris compat support]);; esac fi diff --git a/audio/liba52/patches/patch-ab b/audio/liba52/patches/patch-ab index 3acd3ba53aa..112416ba321 100644 --- a/audio/liba52/patches/patch-ab +++ b/audio/liba52/patches/patch-ab @@ -1,10 +1,16 @@ -$NetBSD: patch-ab,v 1.1.1.1 2001/12/10 19:49:46 veego Exp $ +$NetBSD: patch-ab,v 1.1.1.1.2.1 2002/06/23 18:38:23 jlam Exp $ ---- configure.in-orig Fri Aug 31 11:36:47 2001 -+++ configure.in Thu Oct 11 00:13:14 2001 -@@ -92,4 +92,4 @@ +--- configure.orig Thu Feb 21 08:55:21 2002 ++++ configure Thu Jun 13 10:12:43 2002 +@@ -8802,6 +8802,11 @@ + #define LIBAO_SOLARIS + EOF + ;; ++ *-netbsd*) ++cat >> confdefs.h <<\EOF ++#define LIBAO_SOLARIS ++EOF ++;; + esac + fi - AC_C_ATTRIBUTE_ALIGNED - --AC_OUTPUT(Makefile autotools/Makefile include/Makefile test/Makefile doc/Makefile src/Makefile liba52/Makefile libao/Makefile) -+AC_OUTPUT(Makefile autotools/Makefile include/Makefile liba52/Makefile) diff --git a/audio/liba52/patches/patch-ac b/audio/liba52/patches/patch-ac index 8fb0affda89..f985570a5f0 100644 --- a/audio/liba52/patches/patch-ac +++ b/audio/liba52/patches/patch-ac @@ -1,22 +1,9 @@ -$NetBSD: patch-ac,v 1.1.1.1 2001/12/10 19:49:46 veego Exp $ +$NetBSD: patch-ac,v 1.1.1.1.2.1 2002/06/23 18:38:24 jlam Exp $ ---- configure-orig Fri Aug 31 11:39:53 2001 -+++ configure Thu Oct 11 00:13:56 2001 -@@ -2857,7 +2857,7 @@ - ac_given_srcdir=$srcdir - ac_given_INSTALL="$INSTALL" +--- Makefile.am.orig Mon Dec 17 00:23:45 2001 ++++ Makefile.am Thu Jun 13 10:04:13 2002 +@@ -1,3 +1,3 @@ +-SUBDIRS = autotools include doc liba52 libao src vc++ test ++SUBDIRS = autotools include liba52 --trap 'rm -fr `echo "Makefile autotools/Makefile include/Makefile test/Makefile doc/Makefile src/Makefile liba52/Makefile libao/Makefile include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 -+trap 'rm -fr `echo "Makefile autotools/Makefile include/Makefile liba52/Makefile include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 - EOF - cat >> $CONFIG_STATUS <<EOF - -@@ -2967,7 +2967,7 @@ - - cat >> $CONFIG_STATUS <<EOF - --CONFIG_FILES=\${CONFIG_FILES-"Makefile autotools/Makefile include/Makefile test/Makefile doc/Makefile src/Makefile liba52/Makefile libao/Makefile"} -+CONFIG_FILES=\${CONFIG_FILES-"Makefile autotools/Makefile include/Makefile liba52/Makefile"} - EOF - cat >> $CONFIG_STATUS <<\EOF - for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then + EXTRA_DIST = HISTORY bootstrap diff --git a/audio/liba52/patches/patch-ad b/audio/liba52/patches/patch-ad index 89a4c437aee..49bed65e3ca 100644 --- a/audio/liba52/patches/patch-ad +++ b/audio/liba52/patches/patch-ad @@ -1,9 +1,13 @@ -$NetBSD: patch-ad,v 1.1.1.1 2001/12/10 19:49:46 veego Exp $ +$NetBSD: patch-ad,v 1.1.1.1.2.1 2002/06/23 18:38:24 jlam Exp $ ---- Makefile.am-orig Wed Aug 15 20:36:52 2001 -+++ Makefile.am Thu Oct 11 00:15:31 2001 -@@ -1,3 +1,3 @@ --SUBDIRS = autotools include doc liba52 libao src test +--- Makefile.in.orig Thu Feb 21 08:58:36 2002 ++++ Makefile.in Thu Jun 13 10:03:57 2002 +@@ -76,7 +76,7 @@ + STRIP = @STRIP@ + VERSION = @VERSION@ + +-SUBDIRS = autotools include doc liba52 libao src vc++ test +SUBDIRS = autotools include liba52 - EXTRA_DIST = bootstrap + EXTRA_DIST = HISTORY bootstrap + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 diff --git a/audio/liba52/patches/patch-ae b/audio/liba52/patches/patch-ae deleted file mode 100644 index aaba3f24550..00000000000 --- a/audio/liba52/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.1.1.1 2001/12/10 19:49:46 veego Exp $ - ---- Makefile.in-orig Fri Aug 31 11:40:06 2001 -+++ Makefile.in Thu Oct 11 00:15:42 2001 -@@ -72,7 +72,7 @@ - RANLIB = @RANLIB@ - VERSION = @VERSION@ - --SUBDIRS = autotools include doc liba52 libao src test -+SUBDIRS = autotools include liba52 - - EXTRA_DIST = bootstrap - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 diff --git a/audio/liba52/patches/patch-af b/audio/liba52/patches/patch-af deleted file mode 100644 index 2091efe30bf..00000000000 --- a/audio/liba52/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.1 2002/01/21 21:31:32 wiz Exp $ - ---- liba52/bitstream.c.orig Wed Aug 15 14:36:53 2001 -+++ liba52/bitstream.c -@@ -38,7 +38,7 @@ - { - int align; - -- align = (int)buf & 3; -+ align = (long)buf & 3; - buffer_start = (uint32_t *) (buf - align); - bits_left = 0; - bitstream_get (align * 8); diff --git a/audio/libao/buildlink.mk b/audio/libao/buildlink.mk index 09c41e1efdc..2733a8b9743 100644 --- a/audio/libao/buildlink.mk +++ b/audio/libao/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.3 2002/01/02 12:23:48 lukem Exp $ +# $NetBSD: buildlink.mk,v 1.3.2.1 2002/06/23 18:38:25 jlam Exp $ # # This Makefile fragment is included by packages that use libao. # @@ -12,8 +12,8 @@ # (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search # path. -.if !defined(LIGAO_BUILDLINK_MK) -LIGAO_BUILDLINK_MK= # defined +.if !defined(LIBAO_BUILDLINK_MK) +LIBAO_BUILDLINK_MK= # defined .include "../../mk/bsd.buildlink.mk" @@ -33,4 +33,4 @@ BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.libao} pre-configure: ${BUILDLINK_TARGETS.libao} libao-buildlink: _BUILDLINK_USE -.endif # LIGAO_BUILDLINK_MK +.endif # LIBAO_BUILDLINK_MK diff --git a/audio/mad/buildlink.mk b/audio/mad/buildlink.mk new file mode 100644 index 00000000000..8222bae9fab --- /dev/null +++ b/audio/mad/buildlink.mk @@ -0,0 +1,39 @@ +# $NetBSD: buildlink.mk,v 1.1.2.2 2002/06/23 18:38:26 jlam Exp $ +# +# This Makefile fragment is included by packages that use mad. +# +# To use this Makefile fragment, simply: +# +# (1) Optionally define BUILDLINK_DEPENDS.mad to the dependency pattern +# for the version of mad desired. +# (2) Include this Makefile fragment in the package Makefile, +# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header +# search path, and +# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search +# path. + +.if !defined(MAD_BUILDLINK_MK) +MAD_BUILDLINK_MK= # defined + +.include "../../mk/bsd.buildlink.mk" + +BUILDLINK_DEPENDS.mad?= mad>=0.14.2b +DEPENDS+= ${BUILDLINK_DEPENDS.mad}:../../audio/mad + +BUILDLINK_PREFIX.mad= ${LOCALBASE} +BUILDLINK_FILES.mad= include/id3tag.h +BUILDLINK_FILES.mad+= include/mad.h +BUILDLINK_FILES.mad+= lib/libid3tag.* +BUILDLINK_FILES.mad+= lib/libmad.* + +#.include "../../audio/libaudiofile/buildlink.mk" +.include "../../audio/esound/buildlink.mk" +.include "../../devel/gettext-lib/buildlink.mk" + +BUILDLINK_TARGETS.mad= mad-buildlink +BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.mad} + +pre-configure: ${BUILDLINK_TARGETS.mad} +mad-buildlink: _BUILDLINK_USE + +.endif # MAD_BUILDLINK_MK diff --git a/audio/mp3_check/Makefile b/audio/mp3_check/Makefile index 7520d34a670..a924e2370a5 100644 --- a/audio/mp3_check/Makefile +++ b/audio/mp3_check/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2002/01/21 11:34:56 wiz Exp $ +# $NetBSD: Makefile,v 1.2.2.1 2002/06/23 18:38:27 jlam Exp $ # DISTNAME= mp3_check-1.98 CATEGORIES= audio -MASTER_SITES= http://prdownloads.sourceforge.net/mp3check/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mp3check/} MAINTAINER= packages@netbsd.org HOMEPAGE= http://mp3check.sourceforge.net/ diff --git a/audio/mpegaudio/DESCR b/audio/mpegaudio/DESCR new file mode 100644 index 00000000000..63783832e10 --- /dev/null +++ b/audio/mpegaudio/DESCR @@ -0,0 +1 @@ +mpegaudio is an MPEG/audio Layer 1 and Layer 2 software package. diff --git a/audio/mpegaudio/Makefile b/audio/mpegaudio/Makefile new file mode 100644 index 00000000000..178788c21af --- /dev/null +++ b/audio/mpegaudio/Makefile @@ -0,0 +1,16 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:38:29 jlam Exp $ + +DISTNAME= mpegaudio +PKGNAME= mpegaudio-3.9 +CATEGORIES= audio +MASTER_SITES= ftp://ftp.ise.fhg.de/pub/graphics/mpeg/ +EXTRACT_SUFX= .tar.Z + +MAINTAINER= packages@netbsd.org +COMMENT= MPEG/audio Layer 1 and Layer 2 encoder/decoder package + +post-install: + ${INSTALL_MAN} ${FILESDIR}/mpeg_musicin.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${FILESDIR}/mpeg_musicout.1 ${PREFIX}/man/man1 + +.include "../../mk/bsd.pkg.mk" diff --git a/audio/mpegaudio/PLIST b/audio/mpegaudio/PLIST new file mode 100644 index 00000000000..354ce0622f6 --- /dev/null +++ b/audio/mpegaudio/PLIST @@ -0,0 +1,28 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.48.2 2002/06/23 18:38:29 jlam Exp $ +bin/mpeg_musicin +bin/mpeg_musicout +lib/mpegaudio/tables/1cb0 +lib/mpegaudio/tables/1cb1 +lib/mpegaudio/tables/1cb2 +lib/mpegaudio/tables/1th0 +lib/mpegaudio/tables/1th1 +lib/mpegaudio/tables/1th2 +lib/mpegaudio/tables/2cb0 +lib/mpegaudio/tables/2cb1 +lib/mpegaudio/tables/2cb2 +lib/mpegaudio/tables/2th0 +lib/mpegaudio/tables/2th1 +lib/mpegaudio/tables/2th2 +lib/mpegaudio/tables/absthr_0 +lib/mpegaudio/tables/absthr_1 +lib/mpegaudio/tables/absthr_2 +lib/mpegaudio/tables/alloc_0 +lib/mpegaudio/tables/alloc_1 +lib/mpegaudio/tables/alloc_2 +lib/mpegaudio/tables/alloc_3 +lib/mpegaudio/tables/dewindow +lib/mpegaudio/tables/enwindow +man/man1/mpeg_musicin.1 +man/man1/mpeg_musicout.1 +@dirrm lib/mpegaudio/tables +@dirrm lib/mpegaudio diff --git a/audio/mpegaudio/distinfo b/audio/mpegaudio/distinfo new file mode 100644 index 00000000000..53bfd9e683e --- /dev/null +++ b/audio/mpegaudio/distinfo @@ -0,0 +1,8 @@ +$NetBSD: distinfo,v 1.1.1.1.12.2 2002/06/23 18:38:30 jlam Exp $ + +SHA1 (mpegaudio.tar.Z) = 75a801c4aff290b4e0c7cdb2b07991c630955fbf +Size (mpegaudio.tar.Z) = 144707 bytes +SHA1 (patch-aa) = 7b61fd9effe57086d2d2f669fd5b5235a8854e03 +SHA1 (patch-ab) = 67758b144d384aea66509e508e79112a052b8369 +SHA1 (patch-ac) = f6d43ceaf9640289c6cdf0ff8db6f2ca9bc02ca1 +SHA1 (patch-ad) = 1fb96e8132ae322f377184f119a0e519dee9f21d diff --git a/audio/mpegaudio/files/mpeg_musicin.1 b/audio/mpegaudio/files/mpeg_musicin.1 new file mode 100644 index 00000000000..70e00d405ad --- /dev/null +++ b/audio/mpegaudio/files/mpeg_musicin.1 @@ -0,0 +1,122 @@ +.\" Copyright (c) 1997 Andreas Klemm <andreas@FreeBSD.org>. Neuss. +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD: ports/audio/mpegaudio/files/mpeg_musicin.1,v 1.2 1999/08/29 10:56:51 peter Exp $ +.Dd August 17, 1997 +.Dt MPEG_MUSICIN 1 +.Os +.Sh NAME +.Nm mpeg_musicin +.Nd MPEG/audio Layer 1 and Layer 2 decoder +.Sh SYNOPSIS +.Nm mpeg_musicin +queries for all arguments, or +.br +.Nm mpeg_musicin +.Op Fl l Ar lay +.br +.Op Fl m Ar mode +.br +.Op Fl p Ar psy +.br +.Op Fl s Ar sfrq +.br +.Op Fl b Ar br +.br +.Op Fl d Ar emp +.br +.Op Fl c +.br +.Op Fl o +.br +.Op Fl e +.br +inputCM +.br +.Op Ar outBS +.br +.Sh DESCRIPTION +The encoder and decoder software are configured to output +the coded audio bitstreams as a string of hexadecimal ascii +characters. For greater compression efficiency, compile flag, +BS_FORMAT, in common.h can be switched to configure the bitstream +reading and writing routines to process raw binary bitstreams. +.br +The decoder program has a very crude implementation of bitstream +synchword detection. It may not be able to correctly decode valid +bitstreams which have false synchword patterns in the ancillary data +portion of the bitstream. +.Sh RESTRICTIONS +The software implements levels I and II and psychophysical auditory +models I and II as described in the ISO 3-11171 rev 1 standard. +There are future plans to implement level III. +.br +The input/output audio data may either be headerless raw 16 bit data +or alternatively an AIFF formatted file (Audio Interchange File Format) +with certain limitations. +.br +For more information on the AIFF format see the postscript file +/sgi/aiff-c.9.26.91.ps at the anonymous ftp site FTP.SGI.COM +(192.48.153.1). +.br +The AIFF formatted file is a convenient way for storing sampling rate +of the audio file. +.br +The encoder and decoder software are configured to output the coded +audio bitstreams as a string of hexadecimal ascii characters. +For greater compression efficiency, compile flag, BS_FORMAT, +in common.h can be switched to configure the bitstream reading +and writing routines to process raw binary bitstreams. +.br +This software has been run and verified on a large variety of +computers and operating systems. In particular UNIX, MS_DOS (with +MicroSoft C version 6), Macintosh, AIX Platform (RS6000) and Convex. +.Sh OPTIONS +.Bl -tag -width Ds +.It Sy -l lay +use layer <lay> coding (default: 2) +.It Sy -m mode +channel mode : s/d/j/m (default: s) +.It Sy -p psy +psychoacoustic model 1/2 (default: 2) +.It Sy -s sfrq +input smpl rate in kHz (default: 44.1) +.It Sy -b br +total bitrate in kbps (default: 384) +.It Sy -d emp +de-emphasis n/5/c (default: n) +.It Sy -c +mark as copyright +.It Sy -o +mark as original +.It Sy -e +add error protection +.It Sy inputPCM +input PCM sound file (standard or AIFF) +.It Sy outBS +output bit stream of encoded audio (dflt inName+.mpg) +.Sh SEE ALSO +.Xr mpeg_musicout 1 +.Sh HISTORY +Written by Andreas Klemm, August 17, 1997 diff --git a/audio/mpegaudio/files/mpeg_musicout.1 b/audio/mpegaudio/files/mpeg_musicout.1 new file mode 100644 index 00000000000..cba817497e6 --- /dev/null +++ b/audio/mpegaudio/files/mpeg_musicout.1 @@ -0,0 +1,94 @@ +.\" Copyright (c) 1997 Andreas Klemm <andreas@FreeBSD.org>. Neuss. +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD: ports/audio/mpegaudio/files/mpeg_musicout.1,v 1.2 1999/08/29 10:56:51 peter Exp $ +.Dd August 17, 1997 +.Dt MPEG_MUSICOUT 1 +.Os +.Sh NAME +.Nm mpeg_musicout +.Nd MPEG/audio Layer 1 and Layer 2 encoder +.Sh SYNOPSIS +.Nm mpeg_musicout +queries for all arguments, or +.br +.Nm mpeg_musicout +.Op Fl A +.br +.Op Fl s Ar sb +.br +inputBS +.br +.Op Ar outPCM +.br +.Sh DESCRIPTION +The encoder and decoder software are configured to output +the coded audio bitstreams as a string of hexadecimal ascii +characters. For greater compression efficiency, compile flag, +BS_FORMAT, in common.h can be switched to configure the bitstream +reading and writing routines to process raw binary bitstreams. +.br +The decoder program has a very crude implementation of bitstream +synchword detection. It may not be able to correctly decode valid +bitstreams which have false synchword patterns in the ancillary data +portion of the bitstream. +.Sh RESTRICTIONS +The software implements levels I and II and psychophysical auditory +models I and II as described in the ISO 3-11171 rev 1 standard. +There are future plans to implement level III. +.br +The input/output audio data may either be headerless raw 16 bit data +or alternatively an AIFF formatted file (Audio Interchange File Format) +with certain limitations. +.br +For more information on the AIFF format see the postscript file +/sgi/aiff-c.9.26.91.ps at the anonymous ftp site FTP.SGI.COM +(192.48.153.1). +.br +The AIFF formatted file is a convenient way for storing sampling rate +of the audio file. +.br +The encoder and decoder software are configured to output the coded +audio bitstreams as a string of hexadecimal ascii characters. +For greater compression efficiency, compile flag, BS_FORMAT, +in common.h can be switched to configure the bitstream reading +and writing routines to process raw binary bitstreams. +.br +This software has been run and verified on a large variety of +computers and operating systems. In particular UNIX, MS_DOS (with +MicroSoft C version 6), Macintosh, AIX Platform (RS6000) and Convex. +.Sh OPTIONS +.Bl -tag -width Ds +.It Sy -A +write an AIFF output PCM sound file +.It Sy -s sb +resynth only up to this sb (debugging only) +.It Sy inputBS +input bit stream of encoded audio +.It Sy outPCM +output PCM sound file (dflt inName+.dec) +.Sh SEE ALSO +.Xr mpeg_musicin 1 +.Sh HISTORY +Written by Andreas Klemm, August 17, 1997 diff --git a/audio/mpegaudio/patches/patch-aa b/audio/mpegaudio/patches/patch-aa new file mode 100644 index 00000000000..f2b229a60c6 --- /dev/null +++ b/audio/mpegaudio/patches/patch-aa @@ -0,0 +1,30 @@ +$NetBSD: patch-aa,v 1.1.1.1.48.2 2002/06/23 18:38:34 jlam Exp $ + +--- Makefile.orig Wed Jan 5 02:47:50 1994 ++++ Makefile +@@ -1,10 +1,21 @@ + ALL : musicin musicout + +-CFLAGS = -O2 +-LDFLAGS= ++CFLAGS += -DPREFIX=\"${PREFIX}\" ++ ++all: musicin musicout + + musicin: musicin.o common.o encode.o subs.o psy.o tonal.o +- cc $(LDFLAGS) -o musicin musicin.o common.o encode.o subs.o psy.o tonal.o -lm ++ ${CC} -o musicin musicin.o common.o encode.o subs.o psy.o tonal.o -lm + + musicout: musicout.o common.o decode.o subs.o +- cc $(LDFLAGS) musicout.o common.o decode.o subs.o -o musicout -lm ++ ${CC} musicout.o common.o decode.o subs.o -o musicout -lm ++ ++clean: ++ rm -f *.core *.o musicin musicout ++ ++install: ++ ${BSD_INSTALL_PROGRAM} musicin ${PREFIX}/bin/mpeg_musicin ++ ${BSD_INSTALL_PROGRAM} musicout ${PREFIX}/bin/mpeg_musicout ++ ${BSD_INSTALL_DATA_DIR} ${PREFIX}/lib/mpegaudio/tables ++ ${BSD_INSTALL_DATA} tables/* ${PREFIX}/lib/mpegaudio/tables/ ++ diff --git a/audio/mpegaudio/patches/patch-ab b/audio/mpegaudio/patches/patch-ab new file mode 100644 index 00000000000..08d08aa69ae --- /dev/null +++ b/audio/mpegaudio/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1.1.1.48.2 2002/06/23 18:38:35 jlam Exp $ + +--- common.h.orig Wed Jan 5 02:42:00 1994 ++++ common.h +@@ -73,7 +73,7 @@ + #endif + + #ifdef UNIX +-#define TABLES_PATH "tables" /* to find data files */ ++#define TABLES_PATH PREFIX "/lib/mpegaudio/tables" /* to find data files */ + /* name of environment variable holding path of table files */ + #define MPEGTABENV "MPEGTABLES" + #define PATH_SEPARATOR "/" /* how to build paths */ diff --git a/audio/mpegaudio/patches/patch-ac b/audio/mpegaudio/patches/patch-ac new file mode 100644 index 00000000000..9d634ed4f87 --- /dev/null +++ b/audio/mpegaudio/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.1.1.1.22.2 2002/06/23 18:38:35 jlam Exp $ + +--- musicin.c.orig Wed Jan 5 02:13:44 1994 ++++ musicin.c +@@ -101,6 +101,8 @@ + #include "common.h" + #include "encoder.h" + ++#include <stdlib.h> ++ + /* Global variable definitions for "musicin.c" */ + + FILE *musicin; diff --git a/audio/mpegaudio/patches/patch-ad b/audio/mpegaudio/patches/patch-ad new file mode 100644 index 00000000000..598e7021320 --- /dev/null +++ b/audio/mpegaudio/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.1.1.1.22.2 2002/06/23 18:38:36 jlam Exp $ + +--- musicout.c.orig Wed Jan 5 05:39:27 1994 ++++ musicout.c +@@ -58,6 +58,8 @@ + #include "common.h" + #include "decoder.h" + ++#include <stdlib.h> ++ + /******************************************************************** + /* + /* This part contains the MPEG I decoder for Layers I & II. diff --git a/audio/mpg123-esound/DESCR b/audio/mpg123-esound/DESCR new file mode 100644 index 00000000000..23e1d559a36 --- /dev/null +++ b/audio/mpg123-esound/DESCR @@ -0,0 +1,4 @@ +mpg123-esound reads one or more files (or standard input if +``-'' is specified) or URLs and plays them on the EsounD +(default) or outputs them to stdout. file/URL is assumed to be +an MPEG-1/2 audio bit stream. diff --git a/audio/mpg123-esound/Makefile b/audio/mpg123-esound/Makefile new file mode 100644 index 00000000000..68258b04c4e --- /dev/null +++ b/audio/mpg123-esound/Makefile @@ -0,0 +1,66 @@ +# $NetBSD: Makefile,v 1.2.2.2 2002/06/23 18:38:39 jlam Exp $ + +DISTNAME= mpg123-0.59r +PKGNAME= mpg123-esound-0.59.18 +CATEGORIES= audio +MASTER_SITES= http://www.mpg123.de/mpg123/ \ + http://www-ti.informatik.uni-tuebingen.de/~hippm/mpg123/ + +PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/ +PATCHFILES= mpg123-059r-v6-20000713b.diff.gz + +MAINTAINER= packages@netbsd.org +HOMEPAGE= http://www.mpg123.de/ +COMMENT= Command-line player for mpeg layer 1, 2 and 3 audio with EsounD + +BUILD_DEFS+= USE_INET6 +DIST_SUBDIR= mpg123 + +PATCHDIR= ../mpg123/patches +FILESDIR= ../mpg123/files + +USE_BUILDLINK_ONLY= # defined + +# for OBJECT_FMT +.include "../../mk/bsd.prefs.mk" + +.if (${MACHINE_ARCH} == "i386") +.if (${OBJECT_FMT} == "ELF") +ALL_TARGET= netbsd-i386-elf-esd +.else +ALL_TARGET= netbsd-i386-esd +.endif +.elif (${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32") +ALL_TARGET= netbsd-arm-esd +.elif (${MACHINE_ARCH} == "m68k") +ALL_TARGET= netbsd-m68k-esd +.else +ALL_TARGET= ${LOWER_OPSYS}-esd +.endif + +.if ${OPSYS} == "SunOS" +ALL_TARGET= solaris-gcc-esd +.endif + +.if defined(USE_INET6) && ${USE_INET6} == "YES" +CPPFLAGS+= -DINET6 +.endif + +MAKE_FLAGS+= PREFIX="${PREFIX}" + +pre-patch: + ${LN} -s . ${WRKSRC}/mpg123 + +post-patch: + ${RM} -f ${WRKSRC}/mpg123 + ${CP} ${FILESDIR}/decode_i586_.s ${WRKSRC}/ + cd ${WRKSRC} ; ${MV} decode_i586.s decode_i586.s.orig ;\ + ${SED} \ + -e 's@^/@#/@g' \ + <decode_i586.s.orig >decode_i586.s + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/mpg123 ${PREFIX}/bin/mpg123-esound + +.include "../esound/buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/audio/mpg123-esound/PLIST b/audio/mpg123-esound/PLIST new file mode 100644 index 00000000000..7cdbbf93a3e --- /dev/null +++ b/audio/mpg123-esound/PLIST @@ -0,0 +1,2 @@ +@comment $NetBSD: PLIST,v 1.1.2.2 2002/06/23 18:38:40 jlam Exp $ +bin/mpg123-esound diff --git a/audio/mpg123-esound/distinfo b/audio/mpg123-esound/distinfo new file mode 100644 index 00000000000..b808890ed6e --- /dev/null +++ b/audio/mpg123-esound/distinfo @@ -0,0 +1,21 @@ +$NetBSD: distinfo,v 1.4.2.2 2002/06/23 18:38:41 jlam Exp $ + +SHA1 (mpg123/mpg123-0.59r.tar.gz) = c32fe242f4506d218bd19a51a4034da9fdc79493 +Size (mpg123/mpg123-0.59r.tar.gz) = 159028 bytes +SHA1 (mpg123/mpg123-059r-v6-20000713b.diff.gz) = fab11489b6a1ab79d6c29787161f1c05e492dc0b +Size (mpg123/mpg123-059r-v6-20000713b.diff.gz) = 5600 bytes +SHA1 (patch-aa) = 5f5310e52c8a7b17bc675d6d3b21ea629f644b40 +SHA1 (patch-ab) = ffc387d93f0f2832e49796c80be26e908defa3a7 +SHA1 (patch-ac) = 06a5037e27ddd4cc34e5348c09e702f9740173c5 +SHA1 (patch-ad) = e9b2b874a95a67139c7d48e74492eb64dfa815f0 +SHA1 (patch-ae) = 9ac13c978bdf498cbd5e9fa0777a51559fdb2403 +SHA1 (patch-af) = 309075bc6fd4b689b711f0ae84f2e5c829609452 +SHA1 (patch-ag) = c27b6a441573939dc23268a6937905d038d6a66b +SHA1 (patch-ah) = e1419bc6d25360d0825041028b6b3f485bcf5f43 +SHA1 (patch-ai) = 021c5bb2baa56327d486bf134b537ac5c6aa8fba +SHA1 (patch-aj) = 910b2834c34e617c492a3c72e4d2185d3eb53ecc +SHA1 (patch-ak) = b30898cff26859eca0d23ea8cfdd461920b978a8 +SHA1 (patch-al) = 88dec640d40e6a3f1828096a4ff7b5a4dbd0a222 +SHA1 (patch-am) = 661c1f95f65145f4e08706eb3f6fe975118a2822 +SHA1 (patch-an) = 08917e1825adcfd870bb2c61ae865339da7c45ef +SHA1 (patch-ao) = 40961a43cc3dbebf71deee1c240907896d297304 diff --git a/audio/mpg123-nas/DESCR b/audio/mpg123-nas/DESCR new file mode 100644 index 00000000000..7a9eb80829d --- /dev/null +++ b/audio/mpg123-nas/DESCR @@ -0,0 +1,6 @@ +mpg123 reads one or more files (or standard input if ``-'' is +specified) or URLs and plays them to the NAS device (default) or +outputs them to a specified file or to stdout. + +File(s) and/or URL contents are assumed to be MPEG-1.0/2.0 audio +layer 1, 2, or 3 bit streams. diff --git a/audio/mpg123-nas/Makefile b/audio/mpg123-nas/Makefile new file mode 100644 index 00000000000..3f6fe79a5ef --- /dev/null +++ b/audio/mpg123-nas/Makefile @@ -0,0 +1,66 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:38:42 jlam Exp $ +# + +DISTNAME= mpg123-0.59r +PKGNAME= mpg123-nas-0.59.18 +CATEGORIES= audio +MASTER_SITES= http://www.mpg123.de/mpg123/ \ + http://www-ti.informatik.uni-tuebingen.de/~hippm/mpg123/ + +PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/ \ + http://www.unix-ag.org/Linux-Alpha/Packages/ +PATCHFILES= mpg123-059r-v6-20000713b.diff.gz l3.diff.gz + +MAINTAINER= packages@netbsd.org +HOMEPAGE= http://www.mpg123.de/ +COMMENT= Command-line player for mpeg layer 1, 2 and 3 audio with NAS output + +BUILD_DEFS+= USE_INET6 +DIST_SUBDIR= mpg123 +FILESDIR= ${.CURDIR}/../mpg123/files + +CONFLICTS+= mpg123-[0-9]* + +USE_X11BASE= # defined +USE_BUILDLINK_ONLY= # defined + +# for OBJECT_FMT +.include "../../mk/bsd.prefs.mk" + +.if (${MACHINE_ARCH} == "i386") +.if (${OBJECT_FMT} == "ELF") +ALL_TARGET= netbsd-i386-elf +.else +ALL_TARGET= netbsd-i386 +.endif +.elif (${MACHINE_ARCH} == "arm32") +ALL_TARGET= netbsd-arm32 +.elif (${MACHINE_ARCH} == "m68k") +ALL_TARGET= netbsd-m68k +.else +ALL_TARGET= ${LOWER_OPSYS} +.endif + +.if ${OPSYS} == "SunOS" +ALL_TARGET= solaris-gcc +.endif + +.if defined(USE_INET6) && ${USE_INET6} == "YES" +CPPFLAGS+= -DINET6 +.endif + +MAKE_FLAGS+= PREFIX="${PREFIX}" + +pre-patch: + ${LN} -s . ${WRKSRC}/mpg123 + +post-patch: + ${RM} -f ${WRKSRC}/mpg123 + ${CP} ${FILESDIR}/decode_i586_.s ${WRKSRC}/ + cd ${WRKSRC} ; ${MV} decode_i586.s decode_i586.s.orig ;\ + ${SED} \ + -e 's@^/@#/@g' \ + <decode_i586.s.orig >decode_i586.s + +.include "../../audio/nas/buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/audio/mpg123-nas/PLIST b/audio/mpg123-nas/PLIST new file mode 100644 index 00000000000..e15419b9c38 --- /dev/null +++ b/audio/mpg123-nas/PLIST @@ -0,0 +1,3 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.50.2 2002/06/23 18:38:43 jlam Exp $ +bin/mpg123 +man/man1/mpg123.1 diff --git a/audio/mpg123-nas/distinfo b/audio/mpg123-nas/distinfo new file mode 100644 index 00000000000..9f3ec873d40 --- /dev/null +++ b/audio/mpg123-nas/distinfo @@ -0,0 +1,20 @@ +$NetBSD: distinfo,v 1.1.1.1.2.2 2002/06/23 18:38:44 jlam Exp $ + +SHA1 (mpg123/mpg123-0.59r.tar.gz) = c32fe242f4506d218bd19a51a4034da9fdc79493 +Size (mpg123/mpg123-0.59r.tar.gz) = 159028 bytes +SHA1 (mpg123/mpg123-059r-v6-20000713b.diff.gz) = fab11489b6a1ab79d6c29787161f1c05e492dc0b +Size (mpg123/mpg123-059r-v6-20000713b.diff.gz) = 5600 bytes +SHA1 (mpg123/l3.diff.gz) = 657c83289c565a246275dcab378f9c9acf5f9f9e +Size (mpg123/l3.diff.gz) = 689 bytes +SHA1 (patch-aa) = 1c9cdf05eeba7c0e10dc720e27de6c5b0e818322 +SHA1 (patch-ab) = ffc387d93f0f2832e49796c80be26e908defa3a7 +SHA1 (patch-ac) = 06a5037e27ddd4cc34e5348c09e702f9740173c5 +SHA1 (patch-ad) = e9b2b874a95a67139c7d48e74492eb64dfa815f0 +SHA1 (patch-ae) = 9ac13c978bdf498cbd5e9fa0777a51559fdb2403 +SHA1 (patch-af) = 309075bc6fd4b689b711f0ae84f2e5c829609452 +SHA1 (patch-ag) = c27b6a441573939dc23268a6937905d038d6a66b +SHA1 (patch-ah) = e1419bc6d25360d0825041028b6b3f485bcf5f43 +SHA1 (patch-ai) = da0d329fd6cd039db27cffcc1063144e1e56943f +SHA1 (patch-aj) = 910b2834c34e617c492a3c72e4d2185d3eb53ecc +SHA1 (patch-ak) = b30898cff26859eca0d23ea8cfdd461920b978a8 +SHA1 (patch-al) = 88dec640d40e6a3f1828096a4ff7b5a4dbd0a222 diff --git a/audio/mpg123-nas/patches/patch-aa b/audio/mpg123-nas/patches/patch-aa new file mode 100644 index 00000000000..918aa78c705 --- /dev/null +++ b/audio/mpg123-nas/patches/patch-aa @@ -0,0 +1,74 @@ +$NetBSD: patch-aa,v 1.1.1.1.2.2 2002/06/23 18:38:45 jlam Exp $ + +--- Makefile.orig Mon Feb 26 10:58:56 2001 ++++ Makefile +@@ -54,6 +54,10 @@ + @echo "make aix-tk3play IBM AIX" + @echo "make os2 IBM OS/2" + @echo "make netbsd NetBSD" ++ @echo "make netbsd-arm32 NetBSD for strongarm" ++ @echo "make netbsd-i386 NetBSD optimized for i386" ++ @echo "make netbsd-i386-elf NetBSD optimized for i386, ELF format" ++ @echo "make netbsd-m68k NetBSD optimized for m68k" + @echo "make bsdos BSDI BSD/OS" + @echo "make bsdos4 BSDI BSD/OS 4.0" + @echo "make bsdos-nas BSDI BSD/OS with NAS support" +@@ -377,6 +381,34 @@ + -funroll-all-loops -finline-functions' \ + mpg123-make + ++netbsd-i386-elf: ++ $(MAKE) CC=cc AUDIO_LIB='-laudio -lXt' \ ++ OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \ ++ audio_nas.o term.o' \ ++ CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \ ++ -funroll-all-loops -ffast-math -DROT_I386 \ ++ -DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DUSE_MMAP \ ++ -DREAD_MMAP -DNAS -DNETBSD -DTERM_CONTROL' \ ++ mpg123-make ++ ++netbsd-m68k: ++ $(MAKE) CC=cc AUDIO_LIB='-laudio -lXt' \ ++ OBJECTS='decode.o dct64.o audio_nas.o term.o' \ ++ CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \ ++ -ffast-math -DREAL_IS_FLOAT \ ++ -DUSE_MMAP -DNAS -DNETBSD -DM68K_ASSEM -DTERM_CONTROL' \ ++ mpg123-make ++ ++netbsd-arm32: ++ $(MAKE) CC=cc AUDIO_LIB='-laudio -lXt' \ ++ OBJECTS='decode.o dct64.o audio_nas.o term.o' \ ++ CFLAGS='$(CFLAGS) -Wall -O6 -fomit-frame-pointer \ ++ -funroll-all-loops -finline-functions -ffast-math \ ++ -march=armv4 -mtune=strongarm -mcpu=strongarm \ ++ -DREAL_IS_FIXED -DUSE_MMAP -DREAD_MMAP -DTERM_CONTROL \ ++ -DNAS -DNETBSD' \ ++ mpg123-make ++ + solaris-gcc-esd: + $(MAKE) CC=gcc LDFLAGS='-lsocket -lnsl' \ + AUDIO_LIB='-lesd -lresolv' \ +@@ -496,18 +528,18 @@ + + netbsd: + $(MAKE) CC=cc LDFLAGS= \ +- OBJECTS='decode.o dct64.o audio_sun.o' \ ++ OBJECTS='decode.o dct64.o audio_nas.o term.o' AUDIO_LIB='-laudio -lXt' \ + CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \ + -funroll-all-loops -ffast-math \ +- -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \ ++ -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNAS -DNETBSD' \ + mpg123-make + + netbsd-i386: + $(MAKE) CC=cc LDFLAGS= \ +- OBJECTS='decode_i386.o dct64_i386.o audio_sun.o' \ +- CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \ ++ OBJECTS='decode_i386.o dct64_i386.o audio_nas.o term.o' AUDIO_LIB='-laudio -lXt' \ ++ CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \ + -funroll-all-loops -ffast-math -DROT_I386 \ +- -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \ ++ -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNAS -DNETBSD' \ + mpg123-make + + bsdos: diff --git a/audio/mpg123-nas/patches/patch-ab b/audio/mpg123-nas/patches/patch-ab new file mode 100644 index 00000000000..4186688ac7e --- /dev/null +++ b/audio/mpg123-nas/patches/patch-ab @@ -0,0 +1,23 @@ +$NetBSD: patch-ab,v 1.1.1.1.2.2 2002/06/23 18:38:46 jlam Exp $ + +--- mpg123.c.orig Tue Jun 15 22:21:36 1999 ++++ mpg123.c Sun Jul 18 21:20:19 1999 +@@ -177,6 +177,9 @@ + _exit(0); + default: /* parent */ + xfermem_init_writer (buffermem); ++ if (xfermem_block(XF_WRITER, buffermem) == XF_CMD_TERMINATE) { ++ intflag = TRUE; ++ } + param.outmode = DECODE_BUFFER; + } + } +@@ -918,7 +921,7 @@ + { + const char *term_type; + term_type = getenv("TERM"); +- if (!strcmp(term_type,"xterm")) ++ if (term_type && !strcmp(term_type,"xterm")) + { + fprintf(stderr, "\033]0;%s\007", filename); + } diff --git a/audio/mpg123-nas/patches/patch-ac b/audio/mpg123-nas/patches/patch-ac new file mode 100644 index 00000000000..ef634c769c6 --- /dev/null +++ b/audio/mpg123-nas/patches/patch-ac @@ -0,0 +1,31 @@ +$NetBSD: patch-ac,v 1.1.1.1.2.2 2002/06/23 18:38:47 jlam Exp $ + +--- audio_sun.c.orig Thu Feb 4 13:22:34 1999 ++++ audio_sun.c Mon Sep 27 09:17:00 1999 +@@ -17,6 +17,8 @@ + + #include "mpg123.h" + ++extern int outburst; ++ + #ifndef SPARCLINUX + #include <sys/filio.h> + #ifdef SUNOS +@@ -78,6 +80,17 @@ + } + + #ifndef NETBSD ++ AUDIO_INITINFO(&ainfo); ++ if(ioctl(ai->fn, AUDIO_GETINFO, &ainfo) == -1) ++ return -1; ++#ifdef SOLARIS ++ outburst = MAXOUTBURST; ++#else ++ outburst = ainfo.blocksize; ++#endif ++ if(outburst > MAXOUTBURST) ++ outburst = MAXOUTBURST; ++ + AUDIO_INITINFO(&ainfo); + + if(ai->output > 0) diff --git a/audio/mpg123-nas/patches/patch-ad b/audio/mpg123-nas/patches/patch-ad new file mode 100644 index 00000000000..b904ea09be3 --- /dev/null +++ b/audio/mpg123-nas/patches/patch-ad @@ -0,0 +1,75 @@ +$NetBSD: patch-ad,v 1.1.1.1.2.2 2002/06/23 18:38:47 jlam Exp $ + +--- dct64.c.orig Sat Sep 20 21:16:04 1997 ++++ dct64.c Thu Aug 12 23:28:33 1999 +@@ -29,7 +29,7 @@ + for(i=15;i>=0;i--) + *bs++ = (*b1++ + *--b2); + for(i=15;i>=0;i--) +- *bs++ = (*--b2 - *b1++) * *--costab; ++ *bs++ = REAL_MUL((*--b2 - *b1++), *--costab); + + b1 = bufs; + costab = pnts[1]+8; +@@ -39,13 +39,13 @@ + for(i=7;i>=0;i--) + *bs++ = (*b1++ + *--b2); + for(i=7;i>=0;i--) +- *bs++ = (*--b2 - *b1++) * *--costab; ++ *bs++ = REAL_MUL((*--b2 - *b1++), *--costab); + b2 += 32; + costab += 8; + for(i=7;i>=0;i--) + *bs++ = (*b1++ + *--b2); + for(i=7;i>=0;i--) +- *bs++ = (*b1++ - *--b2) * *--costab; ++ *bs++ = REAL_MUL((*b1++ - *--b2), *--costab); + b2 += 32; + } + +@@ -58,12 +58,12 @@ + for(i=3;i>=0;i--) + *bs++ = (*b1++ + *--b2); + for(i=3;i>=0;i--) +- *bs++ = (*--b2 - *b1++) * costab[i]; ++ *bs++ = REAL_MUL((*--b2 - *b1++), costab[i]); + b2 += 16; + for(i=3;i>=0;i--) + *bs++ = (*b1++ + *--b2); + for(i=3;i>=0;i--) +- *bs++ = (*b1++ - *--b2) * costab[i]; ++ *bs++ = REAL_MUL((*b1++ - *--b2), costab[i]); + b2 += 16; + } + +@@ -75,13 +75,13 @@ + { + *bs++ = (*b1++ + *--b2); + *bs++ = (*b1++ + *--b2); +- *bs++ = (*--b2 - *b1++) * costab[1]; +- *bs++ = (*--b2 - *b1++) * costab[0]; ++ *bs++ = REAL_MUL((*--b2 - *b1++), costab[1]); ++ *bs++ = REAL_MUL((*--b2 - *b1++), costab[0]); + b2 += 8; + *bs++ = (*b1++ + *--b2); + *bs++ = (*b1++ + *--b2); +- *bs++ = (*b1++ - *--b2) * costab[1]; +- *bs++ = (*b1++ - *--b2) * costab[0]; ++ *bs++ = REAL_MUL((*b1++ - *--b2), costab[1]); ++ *bs++ = REAL_MUL((*b1++ - *--b2), costab[0]); + b2 += 8; + } + bs = bufs; +@@ -92,10 +92,10 @@ + real v0,v1; + v0=*b1++; v1 = *b1++; + *bs++ = (v0 + v1); +- *bs++ = (v0 - v1) * (*costab); ++ *bs++ = REAL_MUL((v0 - v1), (*costab)); + v0=*b1++; v1 = *b1++; + *bs++ = (v0 + v1); +- *bs++ = (v1 - v0) * (*costab); ++ *bs++ = REAL_MUL((v1 - v0), (*costab)); + } + + } diff --git a/audio/mpg123-nas/patches/patch-ae b/audio/mpg123-nas/patches/patch-ae new file mode 100644 index 00000000000..b893b92fc54 --- /dev/null +++ b/audio/mpg123-nas/patches/patch-ae @@ -0,0 +1,16 @@ +$NetBSD: patch-ae,v 1.1.1.1.2.2 2002/06/23 18:38:48 jlam Exp $ + +--- dct64_i486.c.orig Thu Nov 19 21:42:36 1998 ++++ dct64_i486.c Mon Aug 16 01:49:16 1999 +@@ -47,7 +47,11 @@ + #define SETOUT(out,n,expr) out[FIR_BUFFER_SIZE*(n)]=(expr) + #define MUL(a,b) (((a)*(b)) >> 15) + #define MULL(a,b) (((long long)(a)*(long long)(b)) >> 15) ++#ifdef REAL_IS_FIXED ++#define TOINT(a) ((a) * 32768 / (int)REAL_FACTOR) ++#else + #define TOINT(a) ((int)((a)*32768.0)) ++#endif + + void dct64_1_486(int *out0,int *out1,int *b1,int *b2) + { diff --git a/audio/mpg123-nas/patches/patch-af b/audio/mpg123-nas/patches/patch-af new file mode 100644 index 00000000000..a6377375a0a --- /dev/null +++ b/audio/mpg123-nas/patches/patch-af @@ -0,0 +1,19 @@ +$NetBSD: patch-af,v 1.1.1.1.2.2 2002/06/23 18:38:49 jlam Exp $ + +--- audio.c.orig Mon Nov 23 08:16:24 1998 ++++ audio.c Wed Apr 7 16:23:29 1999 +@@ -81,10 +81,14 @@ + k1 = NUM_RATES; + } + ++#ifndef NETBSD + if(audio_open(&ai1) < 0) { + perror("audio"); + exit(1); + } ++#else ++ audio_open(&ai1); ++#endif + + for(i=0;i<NUM_CHANNELS;i++) { + for(j=0;j<NUM_RATES;j++) { diff --git a/audio/mpg123-nas/patches/patch-ag b/audio/mpg123-nas/patches/patch-ag new file mode 100644 index 00000000000..90b01d17d91 --- /dev/null +++ b/audio/mpg123-nas/patches/patch-ag @@ -0,0 +1,123 @@ +$NetBSD: patch-ag,v 1.1.1.1.2.2 2002/06/23 18:38:50 jlam Exp $ + +--- decode.c.orig Tue Jan 26 23:47:05 1999 ++++ decode.c Tue Oct 12 01:19:18 1999 +@@ -13,9 +13,9 @@ + #include "mpg123.h" + + #define WRITE_SAMPLE(samples,sum,clip) \ +- if( (sum) > 32767.0) { *(samples) = 0x7fff; (clip)++; } \ +- else if( (sum) < -32768.0) { *(samples) = -0x8000; (clip)++; } \ +- else { *(samples) = sum; } ++ if( (sum) > REAL_PLUS_32767) { *(samples) = 0x7fff; (clip)++; } \ ++ else if( (sum) < REAL_MINUS_32768) { *(samples) = -0x8000; (clip)++; } \ ++ else { *(samples) = REAL_TO_SHORT(sum); } + + int synth_1to1_8bit(real *bandPtr,int channel,unsigned char *samples,int *pnt) + { +@@ -156,36 +156,36 @@ + for (j=16;j;j--,window+=0x10,samples+=step) + { + real sum; +- sum = *window++ * *b0++; +- sum -= *window++ * *b0++; +- sum += *window++ * *b0++; +- sum -= *window++ * *b0++; +- sum += *window++ * *b0++; +- sum -= *window++ * *b0++; +- sum += *window++ * *b0++; +- sum -= *window++ * *b0++; +- sum += *window++ * *b0++; +- sum -= *window++ * *b0++; +- sum += *window++ * *b0++; +- sum -= *window++ * *b0++; +- sum += *window++ * *b0++; +- sum -= *window++ * *b0++; +- sum += *window++ * *b0++; +- sum -= *window++ * *b0++; ++ sum = REAL_MUL(*window++, *b0++); ++ sum -= REAL_MUL(*window++, *b0++); ++ sum += REAL_MUL(*window++, *b0++); ++ sum -= REAL_MUL(*window++, *b0++); ++ sum += REAL_MUL(*window++, *b0++); ++ sum -= REAL_MUL(*window++, *b0++); ++ sum += REAL_MUL(*window++, *b0++); ++ sum -= REAL_MUL(*window++, *b0++); ++ sum += REAL_MUL(*window++, *b0++); ++ sum -= REAL_MUL(*window++, *b0++); ++ sum += REAL_MUL(*window++, *b0++); ++ sum -= REAL_MUL(*window++, *b0++); ++ sum += REAL_MUL(*window++, *b0++); ++ sum -= REAL_MUL(*window++, *b0++); ++ sum += REAL_MUL(*window++, *b0++); ++ sum -= REAL_MUL(*window++, *b0++); + + WRITE_SAMPLE(samples,sum,clip); + } + + { + real sum; +- sum = window[0x0] * b0[0x0]; +- sum += window[0x2] * b0[0x2]; +- sum += window[0x4] * b0[0x4]; +- sum += window[0x6] * b0[0x6]; +- sum += window[0x8] * b0[0x8]; +- sum += window[0xA] * b0[0xA]; +- sum += window[0xC] * b0[0xC]; +- sum += window[0xE] * b0[0xE]; ++ sum = REAL_MUL(window[0x0], b0[0x0]); ++ sum += REAL_MUL(window[0x2], b0[0x2]); ++ sum += REAL_MUL(window[0x4], b0[0x4]); ++ sum += REAL_MUL(window[0x6], b0[0x6]); ++ sum += REAL_MUL(window[0x8], b0[0x8]); ++ sum += REAL_MUL(window[0xA], b0[0xA]); ++ sum += REAL_MUL(window[0xC], b0[0xC]); ++ sum += REAL_MUL(window[0xE], b0[0xE]); + WRITE_SAMPLE(samples,sum,clip); + b0-=0x10,window-=0x20,samples+=step; + } +@@ -194,22 +194,22 @@ + for (j=15;j;j--,b0-=0x20,window-=0x10,samples+=step) + { + real sum; +- sum = -*(--window) * *b0++; +- sum -= *(--window) * *b0++; +- sum -= *(--window) * *b0++; +- sum -= *(--window) * *b0++; +- sum -= *(--window) * *b0++; +- sum -= *(--window) * *b0++; +- sum -= *(--window) * *b0++; +- sum -= *(--window) * *b0++; +- sum -= *(--window) * *b0++; +- sum -= *(--window) * *b0++; +- sum -= *(--window) * *b0++; +- sum -= *(--window) * *b0++; +- sum -= *(--window) * *b0++; +- sum -= *(--window) * *b0++; +- sum -= *(--window) * *b0++; +- sum -= *(--window) * *b0++; ++ sum = -REAL_MUL(*(--window), *b0++); ++ sum -= REAL_MUL(*(--window), *b0++); ++ sum -= REAL_MUL(*(--window), *b0++); ++ sum -= REAL_MUL(*(--window), *b0++); ++ sum -= REAL_MUL(*(--window), *b0++); ++ sum -= REAL_MUL(*(--window), *b0++); ++ sum -= REAL_MUL(*(--window), *b0++); ++ sum -= REAL_MUL(*(--window), *b0++); ++ sum -= REAL_MUL(*(--window), *b0++); ++ sum -= REAL_MUL(*(--window), *b0++); ++ sum -= REAL_MUL(*(--window), *b0++); ++ sum -= REAL_MUL(*(--window), *b0++); ++ sum -= REAL_MUL(*(--window), *b0++); ++ sum -= REAL_MUL(*(--window), *b0++); ++ sum -= REAL_MUL(*(--window), *b0++); ++ sum -= REAL_MUL(*(--window), *b0++); + + WRITE_SAMPLE(samples,sum,clip); + } +@@ -219,5 +219,3 @@ + + return clip; + } +- +- diff --git a/audio/mpg123-nas/patches/patch-ah b/audio/mpg123-nas/patches/patch-ah new file mode 100644 index 00000000000..86dc9d7f754 --- /dev/null +++ b/audio/mpg123-nas/patches/patch-ah @@ -0,0 +1,22 @@ +$NetBSD: patch-ah,v 1.1.1.1.2.2 2002/06/23 18:38:50 jlam Exp $ + +--- equalizer.c.orig Tue Feb 2 03:47:35 1999 ++++ equalizer.c Mon Aug 16 02:08:31 1999 +@@ -13,7 +13,7 @@ + + if(equalfile) { + for(i=0;i<32;i++) +- bandPtr[i] *= equalizer[channel][i]; ++ bandPtr[i] = REAL_MUL(bandPtr[i], equalizer[channel][i]); + } + + /* if(param.equalizer & 0x2) { +@@ -28,7 +28,7 @@ + { + int i; + for(i=0;i<576;i++) { +- bandPtr[i] *= equalizerband[channel][i]; ++ bandPtr[i] = REAL_MUL(bandPtr[i], equalizerband[channel][i]); + } + } + diff --git a/audio/mpg123-nas/patches/patch-ai b/audio/mpg123-nas/patches/patch-ai new file mode 100644 index 00000000000..e0535f9a92a --- /dev/null +++ b/audio/mpg123-nas/patches/patch-ai @@ -0,0 +1,780 @@ +$NetBSD: patch-ai,v 1.1.1.1.2.2 2002/06/23 18:38:51 jlam Exp $ + +--- layer3.c.orig Thu Apr 22 01:25:18 1999 ++++ layer3.c Mon Aug 16 02:02:01 1999 +@@ -109,54 +109,54 @@ + int i,j,k,l; + + for(i=-256;i<118+4;i++) +- gainpow2[i+256] = pow((double)2.0,-0.25 * (double) (i+210) ); ++ gainpow2[i+256] = DOUBLE_TO_REAL(pow((double)2.0,-0.25 * (double) (i+210) )); + + for(i=0;i<8207;i++) +- ispow[i] = pow((double)i,(double)4.0/3.0); ++ ispow[i] = DOUBLE_TO_REAL(pow((double)i,(double)4.0/3.0)); + + for (i=0;i<8;i++) { + static double Ci[8]={-0.6,-0.535,-0.33,-0.185,-0.095,-0.041,-0.0142,-0.0037}; + double sq=sqrt(1.0+Ci[i]*Ci[i]); +- aa_cs[i] = 1.0/sq; +- aa_ca[i] = Ci[i]/sq; ++ aa_cs[i] = DOUBLE_TO_REAL(1.0/sq); ++ aa_ca[i] = DOUBLE_TO_REAL(Ci[i]/sq); + } + + for(i=0;i<18;i++) { +- win[0][i] = win[1][i] = 0.5 * sin( M_PI / 72.0 * (double) (2*(i+0) +1) ) / cos ( M_PI * (double) (2*(i+0) +19) / 72.0 ); +- win[0][i+18] = win[3][i+18] = 0.5 * sin( M_PI / 72.0 * (double) (2*(i+18)+1) ) / cos ( M_PI * (double) (2*(i+18)+19) / 72.0 ); ++ win[0][i] = win[1][i] = DOUBLE_TO_REAL(0.5 * sin( M_PI / 72.0 * (double) (2*(i+0) +1) ) / cos ( M_PI * (double) (2*(i+0) +19) / 72.0 )); ++ win[0][i+18] = win[3][i+18] = DOUBLE_TO_REAL(0.5 * sin( M_PI / 72.0 * (double) (2*(i+18)+1) ) / cos ( M_PI * (double) (2*(i+18)+19) / 72.0 )); + } + for(i=0;i<6;i++) { +- win[1][i+18] = 0.5 / cos ( M_PI * (double) (2*(i+18)+19) / 72.0 ); +- win[3][i+12] = 0.5 / cos ( M_PI * (double) (2*(i+12)+19) / 72.0 ); +- win[1][i+24] = 0.5 * sin( M_PI / 24.0 * (double) (2*i+13) ) / cos ( M_PI * (double) (2*(i+24)+19) / 72.0 ); +- win[1][i+30] = win[3][i] = 0.0; +- win[3][i+6 ] = 0.5 * sin( M_PI / 24.0 * (double) (2*i+1) ) / cos ( M_PI * (double) (2*(i+6 )+19) / 72.0 ); ++ win[1][i+18] = DOUBLE_TO_REAL(0.5 / cos ( M_PI * (double) (2*(i+18)+19) / 72.0 )); ++ win[3][i+12] = DOUBLE_TO_REAL(0.5 / cos ( M_PI * (double) (2*(i+12)+19) / 72.0 )); ++ win[1][i+24] = DOUBLE_TO_REAL(0.5 * sin( M_PI / 24.0 * (double) (2*i+13) ) / cos ( M_PI * (double) (2*(i+24)+19) / 72.0 )); ++ win[1][i+30] = win[3][i] = DOUBLE_TO_REAL(0.0); ++ win[3][i+6 ] = DOUBLE_TO_REAL(0.5 * sin( M_PI / 24.0 * (double) (2*i+1) ) / cos ( M_PI * (double) (2*(i+6 )+19) / 72.0 )); + } + + for(i=0;i<9;i++) +- COS9[i] = cos( M_PI / 18.0 * (double) i); ++ COS9[i] = DOUBLE_TO_REAL(cos( M_PI / 18.0 * (double) i)); + + for(i=0;i<9;i++) +- tfcos36[i] = 0.5 / cos ( M_PI * (double) (i*2+1) / 36.0 ); ++ tfcos36[i] = DOUBLE_TO_REAL(0.5 / cos ( M_PI * (double) (i*2+1) / 36.0 )); + for(i=0;i<3;i++) +- tfcos12[i] = 0.5 / cos ( M_PI * (double) (i*2+1) / 12.0 ); ++ tfcos12[i] = DOUBLE_TO_REAL(0.5 / cos ( M_PI * (double) (i*2+1) / 12.0 )); + +- COS6_1 = cos( M_PI / 6.0 * (double) 1); +- COS6_2 = cos( M_PI / 6.0 * (double) 2); ++ COS6_1 = DOUBLE_TO_REAL(cos( M_PI / 6.0 * (double) 1)); ++ COS6_2 = DOUBLE_TO_REAL(cos( M_PI / 6.0 * (double) 2)); + + #ifdef NEW_DCT9 +- cos9[0] = cos(1.0*M_PI/9.0); +- cos9[1] = cos(5.0*M_PI/9.0); +- cos9[2] = cos(7.0*M_PI/9.0); +- cos18[0] = cos(1.0*M_PI/18.0); +- cos18[1] = cos(11.0*M_PI/18.0); +- cos18[2] = cos(13.0*M_PI/18.0); ++ cos9[0] = DOUBLE_TO_REAL(cos(1.0*M_PI/9.0)); ++ cos9[1] = DOUBLE_TO_REAL(cos(5.0*M_PI/9.0)); ++ cos9[2] = DOUBLE_TO_REAL(cos(7.0*M_PI/9.0)); ++ cos18[0] = DOUBLE_TO_REAL(cos(1.0*M_PI/18.0)); ++ cos18[1] = DOUBLE_TO_REAL(cos(11.0*M_PI/18.0)); ++ cos18[2] = DOUBLE_TO_REAL(cos(13.0*M_PI/18.0)); + #endif + + for(i=0;i<12;i++) { +- win[2][i] = 0.5 * sin( M_PI / 24.0 * (double) (2*i+1) ) / cos ( M_PI * (double) (2*i+7) / 24.0 ); ++ win[2][i] = DOUBLE_TO_REAL(0.5 * sin( M_PI / 24.0 * (double) (2*i+1) ) / cos ( M_PI * (double) (2*i+7) / 24.0 )); + for(j=0;j<6;j++) +- COS1[i][j] = cos( M_PI / 24.0 * (double) ((2*i+7)*(2*j+1)) ); ++ COS1[i][j] = DOUBLE_TO_REAL(cos( M_PI / 24.0 * (double) ((2*i+7)*(2*j+1)) )); + } + + for(j=0;j<4;j++) { +@@ -169,10 +169,10 @@ + + for(i=0;i<16;i++) { + double t = tan( (double) i * M_PI / 12.0 ); +- tan1_1[i] = t / (1.0+t); +- tan2_1[i] = 1.0 / (1.0 + t); +- tan1_2[i] = M_SQRT2 * t / (1.0+t); +- tan2_2[i] = M_SQRT2 / (1.0 + t); ++ tan1_1[i] = DOUBLE_TO_REAL(t / (1.0+t)); ++ tan2_1[i] = DOUBLE_TO_REAL(1.0 / (1.0 + t)); ++ tan1_2[i] = DOUBLE_TO_REAL(M_SQRT2 * t / (1.0+t)); ++ tan2_2[i] = DOUBLE_TO_REAL(M_SQRT2 / (1.0 + t)); + + for(j=0;j<2;j++) { + double base = pow(2.0,-0.25*(j+1.0)); +@@ -183,10 +183,10 @@ + else + p2 = pow(base,i*0.5); + } +- pow1_1[j][i] = p1; +- pow2_1[j][i] = p2; +- pow1_2[j][i] = M_SQRT2 * p1; +- pow2_2[j][i] = M_SQRT2 * p2; ++ pow1_1[j][i] = DOUBLE_TO_REAL(p1); ++ pow2_1[j][i] = DOUBLE_TO_REAL(p2); ++ pow1_2[j][i] = DOUBLE_TO_REAL(M_SQRT2 * p1); ++ pow2_2[j][i] = DOUBLE_TO_REAL(M_SQRT2 * p2); + } + } + +@@ -713,22 +713,22 @@ + num -= h->linbits+1; + mask <<= h->linbits; + if(mask < 0) +- *xrpnt = -ispow[x] * v; ++ *xrpnt = REAL_MUL(-ispow[x], v); + else +- *xrpnt = ispow[x] * v; ++ *xrpnt = REAL_MUL(ispow[x], v); + mask <<= 1; + } + else if(x) { + max[lwin] = cb; + if(mask < 0) +- *xrpnt = -ispow[x] * v; ++ *xrpnt = REAL_MUL(-ispow[x], v); + else +- *xrpnt = ispow[x] * v; ++ *xrpnt = REAL_MUL(ispow[x], v); + num--; + mask <<= 1; + } + else +- *xrpnt = 0.0; ++ *xrpnt = DOUBLE_TO_REAL(0.0); + xrpnt += step; + if(y == 15 && h->linbits) { + max[lwin] = cb; +@@ -737,22 +737,22 @@ + num -= h->linbits+1; + mask <<= h->linbits; + if(mask < 0) +- *xrpnt = -ispow[y] * v; ++ *xrpnt = REAL_MUL(-ispow[y], v); + else +- *xrpnt = ispow[y] * v; ++ *xrpnt = REAL_MUL(ispow[y], v); + mask <<= 1; + } + else if(y) { + max[lwin] = cb; + if(mask < 0) +- *xrpnt = -ispow[y] * v; ++ *xrpnt = REAL_MUL(-ispow[y], v); + else +- *xrpnt = ispow[y] * v; ++ *xrpnt = REAL_MUL(ispow[y], v); + num--; + mask <<= 1; + } + else +- *xrpnt = 0.0; ++ *xrpnt = DOUBLE_TO_REAL(0.0); + xrpnt += step; + } + } +@@ -804,7 +804,7 @@ + mask <<= 1; + } + else +- *xrpnt = 0.0; ++ *xrpnt = DOUBLE_TO_REAL(0.0); + xrpnt += step; + } + } +@@ -812,8 +812,8 @@ + if(lwin < 3) { /* short band? */ + while(1) { + for(;mc > 0;mc--) { +- *xrpnt = 0.0; xrpnt += 3; /* short band -> step=3 */ +- *xrpnt = 0.0; xrpnt += 3; ++ *xrpnt = DOUBLE_TO_REAL(0.0); xrpnt += 3; /* short band -> step=3 */ ++ *xrpnt = DOUBLE_TO_REAL(0.0); xrpnt += 3; + } + if(m >= me) + break; +@@ -887,22 +887,22 @@ + num -= h->linbits+1; + mask <<= h->linbits; + if(mask < 0) +- *xrpnt++ = -ispow[x] * v; ++ *xrpnt++ = REAL_MUL(-ispow[x], v); + else +- *xrpnt++ = ispow[x] * v; ++ *xrpnt++ = REAL_MUL(ispow[x], v); + mask <<= 1; + } + else if(x) { + max = cb; + if(mask < 0) +- *xrpnt++ = -ispow[x] * v; ++ *xrpnt++ = REAL_MUL(-ispow[x], v); + else +- *xrpnt++ = ispow[x] * v; ++ *xrpnt++ = REAL_MUL(ispow[x], v); + num--; + mask <<= 1; + } + else +- *xrpnt++ = 0.0; ++ *xrpnt++ = DOUBLE_TO_REAL(0.0); + + if (y == 15 && h->linbits) { + max = cb; +@@ -911,22 +911,22 @@ + num -= h->linbits+1; + mask <<= h->linbits; + if(mask < 0) +- *xrpnt++ = -ispow[y] * v; ++ *xrpnt++ = REAL_MUL(-ispow[y], v); + else +- *xrpnt++ = ispow[y] * v; ++ *xrpnt++ = REAL_MUL(ispow[y], v); + mask <<= 1; + } + else if(y) { + max = cb; + if(mask < 0) +- *xrpnt++ = -ispow[y] * v; ++ *xrpnt++ = REAL_MUL(-ispow[y], v); + else +- *xrpnt++ = ispow[y] * v; ++ *xrpnt++ = REAL_MUL(ispow[y], v); + num--; + mask <<= 1; + } + else +- *xrpnt++ = 0.0; ++ *xrpnt++ = DOUBLE_TO_REAL(0.0); + } + } + +@@ -974,7 +974,7 @@ + mask <<= 1; + } + else +- *xrpnt++ = 0.0; ++ *xrpnt++ = DOUBLE_TO_REAL(0.0); + } + } + +@@ -987,7 +987,7 @@ + num = 0; + + while(xrpnt < &xr[SBLIMIT][0]) +- *xrpnt++ = 0.0; ++ *xrpnt++ = DOUBLE_TO_REAL(0.0); + + while( part2remain > 16 ) { + getbits(16); /* Dismiss stuffing Bits */ +@@ -1065,8 +1065,8 @@ + t1 = tab1[is_p]; t2 = tab2[is_p]; + for (; sb > 0; sb--,idx+=3) { + real v = xr[0][idx]; +- xr[0][idx] = v * t1; +- xr[1][idx] = v * t2; ++ xr[0][idx] = REAL_MUL(v, t1); ++ xr[1][idx] = REAL_MUL(v, t2); + } + } + } +@@ -1087,8 +1087,8 @@ + t1 = tab1[is_p]; t2 = tab2[is_p]; + for ( ; sb > 0; sb--,idx+=3 ) { + real v = xr[0][idx]; +- xr[0][idx] = v * t1; +- xr[1][idx] = v * t2; ++ xr[0][idx] = REAL_MUL(v, t1); ++ xr[1][idx] = REAL_MUL(v, t2); + } + } + } /* end for(lwin; .. ; . ) */ +@@ -1108,8 +1108,8 @@ + t1 = tab1[is_p]; t2 = tab2[is_p]; + for ( ; sb > 0; sb--,idx++) { + real v = xr[0][idx]; +- xr[0][idx] = v * t1; +- xr[1][idx] = v * t2; ++ xr[0][idx] = REAL_MUL(v, t1); ++ xr[1][idx] = REAL_MUL(v, t2); + } + } + else +@@ -1128,8 +1128,8 @@ + t1 = tab1[is_p]; t2 = tab2[is_p]; + for ( ; sb > 0; sb--,idx++) { + real v = xr[0][idx]; +- xr[0][idx] = v * t1; +- xr[1][idx] = v * t2; ++ xr[0][idx] = REAL_MUL(v, t1); ++ xr[1][idx] = REAL_MUL(v, t2); + } + } + else +@@ -1143,8 +1143,8 @@ + + for ( sb = bi->longDiff[21]; sb > 0; sb--,idx++ ) { + real v = xr[0][idx]; +- xr[0][idx] = v * t1; +- xr[1][idx] = v * t2; ++ xr[0][idx] = REAL_MUL(v, t1); ++ xr[1][idx] = REAL_MUL(v, t2); + } + } + } /* ... */ +@@ -1177,8 +1177,8 @@ + for(ss=7;ss>=0;ss--) + { /* upper and lower butterfly inputs */ + register real bu = *--xr2,bd = *xr1; +- *xr2 = (bu * (*cs) ) - (bd * (*ca) ); +- *xr1++ = (bd * (*cs++) ) + (bu * (*ca++) ); ++ *xr2 = REAL_MUL(bu, *cs) - REAL_MUL(bd, *ca); ++ *xr1++ = REAL_MUL(bd, *cs++) + REAL_MUL(bu, *ca++); + } + } + } +@@ -1252,8 +1252,8 @@ + { + real t0, t1, t2; + +- t0 = COS6_2 * (in[8] + in[16] - in[4]); +- t1 = COS6_2 * in[12]; ++ t0 = REAL_MUL(COS6_2, (in[8] + in[16] - in[4])); ++ t1 = REAL_MUL(COS6_2, in[12]); + + t3 = in[0]; + t2 = t3 - t1 - t1; +@@ -1261,16 +1261,16 @@ + tmp[4] = t2 + t0 + t0; + t3 += t1; + +- t2 = COS6_1 * (in[10] + in[14] - in[2]); ++ t2 = REAL_MUL(COS6_1, (in[10] + in[14] - in[2])); + tmp[1] -= t2; + tmp[7] += t2; + } + { + real t0, t1, t2; + +- t0 = cos9[0] * (in[4] + in[8] ); +- t1 = cos9[1] * (in[8] - in[16]); +- t2 = cos9[2] * (in[4] + in[16]); ++ t0 = REAL_MUL(cos9[0], (in[4] + in[8] )); ++ t1 = REAL_MUL(cos9[1], (in[8] - in[16])); ++ t2 = REAL_MUL(cos9[2], (in[4] + in[16])); + + tmp[2] = tmp[6] = t3 - t0 - t2; + tmp[0] = tmp[8] = t3 + t0 + t1; +@@ -1280,9 +1280,9 @@ + { + real t1, t2, t3; + +- t1 = cos18[0] * (in[2] + in[10]); +- t2 = cos18[1] * (in[10] - in[14]); +- t3 = COS6_1 * in[6]; ++ t1 = REAL_MUL(cos18[0], (in[2] + in[10])); ++ t2 = REAL_MUL(cos18[1], (in[10] - in[14])); ++ t3 = REAL_MUL(COS6_1, in[6]); + + { + real t0 = t1 + t2 + t3; +@@ -1293,7 +1293,7 @@ + t2 -= t3; + t1 -= t3; + +- t3 = cos18[2] * (in[2] + in[14]); ++ t3 = REAL_MUL(cos18[2], (in[2] + in[14])); + + t1 += t3; + tmp[3] += t1; +@@ -1308,35 +1308,35 @@ + { + real t0, t1, t2, t3, t4, t5, t6, t7; + +- t1 = COS6_2 * in[12]; +- t2 = COS6_2 * (in[8] + in[16] - in[4]); ++ t1 = REAL_MUL(COS6_2, in[12]); ++ t2 = REAL_MUL(COS6_2, (in[8] + in[16] - in[4])); + + t3 = in[0] + t1; + t4 = in[0] - t1 - t1; + t5 = t4 - t2; + tmp[4] = t4 + t2 + t2; + +- t0 = cos9[0] * (in[4] + in[8]); +- t1 = cos9[1] * (in[8] - in[16]); ++ t0 = REAL_MUL(cos9[0], (in[4] + in[8])); ++ t1 = REAL_MUL(cos9[1], (in[8] - in[16])); + +- t2 = cos9[2] * (in[4] + in[16]); ++ t2 = REAL_MUL(cos9[2], (in[4] + in[16])); + + t6 = t3 - t0 - t2; + t0 += t3 + t1; + t3 += t2 - t1; + +- t2 = cos18[0] * (in[2] + in[10]); +- t4 = cos18[1] * (in[10] - in[14]); +- t7 = COS6_1 * in[6]; ++ t2 = REAL_MUL(cos18[0], (in[2] + in[10])); ++ t4 = REAL_MUL(cos18[1], (in[10] - in[14])); ++ t7 = REAL_MUL(COS6_1, in[6]); + + t1 = t2 + t4 + t7; + tmp[0] = t0 + t1; + tmp[8] = t0 - t1; +- t1 = cos18[2] * (in[2] + in[14]); ++ t1 = REAL_MUL(cos18[2], (in[2] + in[14])); + t2 += t1 - t7; + + tmp[3] = t3 + t2; +- t0 = COS6_1 * (in[10] + in[14] - in[2]); ++ t0 = REAL_MUL(COS6_1, (in[10] + in[14] - in[2])); + tmp[5] = t3 - t2; + + t4 -= t1 + t7; +@@ -1351,53 +1351,53 @@ + { + real t0, t1, t2, t3, t4, t5, t6, t7; + +- t1 = COS6_2 * in[13]; +- t2 = COS6_2 * (in[9] + in[17] - in[5]); ++ t1 = REAL_MUL(COS6_2, in[13]); ++ t2 = REAL_MUL(COS6_2, (in[9] + in[17] - in[5])); + + t3 = in[1] + t1; + t4 = in[1] - t1 - t1; + t5 = t4 - t2; + +- t0 = cos9[0] * (in[5] + in[9]); +- t1 = cos9[1] * (in[9] - in[17]); ++ t0 = REAL_MUL(cos9[0], (in[5] + in[9])); ++ t1 = REAL_MUL(cos9[1], (in[9] - in[17])); + +- tmp[13] = (t4 + t2 + t2) * tfcos36[17-13]; +- t2 = cos9[2] * (in[5] + in[17]); ++ tmp[13] = REAL_MUL((t4 + t2 + t2), tfcos36[17-13]); ++ t2 = REAL_MUL(cos9[2], (in[5] + in[17])); + + t6 = t3 - t0 - t2; + t0 += t3 + t1; + t3 += t2 - t1; + +- t2 = cos18[0] * (in[3] + in[11]); +- t4 = cos18[1] * (in[11] - in[15]); +- t7 = COS6_1 * in[7]; ++ t2 = REAL_MUL(cos18[0], (in[3] + in[11])); ++ t4 = REAL_MUL(cos18[1], (in[11] - in[15])); ++ t7 = REAL_MUL(COS6_1, in[7]); + + t1 = t2 + t4 + t7; +- tmp[17] = (t0 + t1) * tfcos36[17-17]; +- tmp[9] = (t0 - t1) * tfcos36[17-9]; +- t1 = cos18[2] * (in[3] + in[15]); ++ tmp[17] = REAL_MUL((t0 + t1), tfcos36[17-17]); ++ tmp[9] = REAL_MUL((t0 - t1), tfcos36[17-9]); ++ t1 = REAL_MUL(cos18[2], (in[3] + in[15])); + t2 += t1 - t7; + +- tmp[14] = (t3 + t2) * tfcos36[17-14]; +- t0 = COS6_1 * (in[11] + in[15] - in[3]); +- tmp[12] = (t3 - t2) * tfcos36[17-12]; ++ tmp[14] = REAL_MUL((t3 + t2), tfcos36[17-14]); ++ t0 = REAL_MUL(COS6_1, (in[11] + in[15] - in[3])); ++ tmp[12] = REAL_MUL((t3 - t2), tfcos36[17-12]); + + t4 -= t1 + t7; + +- tmp[16] = (t5 - t0) * tfcos36[17-16]; +- tmp[10] = (t5 + t0) * tfcos36[17-10]; +- tmp[15] = (t6 + t4) * tfcos36[17-15]; +- tmp[11] = (t6 - t4) * tfcos36[17-11]; ++ tmp[16] = REAL_MUL((t5 - t0), tfcos36[17-16]); ++ tmp[10] = REAL_MUL((t5 + t0), tfcos36[17-10]); ++ tmp[15] = REAL_MUL((t6 + t4), tfcos36[17-15]); ++ tmp[11] = REAL_MUL((t6 - t4), tfcos36[17-11]); + } + + #define MACRO(v) { \ + real tmpval; \ + tmpval = tmp[(v)] + tmp[17-(v)]; \ +- out2[9+(v)] = tmpval * w[27+(v)]; \ +- out2[8-(v)] = tmpval * w[26-(v)]; \ ++ out2[9+(v)] = REAL_MUL(tmpval, w[27+(v)]); \ ++ out2[8-(v)] = REAL_MUL(tmpval, w[26-(v)]); \ + tmpval = tmp[(v)] - tmp[17-(v)]; \ +- ts[SBLIMIT*(8-(v))] = out1[8-(v)] + tmpval * w[8-(v)]; \ +- ts[SBLIMIT*(9+(v))] = out1[9+(v)] + tmpval * w[9+(v)]; } ++ ts[SBLIMIT*(8-(v))] = out1[8-(v)] + REAL_MUL(tmpval, w[8-(v)]); \ ++ ts[SBLIMIT*(9+(v))] = out1[9+(v)] + REAL_MUL(tmpval, w[9+(v)]); } + + { + register real *out2 = o2; +@@ -1422,20 +1422,20 @@ + + #define MACRO0(v) { \ + real tmp; \ +- out2[9+(v)] = (tmp = sum0 + sum1) * w[27+(v)]; \ +- out2[8-(v)] = tmp * w[26-(v)]; } \ ++ out2[9+(v)] = REAL_MUL((tmp = sum0 + sum1), w[27+(v)]); \ ++ out2[8-(v)] = REAL_MUL(tmp, w[26-(v)]); } \ + sum0 -= sum1; \ +- ts[SBLIMIT*(8-(v))] = out1[8-(v)] + sum0 * w[8-(v)]; \ +- ts[SBLIMIT*(9+(v))] = out1[9+(v)] + sum0 * w[9+(v)]; ++ ts[SBLIMIT*(8-(v))] = out1[8-(v)] + REAL_MUL(sum0, w[8-(v)]); \ ++ ts[SBLIMIT*(9+(v))] = out1[9+(v)] + REAL_MUL(sum0, w[9+(v)]); + #define MACRO1(v) { \ + real sum0,sum1; \ + sum0 = tmp1a + tmp2a; \ +- sum1 = (tmp1b + tmp2b) * tfcos36[(v)]; \ ++ sum1 = REAL_MUL((tmp1b + tmp2b), tfcos36[(v)]); \ + MACRO0(v); } + #define MACRO2(v) { \ + real sum0,sum1; \ + sum0 = tmp2a - tmp1a; \ +- sum1 = (tmp2b - tmp1b) * tfcos36[(v)]; \ ++ sum1 = REAL_MUL((tmp2b - tmp1b), tfcos36[(v)]); \ + MACRO0(v); } + + register const real *c = COS9; +@@ -1446,17 +1446,17 @@ + + real ta33,ta66,tb33,tb66; + +- ta33 = in[2*3+0] * c[3]; +- ta66 = in[2*6+0] * c[6] + in[2*0+0]; +- tb33 = in[2*3+1] * c[3]; +- tb66 = in[2*6+1] * c[6] + in[2*0+1]; ++ ta33 = REAL_MUL(in[2*3+0], c[3]); ++ ta66 = REAL_MUL(in[2*6+0], c[6]); ++ tb33 = REAL_MUL(in[2*3+1], c[3]); ++ tb66 = REAL_MUL(in[2*6+1], c[6]); + + { + real tmp1a,tmp2a,tmp1b,tmp2b; +- tmp1a = in[2*1+0] * c[1] + ta33 + in[2*5+0] * c[5] + in[2*7+0] * c[7]; +- tmp1b = in[2*1+1] * c[1] + tb33 + in[2*5+1] * c[5] + in[2*7+1] * c[7]; +- tmp2a = in[2*2+0] * c[2] + in[2*4+0] * c[4] + ta66 + in[2*8+0] * c[8]; +- tmp2b = in[2*2+1] * c[2] + in[2*4+1] * c[4] + tb66 + in[2*8+1] * c[8]; ++ tmp1a = REAL_MUL(in[2*1+0], c[1]) + ta33 + REAL_MUL(in[2*5+0], c[5]) + REAL_MUL(in[2*7+0], c[7]); ++ tmp1b = REAL_MUL(in[2*1+1], c[1]) + tb33 + REAL_MUL(in[2*5+1], c[5]) + REAL_MUL(in[2*7+1], c[7]); ++ tmp2a = REAL_MUL(in[2*2+0], c[2]) + REAL_MUL(in[2*4+0], c[4]) + ta66 + REAL_MUL(in[2*8+0], c[8]); ++ tmp2b = REAL_MUL(in[2*2+1], c[2]) + REAL_MUL(in[2*4+1], c[4]) + tb66 + REAL_MUL(in[2*8+1], c[8]); + + MACRO1(0); + MACRO2(8); +@@ -1464,10 +1464,10 @@ + + { + real tmp1a,tmp2a,tmp1b,tmp2b; +- tmp1a = ( in[2*1+0] - in[2*5+0] - in[2*7+0] ) * c[3]; +- tmp1b = ( in[2*1+1] - in[2*5+1] - in[2*7+1] ) * c[3]; +- tmp2a = ( in[2*2+0] - in[2*4+0] - in[2*8+0] ) * c[6] - in[2*6+0] + in[2*0+0]; +- tmp2b = ( in[2*2+1] - in[2*4+1] - in[2*8+1] ) * c[6] - in[2*6+1] + in[2*0+1]; ++ tmp1a = REAL_MUL(( in[2*1+0] - in[2*5+0] - in[2*7+0] ), c[3]); ++ tmp1b = REAL_MUL(( in[2*1+1] - in[2*5+1] - in[2*7+1] ), c[3]); ++ tmp2a = REAL_MUL(( in[2*2+0] - in[2*4+0] - in[2*8+0] ), c[6]) - in[2*6+0] + in[2*0+0]; ++ tmp2b = REAL_MUL(( in[2*2+1] - in[2*4+1] - in[2*8+1] ), c[6]) - in[2*6+1] + in[2*0+1]; + + MACRO1(1); + MACRO2(7); +@@ -1475,10 +1475,10 @@ + + { + real tmp1a,tmp2a,tmp1b,tmp2b; +- tmp1a = in[2*1+0] * c[5] - ta33 - in[2*5+0] * c[7] + in[2*7+0] * c[1]; +- tmp1b = in[2*1+1] * c[5] - tb33 - in[2*5+1] * c[7] + in[2*7+1] * c[1]; +- tmp2a = - in[2*2+0] * c[8] - in[2*4+0] * c[2] + ta66 + in[2*8+0] * c[4]; +- tmp2b = - in[2*2+1] * c[8] - in[2*4+1] * c[2] + tb66 + in[2*8+1] * c[4]; ++ tmp1a = REAL_MUL(in[2*1+0], c[5]) - ta33 - REAL_MUL(in[2*5+0], c[7]) + REAL_MUL(in[2*7+0], c[1]); ++ tmp1b = REAL_MUL(in[2*1+1], c[5]) - tb33 - REAL_MUL(in[2*5+1], c[7]) + REAL_MUL(in[2*7+1], c[1]); ++ tmp2a = - REAL_MUL(in[2*2+0], c[8]) - REAL_MUL(in[2*4+0], c[2]) + ta66 + REAL_MUL(in[2*8+0], c[4]); ++ tmp2b = - REAL_MUL(in[2*2+1], c[8]) - REAL_MUL(in[2*4+1], c[2]) + tb66 + REAL_MUL(in[2*8+1], c[4]); + + MACRO1(2); + MACRO2(6); +@@ -1486,10 +1486,10 @@ + + { + real tmp1a,tmp2a,tmp1b,tmp2b; +- tmp1a = in[2*1+0] * c[7] - ta33 + in[2*5+0] * c[1] - in[2*7+0] * c[5]; +- tmp1b = in[2*1+1] * c[7] - tb33 + in[2*5+1] * c[1] - in[2*7+1] * c[5]; +- tmp2a = - in[2*2+0] * c[4] + in[2*4+0] * c[8] + ta66 - in[2*8+0] * c[2]; +- tmp2b = - in[2*2+1] * c[4] + in[2*4+1] * c[8] + tb66 - in[2*8+1] * c[2]; ++ tmp1a = REAL_MUL(in[2*1+0], c[7]) - ta33 + REAL_MUL(in[2*5+0], c[1]) - REAL_MUL(in[2*7+0], c[5]); ++ tmp1b = REAL_MUL(in[2*1+1], c[7]) - tb33 + REAL_MUL(in[2*5+1], c[1]) - REAL_MUL(in[2*7+1], c[5]); ++ tmp2a = - REAL_MUL(in[2*2+0], c[4]) + REAL_MUL(in[2*4+0], c[8]) + ta66 - REAL_MUL(in[2*8+0], c[2]); ++ tmp2b = - REAL_MUL(in[2*2+1], c[4]) + REAL_MUL(in[2*4+1], c[8]) + tb66 - REAL_MUL(in[2*8+1], c[2]); + + MACRO1(3); + MACRO2(5); +@@ -1498,7 +1498,7 @@ + { + real sum0,sum1; + sum0 = in[2*0+0] - in[2*2+0] + in[2*4+0] - in[2*6+0] + in[2*8+0]; +- sum1 = (in[2*0+1] - in[2*2+1] + in[2*4+1] - in[2*6+1] + in[2*8+1] ) * tfcos36[4]; ++ sum1 = REAL_MUL((in[2*0+1] - in[2*2+1] + in[2*4+1] - in[2*6+1] + in[2*8+1] ), tfcos36[4]); + MACRO0(4); + } + } +@@ -1522,19 +1522,19 @@ + \ + in5 += in3; in3 += in1; \ + \ +- in2 *= COS6_1; \ +- in3 *= COS6_1; \ ++ in2 = REAL_MUL(in2, COS6_1); \ ++ in3 = REAL_MUL(in3, COS6_1); \ + + #define DCT12_PART2 \ +- in0 += in4 * COS6_2; \ ++ in0 += REAL_MUL(in4, COS6_2); \ + \ + in4 = in0 + in2; \ + in0 -= in2; \ + \ +- in1 += in5 * COS6_2; \ ++ in1 += REAL_MUL(in5, COS6_2); \ + \ +- in5 = (in1 + in3) * tfcos12[0]; \ +- in1 = (in1 - in3) * tfcos12[2]; \ ++ in5 = REAL_MUL((in1 + in3), tfcos12[0]); \ ++ in1 = REAL_MUL((in1 - in3), tfcos12[2]); \ + \ + in3 = in4 + in5; \ + in4 -= in5; \ +@@ -1554,27 +1554,27 @@ + { + real tmp0,tmp1 = (in0 - in4); + { +- real tmp2 = (in1 - in5) * tfcos12[1]; ++ real tmp2 = REAL_MUL((in1 - in5), tfcos12[1]); + tmp0 = tmp1 + tmp2; + tmp1 -= tmp2; + } +- ts[(17-1)*SBLIMIT] = out1[17-1] + tmp0 * wi[11-1]; +- ts[(12+1)*SBLIMIT] = out1[12+1] + tmp0 * wi[6+1]; +- ts[(6 +1)*SBLIMIT] = out1[6 +1] + tmp1 * wi[1]; +- ts[(11-1)*SBLIMIT] = out1[11-1] + tmp1 * wi[5-1]; ++ ts[(17-1)*SBLIMIT] = out1[17-1] + REAL_MUL(tmp0, wi[11-1]); ++ ts[(12+1)*SBLIMIT] = out1[12+1] + REAL_MUL(tmp0, wi[6+1]); ++ ts[(6 +1)*SBLIMIT] = out1[6 +1] + REAL_MUL(tmp1, wi[1]); ++ ts[(11-1)*SBLIMIT] = out1[11-1] + REAL_MUL(tmp1, wi[5-1]); + } + + DCT12_PART2 + +- ts[(17-0)*SBLIMIT] = out1[17-0] + in2 * wi[11-0]; +- ts[(12+0)*SBLIMIT] = out1[12+0] + in2 * wi[6+0]; +- ts[(12+2)*SBLIMIT] = out1[12+2] + in3 * wi[6+2]; +- ts[(17-2)*SBLIMIT] = out1[17-2] + in3 * wi[11-2]; +- +- ts[(6+0)*SBLIMIT] = out1[6+0] + in0 * wi[0]; +- ts[(11-0)*SBLIMIT] = out1[11-0] + in0 * wi[5-0]; +- ts[(6+2)*SBLIMIT] = out1[6+2] + in4 * wi[2]; +- ts[(11-2)*SBLIMIT] = out1[11-2] + in4 * wi[5-2]; ++ ts[(17-0)*SBLIMIT] = out1[17-0] + REAL_MUL(in2, wi[11-0]); ++ ts[(12+0)*SBLIMIT] = out1[12+0] + REAL_MUL(in2, wi[6+0]); ++ ts[(12+2)*SBLIMIT] = out1[12+2] + REAL_MUL(in3, wi[6+2]); ++ ts[(17-2)*SBLIMIT] = out1[17-2] + REAL_MUL(in3, wi[11-2]); ++ ++ ts[(6 +0)*SBLIMIT] = out1[6+0] + REAL_MUL(in0, wi[0]); ++ ts[(11-0)*SBLIMIT] = out1[11-0] + REAL_MUL(in0, wi[5-0]); ++ ts[(6 +2)*SBLIMIT] = out1[6+2] + REAL_MUL(in4, wi[2]); ++ ts[(11-2)*SBLIMIT] = out1[11-2] + REAL_MUL(in4, wi[5-2]); + } + + in++; +@@ -1588,27 +1588,27 @@ + { + real tmp0,tmp1 = (in0 - in4); + { +- real tmp2 = (in1 - in5) * tfcos12[1]; ++ real tmp2 = REAL_MUL((in1 - in5), tfcos12[1]); + tmp0 = tmp1 + tmp2; + tmp1 -= tmp2; + } +- out2[5-1] = tmp0 * wi[11-1]; +- out2[0+1] = tmp0 * wi[6+1]; +- ts[(12+1)*SBLIMIT] += tmp1 * wi[1]; +- ts[(17-1)*SBLIMIT] += tmp1 * wi[5-1]; ++ out2[5-1] = REAL_MUL(tmp0, wi[11-1]); ++ out2[0+1] = REAL_MUL(tmp0, wi[6+1]); ++ ts[(12+1)*SBLIMIT] += REAL_MUL(tmp1, wi[1]); ++ ts[(17-1)*SBLIMIT] += REAL_MUL(tmp1, wi[5-1]); + } + + DCT12_PART2 + +- out2[5-0] = in2 * wi[11-0]; +- out2[0+0] = in2 * wi[6+0]; +- out2[0+2] = in3 * wi[6+2]; +- out2[5-2] = in3 * wi[11-2]; +- +- ts[(12+0)*SBLIMIT] += in0 * wi[0]; +- ts[(17-0)*SBLIMIT] += in0 * wi[5-0]; +- ts[(12+2)*SBLIMIT] += in4 * wi[2]; +- ts[(17-2)*SBLIMIT] += in4 * wi[5-2]; ++ out2[5-0] = REAL_MUL(in2, wi[11-0]); ++ out2[0+0] = REAL_MUL(in2, wi[6+0]); ++ out2[0+2] = REAL_MUL(in3, wi[6+2]); ++ out2[5-2] = REAL_MUL(in3, wi[11-2]); ++ ++ ts[(12+0)*SBLIMIT] += REAL_MUL(in0, wi[0]); ++ ts[(17-0)*SBLIMIT] += REAL_MUL(in0, wi[5-0]); ++ ts[(12+2)*SBLIMIT] += REAL_MUL(in4, wi[2]); ++ ts[(17-2)*SBLIMIT] += REAL_MUL(in4, wi[5-2]); + } + + in++; +@@ -1623,27 +1623,27 @@ + { + real tmp0,tmp1 = (in0 - in4); + { +- real tmp2 = (in1 - in5) * tfcos12[1]; ++ real tmp2 = REAL_MUL((in1 - in5), tfcos12[1]); + tmp0 = tmp1 + tmp2; + tmp1 -= tmp2; + } +- out2[11-1] = tmp0 * wi[11-1]; +- out2[6 +1] = tmp0 * wi[6+1]; +- out2[0+1] += tmp1 * wi[1]; +- out2[5-1] += tmp1 * wi[5-1]; ++ out2[11-1] = REAL_MUL(tmp0, wi[11-1]); ++ out2[6 +1] = REAL_MUL(tmp0, wi[6+1]); ++ out2[0+1] += REAL_MUL(tmp1, wi[1]); ++ out2[5-1] += REAL_MUL(tmp1, wi[5-1]); + } + + DCT12_PART2 + +- out2[11-0] = in2 * wi[11-0]; +- out2[6 +0] = in2 * wi[6+0]; +- out2[6 +2] = in3 * wi[6+2]; +- out2[11-2] = in3 * wi[11-2]; +- +- out2[0+0] += in0 * wi[0]; +- out2[5-0] += in0 * wi[5-0]; +- out2[0+2] += in4 * wi[2]; +- out2[5-2] += in4 * wi[5-2]; ++ out2[11-0] = REAL_MUL(in2, wi[11-0]); ++ out2[6 +0] = REAL_MUL(in2, wi[6+0]); ++ out2[6 +2] = REAL_MUL(in3, wi[6+2]); ++ out2[11-2] = REAL_MUL(in3, wi[11-2]); ++ ++ out2[0+0] += REAL_MUL(in0, wi[0]); ++ out2[5-0] += REAL_MUL(in0, wi[5-0]); ++ out2[0+2] += REAL_MUL(in4, wi[2]); ++ out2[5-2] += REAL_MUL(in4, wi[5-2]); + } + } + +@@ -1693,7 +1693,7 @@ + int i; + for(i=0;i<SSLIMIT;i++) { + tspnt[i*SBLIMIT] = *rawout1++; +- *rawout2++ = 0.0; ++ *rawout2++ = DOUBLE_TO_REAL(0.0); + } + } + } +@@ -1865,5 +1865,3 @@ + + return clip; + } +- +- diff --git a/audio/mpg123-nas/patches/patch-aj b/audio/mpg123-nas/patches/patch-aj new file mode 100644 index 00000000000..a8037fb728d --- /dev/null +++ b/audio/mpg123-nas/patches/patch-aj @@ -0,0 +1,42 @@ +$NetBSD: patch-aj,v 1.1.1.1.2.2 2002/06/23 18:38:51 jlam Exp $ + +--- mpg123.h.orig Sat May 29 00:51:58 1999 ++++ mpg123.h Tue Oct 12 01:17:16 1999 +@@ -56,8 +56,37 @@ + # define real float + #elif defined(REAL_IS_LONG_DOUBLE) + # define real long double ++#elif defined(REAL_IS_FIXED) ++# define real long ++ ++# define REAL_RADIX 15 ++# define REAL_FACTOR (32.0 * 1024.0) ++ ++# define REAL_PLUS_32767 ( 32767 << REAL_RADIX ) ++# define REAL_MINUS_32768 ( -32768 << REAL_RADIX ) ++ ++# define DOUBLE_TO_REAL(x) ((int)((x) * REAL_FACTOR)) ++# define REAL_TO_SHORT(x) ((x) >> REAL_RADIX) ++# define REAL_MUL(x, y) (((long long)(x) * (long long)(y)) >> REAL_RADIX) ++ + #else + # define real double ++#endif ++ ++#ifndef DOUBLE_TO_REAL ++# define DOUBLE_TO_REAL(x) (x) ++#endif ++#ifndef REAL_TO_SHORT ++# define REAL_TO_SHORT(x) (x) ++#endif ++#ifndef REAL_PLUS_32767 ++# define REAL_PLUS_32767 32767.0 ++#endif ++#ifndef REAL_MINUS_32768 ++# define REAL_MINUS_32768 -32768.0 ++#endif ++#ifndef REAL_MUL ++# define REAL_MUL(x, y) ((x) * (y)) + #endif + + #ifdef __GNUC__ diff --git a/audio/mpg123-nas/patches/patch-ak b/audio/mpg123-nas/patches/patch-ak new file mode 100644 index 00000000000..46266d67975 --- /dev/null +++ b/audio/mpg123-nas/patches/patch-ak @@ -0,0 +1,40 @@ +$NetBSD: patch-ak,v 1.1.1.1.2.2 2002/06/23 18:38:52 jlam Exp $ + +--- tabinit.c.orig Mon Feb 15 23:55:11 1999 ++++ tabinit.c Thu Aug 12 17:31:33 1999 +@@ -56,7 +56,7 @@ + kr=0x10>>i; divv=0x40>>i; + costab = pnts[i]; + for(k=0;k<kr;k++) +- costab[k] = 1.0 / (2.0 * cos(M_PI * ((double) k * 2.0 + 1.0) / (double) divv)); ++ costab[k] = DOUBLE_TO_REAL(1.0 / (2.0 * cos(M_PI * ((double) k * 2.0 + 1.0) / (double) divv))); + #ifdef USE_3DNOW + for(k=0;k<kr;k++) + costab[k+kr] = -costab[k]; +@@ -69,7 +69,7 @@ + for(i=0,j=0;i<256;i++,j++,idx+=32) + { + if(idx < 512+16) +- decwin[idx+16] = decwin[idx] = (double) intwinbase[j] / 65536.0 * (double) scaleval; ++ decwin[idx+16] = decwin[idx] = DOUBLE_TO_REAL((double) intwinbase[j] / 65536.0 * (double) scaleval); + + if(i % 32 == 31) + idx -= 1023; +@@ -80,7 +80,7 @@ + for( /* i=256 */ ;i<512;i++,j--,idx+=32) + { + if(idx < 512+16) +- decwin[idx+16] = decwin[idx] = (double) intwinbase[j] / 65536.0 * (double) scaleval; ++ decwin[idx+16] = decwin[idx] = DOUBLE_TO_REAL((double) intwinbase[j] / 65536.0 * (double) scaleval); + + if(i % 32 == 31) + idx -= 1023; +@@ -91,7 +91,7 @@ + #ifdef USE_3DNOW + if(!param.down_sample) { + for(i=0;i<512+32;i++) { +- decwin[512+31-i] *= 65536.0; /* allows faster clipping in 3dnow code */ ++ decwin[512+31-i] = REAL_MUL(decwin[512+31-i], 65536.0); /* allows faster clipping in 3dnow code */ + decwin[512+32+i] = decwin[512+31-i]; + } + } diff --git a/audio/mpg123-nas/patches/patch-al b/audio/mpg123-nas/patches/patch-al new file mode 100644 index 00000000000..f83030220db --- /dev/null +++ b/audio/mpg123-nas/patches/patch-al @@ -0,0 +1,40 @@ +$NetBSD: patch-al,v 1.1.1.1.2.2 2002/06/23 18:38:52 jlam Exp $ + +--- readers.c.orig Thu Mar 4 11:03:49 1999 ++++ readers.c Sat May 12 20:09:05 2001 +@@ -1,5 +1,9 @@ + #include <stdlib.h> + ++#ifdef __NetBSD__ ++#include <sys/param.h> ++#endif ++ + #include <sys/types.h> + #include <sys/stat.h> + #include <fcntl.h> +@@ -251,7 +255,12 @@ + return -1; + + mapend = mapbuf + len; +- ++ ++#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104030000) ++ if(madvise(mapbuf, mapend-mapbuf, MADV_SEQUENTIAL) < 0) ++ fprintf(stderr,"madvise failed, continuing anyways..\n"); ++#endif ++ + if(param.verbose > 1) + fprintf(stderr,"Using memory mapped IO for this stream.\n"); + +@@ -268,6 +276,11 @@ + + static void mapped_close(struct reader *rds) + { ++#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104030000) ++ if(madvise(mapbuf, mapend-mapbuf, MADV_FREE) < 0) ++ fprintf(stderr,"madvise failed, continuing anyways..\n"); ++#endif ++ + munmap((void *)mapbuf,mapend-mapbuf); + if (rds->flags & READER_FD_OPENED) + close(rds->filept); diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile index 9fde9bd3dfd..472c2d6d7d1 100644 --- a/audio/mpg123/Makefile +++ b/audio/mpg123/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.32 2002/04/25 16:34:15 abs Exp $ +# $NetBSD: Makefile,v 1.32.2.1 2002/06/23 18:38:37 jlam Exp $ DISTNAME= mpg123-0.59r -PKGREVISION= 1 PKGNAME= mpg123-0.59.18 +PKGREVISION= 2 CATEGORIES= audio MASTER_SITES= http://www.mpg123.de/mpg123/ \ http://www-ti.informatik.uni-tuebingen.de/~hippm/mpg123/ @@ -14,6 +14,8 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.mpg123.de/ COMMENT= Command-line player for mpeg layer 1, 2 and 3 audio +CONFLICTS+= mpg123-nas-[0-9]* + BUILD_DEFS+= USE_INET6 DIST_SUBDIR= mpg123 diff --git a/audio/mpg123/distinfo b/audio/mpg123/distinfo index 38c1a533394..37ef94114df 100644 --- a/audio/mpg123/distinfo +++ b/audio/mpg123/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.8 2002/04/25 16:34:15 abs Exp $ +$NetBSD: distinfo,v 1.8.2.1 2002/06/23 18:38:37 jlam Exp $ SHA1 (mpg123/mpg123-0.59r.tar.gz) = c32fe242f4506d218bd19a51a4034da9fdc79493 Size (mpg123/mpg123-0.59r.tar.gz) = 159028 bytes SHA1 (mpg123/mpg123-059r-v6-20000713b.diff.gz) = fab11489b6a1ab79d6c29787161f1c05e492dc0b Size (mpg123/mpg123-059r-v6-20000713b.diff.gz) = 5600 bytes -SHA1 (patch-aa) = d48107632e452cf443710edbb6376ef381aba41c +SHA1 (patch-aa) = 5f5310e52c8a7b17bc675d6d3b21ea629f644b40 SHA1 (patch-ab) = ffc387d93f0f2832e49796c80be26e908defa3a7 SHA1 (patch-ac) = 06a5037e27ddd4cc34e5348c09e702f9740173c5 SHA1 (patch-ad) = e9b2b874a95a67139c7d48e74492eb64dfa815f0 @@ -18,3 +18,4 @@ SHA1 (patch-ak) = b30898cff26859eca0d23ea8cfdd461920b978a8 SHA1 (patch-al) = 88dec640d40e6a3f1828096a4ff7b5a4dbd0a222 SHA1 (patch-am) = 661c1f95f65145f4e08706eb3f6fe975118a2822 SHA1 (patch-an) = 08917e1825adcfd870bb2c61ae865339da7c45ef +SHA1 (patch-ao) = 40961a43cc3dbebf71deee1c240907896d297304 diff --git a/audio/mpg123/patches/patch-aa b/audio/mpg123/patches/patch-aa index 6ce8e8b6cff..4ee32dc198e 100644 --- a/audio/mpg123/patches/patch-aa +++ b/audio/mpg123/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.17 2002/04/25 16:34:16 abs Exp $ +$NetBSD: patch-aa,v 1.17.2.1 2002/06/23 18:38:37 jlam Exp $ ---- Makefile.orig Thu Feb 28 10:17:44 2002 -+++ Makefile Thu Feb 28 10:19:04 2002 -@@ -54,6 +54,10 @@ +--- Makefile.orig Sun Jun 23 03:50:48 2002 ++++ Makefile +@@ -54,6 +54,15 @@ @echo "make aix-tk3play IBM AIX" @echo "make os2 IBM OS/2" @echo "make netbsd NetBSD" @@ -10,19 +10,44 @@ $NetBSD: patch-aa,v 1.17 2002/04/25 16:34:16 abs Exp $ + @echo "make netbsd-i386 NetBSD optimized for i386" + @echo "make netbsd-i386-elf NetBSD optimized for i386, ELF format" + @echo "make netbsd-m68k NetBSD optimized for m68k" ++ @echo "make netbsd-esd NetBSD with EsounD" ++ @echo "make netbsd-arm-esd NetBSD for strongarm with EsounD" ++ @echo "make netbsd-i386-esd NetBSD optimized for i386 with EsounD" ++ @echo "make netbsd-i386-elf-esd NetBSD optimized for i386, ELF format with EsounD" ++ @echo "make netbsd-m68k-esd NetBSD optimized for m68k with EsounD" @echo "make bsdos BSDI BSD/OS" @echo "make bsdos4 BSDI BSD/OS 4.0" @echo "make bsdos-nas BSDI BSD/OS with NAS support" -@@ -377,6 +381,34 @@ - -funroll-all-loops -finline-functions' \ +@@ -496,18 +505,100 @@ + + netbsd: + $(MAKE) CC=cc LDFLAGS= \ +- OBJECTS='decode.o dct64.o audio_sun.o' \ ++ OBJECTS='decode.o dct64.o audio_sun.o term.o' \ + CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \ +- -funroll-all-loops -ffast-math \ +- -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \ ++ -funroll-all-loops -ffast-math -DREAD_MMAP \ ++ -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD' \ mpg123-make + netbsd-i386: + $(MAKE) CC=cc LDFLAGS= \ +- OBJECTS='decode_i386.o dct64_i386.o audio_sun.o' \ +- CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \ ++ OBJECTS='decode_i386.o dct64_i386.o audio_sun.o term.o' \ ++ CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \ ++ -funroll-all-loops -ffast-math -DROT_I386 -DREAD_MMAP \ ++ -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD' \ ++ mpg123-make ++ +netbsd-i386-elf: + $(MAKE) CC=cc LDFLAGS= \ + OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \ + audio_sun.o term.o' \ + CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \ -+ -funroll-all-loops -ffast-math -DROT_I386 \ + -funroll-all-loops -ffast-math -DROT_I386 \ +- -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \ + -DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DUSE_MMAP \ + -DREAD_MMAP -DNETBSD -DTERM_CONTROL' \ + mpg123-make @@ -45,32 +70,58 @@ $NetBSD: patch-aa,v 1.17 2002/04/25 16:34:16 abs Exp $ + -DNETBSD' \ + mpg123-make + - solaris-gcc-esd: - $(MAKE) CC=gcc LDFLAGS='-lsocket -lnsl' \ - AUDIO_LIB='-lesd -lresolv' \ -@@ -496,18 +528,18 @@ - - netbsd: - $(MAKE) CC=cc LDFLAGS= \ -- OBJECTS='decode.o dct64.o audio_sun.o' \ -+ OBJECTS='decode.o dct64.o audio_sun.o term.o' \ - CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \ -- -funroll-all-loops -ffast-math \ -- -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \ ++netbsd-esd: ++ $(MAKE) CC=cc LDFLAGS= \ ++ AUDIO_LIB="`$(ESD_CONFIG) --libs`" \ ++ OBJECTS='decode.o dct64.o audio_esd.o term.o' \ ++ CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \ + -funroll-all-loops -ffast-math -DREAD_MMAP \ -+ -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD' \ - mpg123-make - - netbsd-i386: - $(MAKE) CC=cc LDFLAGS= \ -- OBJECTS='decode_i386.o dct64_i386.o audio_sun.o' \ -- CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \ -- -funroll-all-loops -ffast-math -DROT_I386 \ -- -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \ -+ OBJECTS='decode_i386.o dct64_i386.o audio_sun.o term.o' \ ++ -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD \ ++ `$(ESD_CONFIG) --cflags`' \ ++ mpg123-make ++ ++netbsd-i386-esd: ++ $(MAKE) CC=cc LDFLAGS= \ ++ AUDIO_LIB="`$(ESD_CONFIG) --libs`" \ ++ OBJECTS='decode_i386.o dct64_i386.o audio_esd.o term.o' \ + CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \ + -funroll-all-loops -ffast-math -DROT_I386 -DREAD_MMAP \ -+ -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD' \ ++ -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD \ ++ `$(ESD_CONFIG) --cflags`' \ ++ mpg123-make ++ ++netbsd-i386-elf-esd: ++ echo GETBITS: $(GETBITS) ++ $(MAKE) CC=cc LDFLAGS= \ ++ AUDIO_LIB="`$(ESD_CONFIG) --libs`" \ ++ OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \ ++ audio_esd.o term.o' \ ++ CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \ ++ -funroll-all-loops -ffast-math -DROT_I386 \ ++ -DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DUSE_MMAP \ ++ -DREAD_MMAP -DNETBSD -DTERM_CONTROL \ ++ `$(ESD_CONFIG) --cflags`' \ ++ mpg123-make ++ ++netbsd-m68k-esd: ++ $(MAKE) CC=cc LDFLAGS= \ ++ AUDIO_LIB="`$(ESD_CONFIG) --libs`" \ ++ OBJECTS='decode.o dct64.o audio_esd.o term.o' \ ++ CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \ ++ -ffast-math -DREAL_IS_FLOAT -DREAD_MMAP \ ++ -DUSE_MMAP -DNETBSD -DM68K_ASSEM -DTERM_CONTROL \ ++ `$(ESD_CONFIG) --cflags`' \ ++ mpg123-make ++ ++netbsd-arm-esd: ++ $(MAKE) CC=cc LDFLAGS= \ ++ AUDIO_LIB="`$(ESD_CONFIG) --libs`" \ ++ OBJECTS='decode.o dct64.o audio_esd.o term.o' \ ++ CFLAGS='$(CFLAGS) -Wall -O6 -fomit-frame-pointer \ ++ -funroll-all-loops -finline-functions -ffast-math \ ++ -march=armv4 -mtune=strongarm -mcpu=strongarm \ ++ -DREAL_IS_FIXED -DUSE_MMAP -DREAD_MMAP -DTERM_CONTROL \ ++ -DNETBSD `$(ESD_CONFIG) --cflags`' \ mpg123-make bsdos: diff --git a/audio/mpg123/patches/patch-ao b/audio/mpg123/patches/patch-ao new file mode 100644 index 00000000000..c1cd6f49385 --- /dev/null +++ b/audio/mpg123/patches/patch-ao @@ -0,0 +1,24 @@ +$NetBSD: patch-ao,v 1.1.2.2 2002/06/23 18:38:38 jlam Exp $ + +--- audio_esd.c.orig Sat May 29 00:06:29 1999 ++++ audio_esd.c +@@ -8,6 +8,10 @@ + #include <stropts.h> + #include <sys/conf.h> + #endif ++#ifdef NETBSD ++#include <sys/ioctl.h> ++#include <sys/audioio.h> ++#endif + + static unsigned esd_rate = 0, esd_format = 0, esd_channels = 0; + +@@ -75,7 +79,7 @@ + else if (ai->rate > esd_rate) + return -1; + +- ai->fn = esd_play_stream_fallback(format, ai->rate, esdserver, "mpg123"); ++ ai->fn = esd_play_stream_fallback(format, ai->rate, NULL/*esdserver*/, "mpg123"); + return (ai->fn); + } + diff --git a/audio/mpg321/DESCR b/audio/mpg321/DESCR new file mode 100644 index 00000000000..a94c5a30ae9 --- /dev/null +++ b/audio/mpg321/DESCR @@ -0,0 +1,10 @@ +mpg321 is a Free replacement for mpg123, a very popular command-line mp3 +player. mpg123 is used for frontends, as an mp3 player and as an mp3 to +wave file decoder (primarily for use with CD-recording software.) In all +of these capacities, mpg321 can be used as a drop-in replacement for +mpg123. + +mpg321 is a project conceived and written by Joe Drew <hoserhead@woot.net>. +It uses code from the MAD distribution by Rob Leslie; XMMS; and plaympeg +from the SMPEG distribution. mpg321 is licensed under the GNU General +Public License version 2, as documented in the 'COPYING' file. diff --git a/audio/mpg321/Makefile b/audio/mpg321/Makefile new file mode 100644 index 00000000000..86228bb826a --- /dev/null +++ b/audio/mpg321/Makefile @@ -0,0 +1,16 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:38:53 jlam Exp $ + +DISTNAME= mpg321-0.2.10 +CATEGORIES= audio +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mpg321/} + +MAINTAINER= rxg@netbsd.org +HOMEPAGE= http://mpg321.sourceforge.net/ +COMMENT= Free replacement for mpg123 + +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --disable-mpg123-symlink + +.include "../../audio/libao/buildlink.mk" +.include "../../audio/mad/buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/audio/mpg321/PLIST b/audio/mpg321/PLIST new file mode 100644 index 00000000000..765507d1233 --- /dev/null +++ b/audio/mpg321/PLIST @@ -0,0 +1,3 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.50.2 2002/06/23 18:38:54 jlam Exp $ +bin/mpg321 +man/man1/mpg321.1 diff --git a/audio/mpg321/distinfo b/audio/mpg321/distinfo new file mode 100644 index 00000000000..a82a68863ce --- /dev/null +++ b/audio/mpg321/distinfo @@ -0,0 +1,4 @@ +$NetBSD: distinfo,v 1.1.1.1.4.2 2002/06/23 18:38:55 jlam Exp $ + +SHA1 (mpg321-0.2.10.tar.gz) = 90268d0d187ddd7625d143b95791cb39a1630b79 +Size (mpg321-0.2.10.tar.gz) = 113449 bytes diff --git a/audio/mserv/Makefile b/audio/mserv/Makefile index d7fc81a9d88..a1efa13b818 100644 --- a/audio/mserv/Makefile +++ b/audio/mserv/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2002/02/15 00:42:31 hubertf Exp $ +# $NetBSD: Makefile,v 1.2.2.1 2002/06/23 18:38:56 jlam Exp $ # DISTNAME= mserv-0.33 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= audio MASTER_SITES= http://www.mserv.org/download/ @@ -10,6 +10,8 @@ MAINTAINER= martin@netbsd.org HOMEPAGE= http://www.mserv.org/ COMMENT= local centralised music server environment +DEPENDS+= mpg123-[0-9]*:../mpg123 + ALL_TARGET= default REPLACE_PERL= mserv/mservedit webclient/main.cgi webclient/margin.cgi webclient/mserv.cgi diff --git a/audio/mserv/PLIST b/audio/mserv/PLIST index 018ff1cbb22..e8c563b21c0 100644 --- a/audio/mserv/PLIST +++ b/audio/mserv/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2002/02/12 14:22:14 martin Exp $ +@comment $NetBSD: PLIST,v 1.1.2.1 2002/06/23 18:38:56 jlam Exp $ bin/mserv bin/mservcmd bin/mservedit @@ -9,4 +9,12 @@ lib/libmservplus.a man/man1/mserv.1 man/man1/mservcmd.1 share/mserv/english.lang +share/mserv/webclient/README +share/mserv/webclient/back.gif +share/mserv/webclient/index.html +share/mserv/webclient/main.cgi +share/mserv/webclient/margin.cgi +share/mserv/webclient/mserv.cgi +share/mserv/webclient/mserv7.gif +@dirrm share/mserv/webclient @dirrm share/mserv diff --git a/audio/mserv/distinfo b/audio/mserv/distinfo index dee3578f9d1..5016bc7d1c9 100644 --- a/audio/mserv/distinfo +++ b/audio/mserv/distinfo @@ -1,6 +1,12 @@ -$NetBSD: distinfo,v 1.2 2002/02/12 14:49:46 martin Exp $ +$NetBSD: distinfo,v 1.2.2.1 2002/06/23 18:38:57 jlam Exp $ SHA1 (mserv-0.33.tar.gz) = 4aa66852057942341d9da9c6f839d7ee250f6785 Size (mserv-0.33.tar.gz) = 136456 bytes -SHA1 (patch-aa) = 14cd015a4d8a02daf7708c566026ae6c985f3260 -SHA1 (patch-ab) = ba829dd06621a8034989e8e44812a3937b7002cd +SHA1 (patch-aa) = 1b98fc3141aa2991697d3ce243b1d36b7c396c79 +SHA1 (patch-ab) = a8c5fa8039b92318afae6e48329e799e3acc226a +SHA1 (patch-ac) = a84b11a87a794980570c8c4fbbd66d4e68a13a3e +SHA1 (patch-ad) = 62fbf36cd77f10909602baefcb1d6ab031bc3010 +SHA1 (patch-ae) = 0b2dd28cfc3a9845a1543f08738e0251334f1b87 +SHA1 (patch-af) = 2d35f18de17ddb98a5b5d8b8fd101b5fe8290e59 +SHA1 (patch-ag) = eed5668942fdc801685aeda8aa2c31ec24d03729 +SHA1 (patch-ah) = 23c8b611ea84670aea10bcc4b12f9670cf15a060 diff --git a/audio/mserv/patches/patch-aa b/audio/mserv/patches/patch-aa index 82876d97dbe..0eb053fa88f 100644 --- a/audio/mserv/patches/patch-aa +++ b/audio/mserv/patches/patch-aa @@ -1,13 +1,19 @@ -$NetBSD: patch-aa,v 1.1 2002/02/12 14:22:15 martin Exp $ +$NetBSD: patch-aa,v 1.1.2.1 2002/06/23 18:38:57 jlam Exp $ ---- mserv/defines.h.orig Thu Jul 13 23:35:18 2000 -+++ mserv/defines.h Tue Feb 12 14:49:02 2002 -@@ -57,7 +57,7 @@ - #define MISCINFOLEN 128 +--- Makefile.orig Sat Jul 15 18:29:10 2000 ++++ Makefile +@@ -2,11 +2,11 @@ + BASE = ${shell basename ${PWD}} - /* maximum number of tracks in each album */ --#define TRACKSPERALBUM 200 -+#define TRACKSPERALBUM 1200 + default: +- (cd mserv; ./configure) ++ (cd mserv; ./configure --prefix=${PREFIX} --datadir=${PREFIX}/share) + (cd mserv; make DEFS=${DEFS}) +- (cd mservcli; ./configure) ++ (cd mservcli; ./configure --prefix=${PREFIX} --datadir=${PREFIX}/share) + (cd mservcli; make DEFS=${DEFS}) +- (cd mservutils; ./configure) ++ (cd mservutils; ./configure --prefix=${PREFIX} --datadir=${PREFIX}/share) + (cd mservutils; make DEFS=${DEFS}) - /* maximum language line length */ - #define LANGLINELEN 1024 + install: diff --git a/audio/mserv/patches/patch-ab b/audio/mserv/patches/patch-ab index 756ef58bab8..f9fa94eb967 100644 --- a/audio/mserv/patches/patch-ab +++ b/audio/mserv/patches/patch-ab @@ -1,19 +1,14 @@ -$NetBSD: patch-ab,v 1.2 2002/02/12 14:49:46 martin Exp $ +$NetBSD: patch-ab,v 1.2.2.1 2002/06/23 18:38:58 jlam Exp $ ---- Makefile.orig Sat Jul 15 20:29:10 2000 -+++ Makefile Tue Feb 12 15:13:35 2002 -@@ -2,11 +2,11 @@ - BASE = ${shell basename ${PWD}} +--- mserv/config.h.in.orig Tue Jan 25 19:59:08 2000 ++++ mserv/config.h.in +@@ -11,6 +11,9 @@ + #define RETSIGTYPE void - default: -- (cd mserv; ./configure) -+ (cd mserv; ./configure --prefix=${PREFIX} --datadir=${PREFIX}/share) - (cd mserv; make DEFS=${DEFS}) -- (cd mservcli; ./configure) -+ (cd mservcli; ./configure --prefix=${PREFIX} --datadir=${PREFIX}/share) - (cd mservcli; make DEFS=${DEFS}) -- (cd mservutils; ./configure) -+ (cd mservutils; ./configure --prefix=${PREFIX} --datadir=${PREFIX}/share) - (cd mservutils; make DEFS=${DEFS}) + /* Define if we have soundcard.h */ ++#undef HAVE_SOUNDCARD_H ++ ++/* Define if we have sys/soundcard.h */ + #undef HAVE_SYS_SOUNDCARD_H - install: + /* Define if we have strsep() */ diff --git a/audio/mserv/patches/patch-ac b/audio/mserv/patches/patch-ac new file mode 100644 index 00000000000..51d1a7f41c8 --- /dev/null +++ b/audio/mserv/patches/patch-ac @@ -0,0 +1,12 @@ +$NetBSD: patch-ac,v 1.1.2.2 2002/06/23 18:38:58 jlam Exp $ + +--- mserv/configure.in.orig Tue Jan 25 19:59:11 2000 ++++ mserv/configure.in +@@ -28,6 +28,7 @@ + AC_CHECK_LIB(socket, main, XTRA_LIBS="$XTRA_LIBS -lsocket") + AC_CHECK_LIB(malloc, main, XTRA_LIBS="$XTRA_LIBS -lmalloc") + AC_CHECK_LIB(crypt, crypt, XTRA_LIBS="$XTRA_LIBS -lcrypt") ++ AC_CHECK_LIB(ossaudio, _oss_ioctl, XTRA_LIBS="$XTRA_LIBS -lossaudio") + AC_CHECK_LIB(nsl, inet_ntoa, XTRA_LIBS="$XTRA_LIBS -lnsl") + # AC_CHECK_LIB(resolv, main, XTRA_LIBS="$XTRA_LIBS -lresolv") + diff --git a/audio/mserv/patches/patch-ad b/audio/mserv/patches/patch-ad new file mode 100644 index 00000000000..d08d1c3377c --- /dev/null +++ b/audio/mserv/patches/patch-ad @@ -0,0 +1,51 @@ +$NetBSD: patch-ad,v 1.1.2.2 2002/06/23 18:38:59 jlam Exp $ + +--- mserv/configure.orig Sat Jul 15 18:33:45 2000 ++++ mserv/configure +@@ -1201,6 +1201,46 @@ + echo "$ac_t""no" 1>&6 + fi + ++ echo $ac_n "checking for _oss_ioctl in -lossaudio""... $ac_c" 1>&6 ++echo "configure:1206: checking for _oss_ioctl in -lossaudio" >&5 ++ac_lib_var=`echo ossaudio'_'_oss_ioctl | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ ac_save_LIBS="$LIBS" ++LIBS="-lossaudio $LIBS" ++cat > conftest.$ac_ext <<EOF ++#line 1214 "configure" ++#include "confdefs.h" ++/* Override any gcc2 internal prototype to avoid an error. */ ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char _oss_ioctl(); ++ ++int main() { ++_oss_ioctl() ++; return 0; } ++EOF ++if { (eval echo configure:1225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=no" ++fi ++rm -f conftest* ++LIBS="$ac_save_LIBS" ++ ++fi ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ XTRA_LIBS="$XTRA_LIBS -lossaudio" ++else ++ echo "$ac_t""no" 1>&6 ++fi ++ + echo $ac_n "checking for inet_ntoa in -lnsl""... $ac_c" 1>&6 + echo "configure:1206: checking for inet_ntoa in -lnsl" >&5 + ac_lib_var=`echo nsl'_'inet_ntoa | sed 'y%./+-%__p_%'` diff --git a/audio/mserv/patches/patch-ae b/audio/mserv/patches/patch-ae new file mode 100644 index 00000000000..fab9ca32d8a --- /dev/null +++ b/audio/mserv/patches/patch-ae @@ -0,0 +1,13 @@ +$NetBSD: patch-ae,v 1.1.2.2 2002/06/23 18:38:59 jlam Exp $ + +--- mserv/defconf.c.orig Thu Jul 13 21:20:42 2000 ++++ mserv/defconf.c +@@ -15,7 +15,7 @@ + + # Define player invokation methods + # mservplay is our special wrapper, the first parameter is a 'nice' level +-mpg123=/usr/local/bin/mpg123 -b 1024 ++mpg123=" PATH_MPG123 " -b 1024 + freeamp=/usr/local/bin/freeamp -ui mpg123 + mservplay=/usr/local/bin/mservplay 0 mpg123 -b 1024 + diff --git a/audio/mserv/patches/patch-af b/audio/mserv/patches/patch-af new file mode 100644 index 00000000000..1d6d12906fc --- /dev/null +++ b/audio/mserv/patches/patch-af @@ -0,0 +1,24 @@ +$NetBSD: patch-af,v 1.1.2.2 2002/06/23 18:39:00 jlam Exp $ + +--- mserv/defines.h.orig Thu Jul 13 21:35:18 2000 ++++ mserv/defines.h +@@ -16,6 +16,10 @@ + #define PATH_LANGUAGE SHAREDIR "/english.lang" + */ + ++#ifndef PATH_MPG123 ++#define PATH_MPG123 BINDIR "/mpg123" ++#endif ++ + /* maximum amount to queue in each output buffer */ + #define OUTBUFLEN 32*1024 + +@@ -57,7 +61,7 @@ + #define MISCINFOLEN 128 + + /* maximum number of tracks in each album */ +-#define TRACKSPERALBUM 200 ++#define TRACKSPERALBUM 250 + + /* maximum language line length */ + #define LANGLINELEN 1024 diff --git a/audio/mserv/patches/patch-ag b/audio/mserv/patches/patch-ag new file mode 100644 index 00000000000..a89ec3641b6 --- /dev/null +++ b/audio/mserv/patches/patch-ag @@ -0,0 +1,15 @@ +$NetBSD: patch-ag,v 1.1.2.2 2002/06/23 18:39:01 jlam Exp $ + +--- mserv/mservplay.c.orig Tue Jan 25 19:59:16 2000 ++++ mserv/mservplay.c +@@ -14,10 +14,6 @@ + #include "defines.h" + #include "misc.h" + +-#ifndef PATH_MPG123 +-#define PATH_MPG123 "/usr/local/bin/mpg123" +-#endif +- + int main(int argc, char *argv[]) + { + const pid_t pid = getpid(); diff --git a/audio/mserv/patches/patch-ah b/audio/mserv/patches/patch-ah new file mode 100644 index 00000000000..2ebe163f408 --- /dev/null +++ b/audio/mserv/patches/patch-ah @@ -0,0 +1,15 @@ +$NetBSD: patch-ah,v 1.1.2.2 2002/06/23 18:39:02 jlam Exp $ + +--- mserv/opt.c.orig Thu Jul 13 21:14:41 2000 ++++ mserv/opt.c +@@ -164,8 +164,8 @@ + /* special case - player variable is an indirected to another variable */ + if ((val = conf_getvalue("player")) == NULL) { + if (mserv_verbose) +- printf("No player specified, defaulting to /usr/local/bin/mpg123\n"); +- opt_player = "/usr/local/bin/mpg123"; ++ printf("No player specified, defaulting to " PATH_MPG123 "\n"); ++ opt_player = PATH_MPG123; + } else { + if ((opt_player = conf_getvalue(val)) == NULL) { + fprintf(stderr, "%s: player setting '%s' not found\n", progname, diff --git a/audio/nas/Makefile b/audio/nas/Makefile index 5267a4a9bf5..ba59fd3481e 100644 --- a/audio/nas/Makefile +++ b/audio/nas/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2001/08/22 17:38:56 jlam Exp $ +# $NetBSD: Makefile,v 1.15.2.1 2002/06/23 18:39:02 jlam Exp $ # FreeBSD ID: Makefile,v 1.8 1997/01/06 12:04:12 jkh Exp # @@ -7,7 +7,7 @@ PKGNAME= ${DISTNAME:S/.src//} WRKSRC= ${WRKDIR}/${PKGNAME} CATEGORIES= audio MASTER_SITES= http://radscan.com/nas/ \ - ${MASTER_SITE_XCONTRIB:=audio/nas/} + ftp://ftp.uni-duisburg.de/Sound/NAS/ \ MAINTAINER= packages@netbsd.org HOMEPAGE= http://radscan.com/nas.html diff --git a/audio/oggasm/DESCR b/audio/oggasm/DESCR new file mode 100644 index 00000000000..574c49858eb --- /dev/null +++ b/audio/oggasm/DESCR @@ -0,0 +1,5 @@ +Oggasm is a program that makes converting your mp3 collection into oggs +at all but painless process. Using oggenc and mpg321(or mpg123), with perl +glueing it all together, oggasm is able to go through an entire collection, +identify id3 tags and then convert those mp3s into oggs while keeping +the id3 tags intact. diff --git a/audio/oggasm/Makefile b/audio/oggasm/Makefile new file mode 100644 index 00000000000..5c7f3d6ef40 --- /dev/null +++ b/audio/oggasm/Makefile @@ -0,0 +1,27 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:39:04 jlam Exp $ +# + +DISTNAME= oggasm_1.4.0 +PKGNAME= ${DISTNAME:S/_/-/} +CATEGORIES= audio +MASTER_SITES= http://oggasm.sourceforge.net/ + +MAINTAINER= rxg@netbsd.org +HOMEPAGE= http://oggasm.sourceforge.net/ +COMMENT= perform batch conversion of mp3s into oggs + +DEPENDS+= mpg123>=0.59.18:../../audio/mpg123 +DEPENDS+= vorbis-tools>=1.0.0.7:../../audio/vorbis-tools +DEPENDS+= p5-MP3-Info>=1.00:../../audio/p5-MP3-Info + +USE_PERL5= yes +REPLACE_PERL= ${WRKSRC}/oggasm + +NO_BUILD= yes +WRKSRC= ${WRKDIR}/${PKGNAME} + +do-install: + ${INSTALL_SCRIPT} ${WRKSRC}/oggasm ${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/oggasm.1 ${PREFIX}/man/man1 + +.include "../../mk/bsd.pkg.mk" diff --git a/audio/oggasm/PLIST b/audio/oggasm/PLIST new file mode 100644 index 00000000000..708e430c795 --- /dev/null +++ b/audio/oggasm/PLIST @@ -0,0 +1,3 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.50.2 2002/06/23 18:39:05 jlam Exp $ +bin/oggasm +man/man1/oggasm.1 diff --git a/audio/oggasm/distinfo b/audio/oggasm/distinfo new file mode 100644 index 00000000000..f228ead4324 --- /dev/null +++ b/audio/oggasm/distinfo @@ -0,0 +1,4 @@ +$NetBSD: distinfo,v 1.1.1.1.12.2 2002/06/23 18:39:06 jlam Exp $ + +SHA1 (oggasm_1.4.0.tar.gz) = 3a418b63b2b681a42ec1198a0c94b0f2209d1374 +Size (oggasm_1.4.0.tar.gz) = 35042 bytes diff --git a/audio/p5-MP3-Info/Makefile b/audio/p5-MP3-Info/Makefile index 0cc77810c40..3a1bbf05bac 100644 --- a/audio/p5-MP3-Info/Makefile +++ b/audio/p5-MP3-Info/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/03/02 02:30:34 rxg Exp $ +# $NetBSD: Makefile,v 1.1.1.1.2.1 2002/06/23 18:39:07 jlam Exp $ -DISTNAME= MP3-Info-1.00 -PKGNAME= p5-MP3-Info-1.00 +DISTNAME= MP3-Info-1.01 +PKGNAME= p5-${DISTNAME} CATEGORIES= audio perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=MP3/} -MAINTAINER= rxg@netbsd.org +MAINTAINER= packages@netbsd.org HOMEPAGE= http://search.cpan.org/search?module=MP3::Info COMMENT= Manipulate / fetch info from MP3 audio files diff --git a/audio/p5-MP3-Info/distinfo b/audio/p5-MP3-Info/distinfo index 63e187b9850..1a1d7961aab 100644 --- a/audio/p5-MP3-Info/distinfo +++ b/audio/p5-MP3-Info/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/03/02 02:30:34 rxg Exp $ +$NetBSD: distinfo,v 1.1.1.1.2.1 2002/06/23 18:39:07 jlam Exp $ -SHA1 (MP3-Info-1.00.tar.gz) = d97914b52bfdf5abe475298026e506ed901ff306 -Size (MP3-Info-1.00.tar.gz) = 49795 bytes +SHA1 (MP3-Info-1.01.tar.gz) = 78434f1487343e549c5cfe5465b266288b66d810 +Size (MP3-Info-1.01.tar.gz) = 51394 bytes diff --git a/audio/rioutil/DESCR b/audio/rioutil/DESCR new file mode 100644 index 00000000000..f1576c62c5b --- /dev/null +++ b/audio/rioutil/DESCR @@ -0,0 +1,3 @@ +This program will talk to usb based diamond mm products (with +exception of the rio500, try rio500.sourceforge.net). This code +will be maintained until the first release of libpdmp. diff --git a/audio/rioutil/Makefile b/audio/rioutil/Makefile new file mode 100644 index 00000000000..85eaac41de8 --- /dev/null +++ b/audio/rioutil/Makefile @@ -0,0 +1,26 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:39:09 jlam Exp $ +# + +DISTNAME= rioutil-1.1.2alpha +PKGNAME= rioutil-1.1.2.0.1 +CATEGORIES= audio +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rioutil/} + +MAINTAINER= schmonz@netbsd.org +HOMEPAGE= http://rioutil.sourceforge.net/ +COMMENT= program and library to interface with Rio 600, 800, Nike psa[play + +USE_BUILDLINK_ONLY= # defined + +USE_LIBTOOL= # defined +LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig +GNU_CONFIGURE= # defined +CONFIGURE_ARGS+= --with-libusb + +# on NetBSD, we need a recent urio.c +ONLY_FOR_PLATFORM= NetBSD-1.5Z-* NetBSD-1.5Z[A-Z]-* NetBSD-1.[6-9]*-* \ + Darwin-*-* Linux-*-* + +.include "../../audio/id3lib/buildlink.mk" +.include "../../devel/libusb/buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/audio/rioutil/PLIST b/audio/rioutil/PLIST new file mode 100644 index 00000000000..1371eb91df0 --- /dev/null +++ b/audio/rioutil/PLIST @@ -0,0 +1,10 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.2.2 2002/06/23 18:39:10 jlam Exp $ +bin/riofck +bin/rioutil +include/rio.h +lib/librioutil.a +lib/librioutil.la +lib/librioutil.so +lib/librioutil.so.1 +lib/librioutil.so.1.0 +man/man1/rioutil.1 diff --git a/audio/rioutil/distinfo b/audio/rioutil/distinfo new file mode 100644 index 00000000000..fd244f17385 --- /dev/null +++ b/audio/rioutil/distinfo @@ -0,0 +1,5 @@ +$NetBSD: distinfo,v 1.1.1.1.2.2 2002/06/23 18:39:10 jlam Exp $ + +SHA1 (rioutil-1.1.2alpha.tar.gz) = d7cd8f21d1337946b7530b8d36d3d1ce2e2e818d +Size (rioutil-1.1.2alpha.tar.gz) = 277773 bytes +SHA1 (patch-aa) = 3a5adf41ff1bcf56f2178fb31b31c207dd608a65 diff --git a/audio/rioutil/patches/patch-aa b/audio/rioutil/patches/patch-aa new file mode 100644 index 00000000000..74d45b30597 --- /dev/null +++ b/audio/rioutil/patches/patch-aa @@ -0,0 +1,24 @@ +$NetBSD: patch-aa,v 1.1.1.1.2.2 2002/06/23 18:39:11 jlam Exp $ + +--- src/Makefile.in.orig Sat Mar 2 00:23:48 2002 ++++ src/Makefile.in +@@ -201,14 +201,14 @@ + + bin_PROGRAMS = rioutil riofck + +-INCLUDES = -I$(top_srcdir)/include -I/usr/local/include ++INCLUDES = -I$(top_srcdir)/include + + riofck_SOURCES = fckrio.c + rioutil_SOURCES = main.c getopt.c getopt1.c main.h getopt.h +-@MACOSX_TRUE@rioutil_LDADD = -L/usr/local/lib $(top_srcdir)/librioutil/librioutil.la -lIOKit +-@MACOSX_FALSE@rioutil_LDADD = -L/usr/local/lib $(top_srcdir)/librioutil/librioutil.la +-@MACOSX_TRUE@riofck_LDADD = -L/usr/local/lib $(top_srcdir)/librioutil/librioutil.la -lIOKit +-@MACOSX_FALSE@riofck_LDADD = -L/usr/local/lib $(top_srcdir)/librioutil/librioutil.la ++@MACOSX_TRUE@rioutil_LDADD = $(top_srcdir)/librioutil/librioutil.la -lIOKit ++@MACOSX_FALSE@rioutil_LDADD = $(top_srcdir)/librioutil/librioutil.la ++@MACOSX_TRUE@riofck_LDADD = $(top_srcdir)/librioutil/librioutil.la -lIOKit ++@MACOSX_FALSE@riofck_LDADD = $(top_srcdir)/librioutil/librioutil.la + @MACOSX_TRUE@CFLGS = -traditional-cpp + + CFLAGS = -g -O3 diff --git a/audio/spiralloops/Makefile b/audio/spiralloops/Makefile index f25222b6594..18d2da3a51e 100644 --- a/audio/spiralloops/Makefile +++ b/audio/spiralloops/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/08/12 22:27:05 zuntum Exp $ +# $NetBSD: Makefile,v 1.1.1.1.2.1 2002/06/23 18:39:12 jlam Exp $ # DISTNAME= SpiralLoops-2.0.0 @@ -15,7 +15,6 @@ ONLY_FOR_PLATFORM= *-*-alpha *-*-arc *-*-cobalt *-*-dreamcast \ *-*-hpcmips *-*-hpcsh *-*-i386 *-*-pc532 *-*-pmax \ *-*-vax -USE_X11= yes USE_GMAKE= yes GNU_CONFIGURE= yes @@ -23,4 +22,5 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/SpiralLoops ${PREFIX}/bin .include "../../x11/fltk/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/spiralloops/distinfo b/audio/spiralloops/distinfo index 6e6090868a3..8fabdda2cba 100644 --- a/audio/spiralloops/distinfo +++ b/audio/spiralloops/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.1.1.1 2001/08/12 22:27:05 zuntum Exp $ +$NetBSD: distinfo,v 1.1.1.1.2.1 2002/06/23 18:39:13 jlam Exp $ SHA1 (SpiralLoops-2.0.0.tar.gz) = 47d9caa17f20827abef7708bff212bb3fad58a72 Size (SpiralLoops-2.0.0.tar.gz) = 85458 bytes -SHA1 (patch-aa) = 611b2f7738d73a16665a5bf13714b8ebff73dafd +SHA1 (patch-aa) = faae8e528ab46b7a83d53719fca07588e45407a2 SHA1 (patch-ab) = 8d21e1615909f94c750f1cf3afbf46f7e0cfdb83 SHA1 (patch-ac) = 4a1675489e169d8ce9090eeaabf8c30ceb047897 SHA1 (patch-ad) = 09c1734e875335dae92afef7bbbd4fdc6821eb1f diff --git a/audio/spiralloops/patches/patch-aa b/audio/spiralloops/patches/patch-aa index dedc1e53ee6..2b1dab243b3 100644 --- a/audio/spiralloops/patches/patch-aa +++ b/audio/spiralloops/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/08/12 22:27:05 zuntum Exp $ +$NetBSD: patch-aa,v 1.1.1.1.2.1 2002/06/23 18:39:14 jlam Exp $ --- Makefile.in.orig Mon May 7 14:42:59 2001 +++ Makefile.in @@ -8,11 +8,11 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/08/12 22:27:05 zuntum Exp $ CXXFLAGS= -pipe -Wall -O3 -ffast-math -DNO_DEBUG -Wno-unused -INCPATH = -I/usr/X11R6/include -LINK = g++ -+INCPATH = -I${X11BASE}/include -+LINK = g++ -Wl,-R${X11BASE}/lib ++INCPATH = -I${BUILDLINK_X11_DIR}/include -I${BUILDLINK_DIR}/include ++LINK = g++ -Wl,-R${X11BASE}/lib -Wl,-R${X11PREFIX}/lib LFLAGS = -LIBS = -L/usr/X11R6/lib -lfltk -lGL -lXext -lX11 -lm -ldl -+LIBS = -L${X11BASE}/lib -lfltk -lGL -lXext -lX11 -lm -lossaudio ++LIBS = -L${BUILDLINK_X11_DIR}/lib -L${BUILDLINK_DIR}/lib -lfltk -lGL -lXext -lX11 -lm -lossaudio MOC = moc UIC = TAR = tar -cf diff --git a/audio/spiralsynth/DESCR b/audio/spiralsynth/DESCR new file mode 100644 index 00000000000..a3aa24211d0 --- /dev/null +++ b/audio/spiralsynth/DESCR @@ -0,0 +1,6 @@ +Spiral Synth is a physically modelled polyphonic analogue synthesizer for +Linux or BSD. It is capable of creating the kind of sounds made by +hardware analogue synths, the noises used in electronic music. You can +also use it to make stranger sounds too. Midi is supported, including +velocity detection, mapped to the volume of the oscillators (But you can +also use the PC keyboard to play the synth). diff --git a/audio/spiralsynth/Makefile b/audio/spiralsynth/Makefile new file mode 100644 index 00000000000..32df9432f12 --- /dev/null +++ b/audio/spiralsynth/Makefile @@ -0,0 +1,29 @@ +# $NetBSD: Makefile,v 1.2.2.2 2002/06/23 18:39:16 jlam Exp $ +# + +DISTNAME= SpiralSynth-0.1.7 +PKGNAME= spiralsynth-0.1.7 +CATEGORIES= audio +MASTER_SITES= http://www.pawfal.org/Software/SpiralSynth/dload/ + +MAINTAINER= collver@linuxfreemail.com +HOMEPAGE= http://www.pawfal.org/Software/SpiralSynth/ +COMMENT= polyphonic analogue softsynth + +# only runs correctly on little-endian machines +ONLY_FOR_PLATFORM= *-*-alpha *-*-arc *-*-cobalt *-*-dreamcast \ + *-*-hpcmips *-*-hpcsh *-*-i386 *-*-pc532 *-*-pmax \ + *-*-vax + +USE_GMAKE= yes +GNU_CONFIGURE= yes + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/SpiralSynth ${PREFIX}/bin + ${INSTALL_DATA_DIR} ${PREFIX}/share/spiralsynth + ${INSTALL_DATA} ${WRKSRC}/.SpiralPatches.bank \ + ${WRKSRC}/.Spiralrc ${PREFIX}/share/spiralsynth + +.include "../../x11/fltk/buildlink.mk" +.include "../../mk/x11.buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/audio/spiralsynth/PLIST b/audio/spiralsynth/PLIST new file mode 100644 index 00000000000..0e3c7698582 --- /dev/null +++ b/audio/spiralsynth/PLIST @@ -0,0 +1,5 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.48.2 2002/06/23 18:39:16 jlam Exp $ +bin/SpiralSynth +share/spiralsynth/.SpiralPatches.bank +share/spiralsynth/.Spiralrc +@dirrm share/spiralsynth diff --git a/audio/spiralsynth/distinfo b/audio/spiralsynth/distinfo new file mode 100644 index 00000000000..79d414f7dcf --- /dev/null +++ b/audio/spiralsynth/distinfo @@ -0,0 +1,7 @@ +$NetBSD: distinfo,v 1.2.2.2 2002/06/23 18:39:17 jlam Exp $ + +SHA1 (SpiralSynth-0.1.7.tar.gz) = 8b66749b940c9dcfcd4a71c319ac233139014204 +Size (SpiralSynth-0.1.7.tar.gz) = 62393 bytes +SHA1 (patch-aa) = d54ff8dbdcad1fd65487b2db6eada7b7947141e1 +SHA1 (patch-ab) = eea5f0a97ccc796a176d48b2acfe61f6a455e51f +SHA1 (patch-ad) = 207bc32f2991f99ba2e907a417d127f0073b3d24 diff --git a/audio/spiralsynth/patches/patch-aa b/audio/spiralsynth/patches/patch-aa new file mode 100644 index 00000000000..20457b7c650 --- /dev/null +++ b/audio/spiralsynth/patches/patch-aa @@ -0,0 +1,18 @@ +$NetBSD: patch-aa,v 1.2.2.2 2002/06/23 18:39:18 jlam Exp $ + +--- Makefile.in.orig Tue Aug 14 20:12:55 2001 ++++ Makefile.in +@@ -11,10 +11,10 @@ + CXX = g++ + CFLAGS = -pipe -Wall -O3 -ffast-math -DNO_DEBUG -Wno-unused + CXXFLAGS= -pipe -Wall -O3 -ffast-math -DNO_DEBUG -Wno-unused +-INCPATH = -I/usr/X11R6/include +-LINK = g++ ++INCPATH = -I${BUILDLINK_X11_DIR}/include -I${BUILDLINK_DIR}/include ++LINK = g++ -Wl,-R${X11BASE}/lib -Wl,-R${X11PREFIX}/lib + LFLAGS = +-LIBS = -L/usr/X11R6/lib -lfltk -lGL -lXext -lX11 -lm ++LIBS = -L${BUILDLINK_X11_DIR}/lib -L${BUILDLINK_DIR}/lib -lfltk -lGL -lXext -lX11 -lm -lossaudio + MOC = moc + + TAR = tar -cf diff --git a/audio/spiralsynth/patches/patch-ab b/audio/spiralsynth/patches/patch-ab new file mode 100644 index 00000000000..63e04101af7 --- /dev/null +++ b/audio/spiralsynth/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1.1.1.2.2 2002/06/23 18:39:19 jlam Exp $ + +--- SpiralInfo.C.orig Sun Nov 26 07:52:43 2000 ++++ SpiralInfo.C +@@ -41,7 +41,7 @@ + float SpiralInfo::VALUECONV = 1.0f/MAXSAMPLE; + bool SpiralInfo::WANTMIDI = true; + int SpiralInfo::FILTERGRAN = 50; +-string SpiralInfo::OUTPUTFILE = "/dev/dsp"; ++string SpiralInfo::OUTPUTFILE = "/dev/sound"; + string SpiralInfo::MIDIFILE = "/dev/midi"; + int SpiralInfo::POLY = 2; + bool SpiralInfo::REALTIMEOUT = true; diff --git a/audio/spiralsynth/patches/patch-ad b/audio/spiralsynth/patches/patch-ad new file mode 100644 index 00000000000..d12545c4c98 --- /dev/null +++ b/audio/spiralsynth/patches/patch-ad @@ -0,0 +1,25 @@ +$NetBSD: patch-ad,v 1.1.1.1.10.2 2002/06/23 18:39:20 jlam Exp $ + +--- SpiralSound/Output.h.orig Sun Nov 26 07:52:46 2000 ++++ SpiralSound/Output.h +@@ -16,6 +16,7 @@ + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + ++#include <sys/ioctl.h> + #include <sys/types.h> + #include <stdio.h> + #include <fcntl.h> +@@ -25,12 +26,10 @@ + #else + #if defined (__NetBSD__) || defined (__OpenBSD__) + #include <soundcard.h> /* OSS emulation */ +-#undef ioctl + #else /* BSDI, Linux, Solaris */ + #include <sys/soundcard.h> + #endif /* __NetBSD__ or __OpenBSD__ */ + #endif /* __FreeBSD__ */ +-#include <sys/ioctl.h> + #include <limits.h> + + #include "SpiralInfo.h" diff --git a/audio/wmmixer/distinfo b/audio/wmmixer/distinfo index cb1ee38badb..bf9bdb5fe05 100644 --- a/audio/wmmixer/distinfo +++ b/audio/wmmixer/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2001/05/08 15:48:48 agc Exp $ +$NetBSD: distinfo,v 1.2.2.1 2002/06/23 18:39:21 jlam Exp $ -SHA1 (wmmixer-1.0-beta1.tgz) = dcef049f9a817b09644930cee99e0989448452a5 -Size (wmmixer-1.0-beta1.tgz) = 18891 bytes +SHA1 (wmmixer-1.0-beta1.tgz) = b8695455e1a7364aa337feb924f059db9a5856fe +Size (wmmixer-1.0-beta1.tgz) = 18801 bytes diff --git a/audio/wmmp3/DESCR b/audio/wmmp3/DESCR new file mode 100644 index 00000000000..de618cd9381 --- /dev/null +++ b/audio/wmmp3/DESCR @@ -0,0 +1,6 @@ +wmmp3 is an mpg123 frontend. It is a small X application that will also +work as a windowmaker dock app. + +All user options are contained in a config file, ~/.wmmp3 . There is a +sample.wmmp3 file in the distribution that can be used as an +example/template. diff --git a/audio/wmmp3/Makefile b/audio/wmmp3/Makefile new file mode 100644 index 00000000000..e02c0e417fd --- /dev/null +++ b/audio/wmmp3/Makefile @@ -0,0 +1,27 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:39:23 jlam Exp $ + +DISTNAME= wmmp3-0.12 +CATEGORIES= audio +MASTER_SITES= http://www.dotfiles.com/software/wmmp3/ + +MAINTAINER= rxg@netbsd.org +HOMEPAGE= http://www.dotfiles.com/software/wmmp3/ +COMMENT= front-end for mpg123 in a Window Maker dockapp + +DEPENDS+= mpg123>=0.59.18:../../audio/mpg123 + +GNU_CONFIGURE= yes +USE_X11BASE= yes + +post-patch: + ${MV} ${WRKSRC}/sample.wmmp3 ${WRKSRC}/sample.wmmp3.orig + ${SED} -e 's:/usr/local:'${LOCALBASE}':g' \ + ${WRKSRC}/sample.wmmp3.orig > ${WRKSRC}/sample.wmmp3 + +post-install: + @${ECHO} "===> Installing sample.wmmp3 in ${PREFIX}/share/examples" + ${INSTALL_DATA} ${WRKSRC}/sample.wmmp3 ${PREFIX}/share/examples + +.include "../../graphics/xpm/buildlink.mk" +.include "../../mk/x11.buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/audio/wmmp3/PLIST b/audio/wmmp3/PLIST new file mode 100644 index 00000000000..cfb0d45bc20 --- /dev/null +++ b/audio/wmmp3/PLIST @@ -0,0 +1,3 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.50.2 2002/06/23 18:39:24 jlam Exp $ +bin/wmmp3 +share/examples/sample.wmmp3 diff --git a/audio/wmmp3/distinfo b/audio/wmmp3/distinfo new file mode 100644 index 00000000000..933a88e4215 --- /dev/null +++ b/audio/wmmp3/distinfo @@ -0,0 +1,4 @@ +$NetBSD: distinfo,v 1.1.1.1.12.2 2002/06/23 18:39:25 jlam Exp $ + +SHA1 (wmmp3-0.12.tar.gz) = 439e19550c58fe31db8c1bcf2985c56f62d7bc1f +Size (wmmp3-0.12.tar.gz) = 43977 bytes diff --git a/audio/wmsmixer/DESCR b/audio/wmsmixer/DESCR new file mode 100644 index 00000000000..90fae2baf0e --- /dev/null +++ b/audio/wmsmixer/DESCR @@ -0,0 +1,3 @@ +WMsmixer is a hack to wmmixer which makes some changes to the +display and adds a few new features, most notably scrollwheel +support. It also includes a numeric volume indicator. diff --git a/audio/wmsmixer/Makefile b/audio/wmsmixer/Makefile new file mode 100644 index 00000000000..d86622985ec --- /dev/null +++ b/audio/wmsmixer/Makefile @@ -0,0 +1,25 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:39:26 jlam Exp $ +# + +DISTNAME= wmsmixer-0.5 +CATEGORIES= audio +MASTER_SITES= http://www.hibernaculum.net/download/ + +MAINTAINER= packages@netbsd.org +HOMEPAGE= http://www.hibernaculum.net/wmsmixer.html +COMMENT= Another mixer designed for WindowMaker (dockapp) + +USE_IMAKE= YES +NO_INSTALL_MANPAGES= YES + +pre-build: + ${TOUCH} ${WRKSRC}/wmsmixer.man + +post-install: + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/wmsmixer + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/wmsmixer + ${INSTALL_DATA} ${WRKSRC}/home.wmsmixer ${PREFIX}/share/examples/wmsmixer + ${INSTALL_DATA} ${WRKSRC}/README.wmmixer ${PREFIX}/share/doc/wmsmixer/README.wmsmixer + +.include "../../graphics/xpm/buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/audio/wmsmixer/PLIST b/audio/wmsmixer/PLIST new file mode 100644 index 00000000000..71089426e7b --- /dev/null +++ b/audio/wmsmixer/PLIST @@ -0,0 +1,6 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.48.2 2002/06/23 18:39:27 jlam Exp $ +bin/wmsmixer +share/examples/wmsmixer/home.wmsmixer +share/doc/wmsmixer/README.wmsmixer +@dirrm share/examples/wmsmixer +@dirrm share/doc/wmsmixer diff --git a/audio/wmsmixer/distinfo b/audio/wmsmixer/distinfo new file mode 100644 index 00000000000..dd3eb5f0275 --- /dev/null +++ b/audio/wmsmixer/distinfo @@ -0,0 +1,4 @@ +$NetBSD: distinfo,v 1.1.1.1.2.2 2002/06/23 18:39:27 jlam Exp $ + +SHA1 (wmsmixer-0.5.tar.gz) = 55cfd1293eac8c6abab20d4a64f3989993ff3e28 +Size (wmsmixer-0.5.tar.gz) = 26208 bytes diff --git a/audio/wmusic/DESCR b/audio/wmusic/DESCR new file mode 100644 index 00000000000..fe3f2d626e1 --- /dev/null +++ b/audio/wmusic/DESCR @@ -0,0 +1,3 @@ +wmusic is a dockapp that remote-controls xmms. Features include +VCR-style controls, Time and Playlist display, supa style rotating +arrow, hiding of the xmms windows and reactive interface. diff --git a/audio/wmusic/Makefile b/audio/wmusic/Makefile new file mode 100644 index 00000000000..bc6d03efb77 --- /dev/null +++ b/audio/wmusic/Makefile @@ -0,0 +1,26 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:39:29 jlam Exp $ + +DISTNAME= wmusic-1.4.7 +CATEGORIES= audio windowmaker +MASTER_SITES= http://hadess.net/files/ + +MAINTAINER= ptiJo@noos.fr +HOMEPAGE= http://hadess.net/code.shtml +COMMENT= WindowMaker dockable remote for xmms + +USE_BUILDLINK_ONLY= yes + +GNU_CONFIGURE= yes +USE_GMAKE= yes + +do-install: + @${INSTALL_PROGRAM} ${WRKSRC}/src/wmusic ${PREFIX}/bin + @${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE} \ + ${PREFIX}/share/doc/wmusic + @${INSTALL_DATA} -d ${WRKSRC}/README ${PREFIX}/share/doc/wmusic + @${INSTALL_DATA} -d ${WRKSRC}/COPYING ${PREFIX}/share/doc/wmusic + +.include "../../audio/xmms/buildlink.mk" +.include "../../graphics/xpm/buildlink.mk" +.include "../../x11/gtk/buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/audio/wmusic/PLIST b/audio/wmusic/PLIST new file mode 100644 index 00000000000..2d8a79d7854 --- /dev/null +++ b/audio/wmusic/PLIST @@ -0,0 +1,4 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.4.2 2002/06/23 18:39:30 jlam Exp $ +bin/wmusic +@exec ${MKDIR} %D/share/doc/wmusic +@dirrm share/doc/wmusic diff --git a/audio/wmusic/distinfo b/audio/wmusic/distinfo new file mode 100644 index 00000000000..b54c9dfe676 --- /dev/null +++ b/audio/wmusic/distinfo @@ -0,0 +1,4 @@ +$NetBSD: distinfo,v 1.1.1.1.2.2 2002/06/23 18:39:30 jlam Exp $ + +MD5 (wmusic-1.4.7.tar.gz) = accd0711d89e4049174a2554e1c61958 +SHA1 (patch-ab) = 09d3a444a69b077c4145af45361ab3a257f104af diff --git a/audio/wmusic/patches/patch-ab b/audio/wmusic/patches/patch-ab new file mode 100644 index 00000000000..026d8e8b0b9 --- /dev/null +++ b/audio/wmusic/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1.1.1.8.2 2002/06/23 18:39:31 jlam Exp $ + +--- src/Makefile.in.orig Mon Apr 30 00:59:12 2001 ++++ src/Makefile.in Mon Apr 30 00:59:20 2001 +@@ -9,7 +9,7 @@ + ../libdockapp/dapixmap.c ../libdockapp/darect.c + OBJS = $(SRCS:.c=.o) + +-CFLAGS = -Wall -g -O2 -I. -I../libdockapp `@PATH_GTKCONFIG@ --cflags` \ ++CFLAGS += -Wall -g -I. -I../libdockapp `@PATH_GTKCONFIG@ --cflags` \ + `@PATH_XMMSCONFIG@ --cflags` \ + -DDATA_DIR=\"`@PATH_XMMSCONFIG@ --data-dir`\" + LDFLAGS = @LIBS@ -lXpm `@PATH_GTKCONFIG@ --libs` `@PATH_XMMSCONFIG@ --libs` \ diff --git a/audio/xanalyser/Makefile b/audio/xanalyser/Makefile index 40c37cb84c8..a2818ec2ecf 100644 --- a/audio/xanalyser/Makefile +++ b/audio/xanalyser/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/04/23 03:33:26 schmonz Exp $ +# $NetBSD: Makefile,v 1.1.1.1.2.1 2002/06/23 18:39:32 jlam Exp $ # DISTNAME= xanalyser-1.21 +PKGREVISION= 1 CATEGORIES= audio MASTER_SITES= ftp://ftp.suse.com/pub/people/arvin/private/ EXTRACT_SUFX= .tar.bz2 @@ -15,5 +16,6 @@ GNU_CONFIGURE= # defined .include "../../graphics/xpm/buildlink.mk" .include "../../mk/motif.buildlink.mk" +.include "../../mk/ossaudio.buildlink.mk" .include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/xanalyser/PLIST b/audio/xanalyser/PLIST index 4ea41c402af..28e9e169422 100644 --- a/audio/xanalyser/PLIST +++ b/audio/xanalyser/PLIST @@ -1,3 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/04/23 03:33:26 schmonz Exp $ +@comment $NetBSD: PLIST,v 1.1.1.1.2.1 2002/06/23 18:39:33 jlam Exp $ bin/xanalyser +lib/X11/app-defaults/XAnalyser man/man1/xanalyser.1 diff --git a/audio/xanalyser/distinfo b/audio/xanalyser/distinfo index 6da44a91e9f..909b66b7099 100644 --- a/audio/xanalyser/distinfo +++ b/audio/xanalyser/distinfo @@ -4,9 +4,10 @@ Size (xanalyser-1.21.tar.bz2) = 58542 bytes SHA1 (patch-aa) = 29651c643550679f647b54726fb8d25579cdaaf7 SHA1 (patch-ab) = bee615a58bd041c2b31645d3d312798c1dd5606d SHA1 (patch-ac) = 78f5f22951a918291c7ab5c61110c4ec2e9cf8b8 -SHA1 (patch-ad) = c37bac9f9630ad63618cbad58af89f051c1fe5d8 +SHA1 (patch-ad) = 7cfcc00ad3bc221264e0480020cfab613b01c359 SHA1 (patch-ae) = db464b9a91db329473e7d774b7fb53d977b258af SHA1 (patch-af) = bf6af0c140a802fb98e82e82ecbfb7240696db09 SHA1 (patch-ag) = 0ae5680df966e534d76d04cddf6a78259d87cbfe SHA1 (patch-ah) = a8bae5da6db1098ce1520cc49e167fc5999b0dda SHA1 (patch-ai) = 6805fc79e0c3135f6f22eb0b91c68cacd96c483c +SHA1 (patch-aj) = 2a6549638be3d3d25126b0938a11572ffe1c6564 diff --git a/audio/xanalyser/patches/patch-ad b/audio/xanalyser/patches/patch-ad index dd9895b094a..b5daa4a017b 100644 --- a/audio/xanalyser/patches/patch-ad +++ b/audio/xanalyser/patches/patch-ad @@ -1,6 +1,6 @@ -$NetBSD: patch-ad,v 1.1.1.1 2002/04/23 03:33:27 schmonz Exp $ +$NetBSD: patch-ad,v 1.1.1.1.2.1 2002/06/23 18:39:34 jlam Exp $ ---- src/Makefile.in.orig Wed Jan 23 14:49:25 2002 +--- src/Makefile.in.orig Thu Jan 24 03:49:25 2002 +++ src/Makefile.in @@ -73,7 +73,7 @@ xanalyser_SOURCES = Analyser.cc Analyser.h DSP.cc DSP.h Sample.cc Sample.h Scope.cc Scope.h XAnalyser.ad.h control.cc control.h fft.cc fft.h help.cc help.h help.txt.h main.cc main.h utils.cc utils.h Trans.h @@ -22,3 +22,16 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/04/23 03:33:27 schmonz Exp $ help.cc: help.txt.h +@@ -311,8 +311,8 @@ + txt2c help.txt > help.txt.h + + install-data-hook: +- mkdir -p $(DESTDIR)/usr/X11R6/lib/X11/app-defaults +- cp XAnalyser.ad $(DESTDIR)/usr/X11R6/lib/X11/app-defaults/XAnalyser ++ mkdir -p $(DESTDIR)$(prefix)/lib/X11/app-defaults ++ cp XAnalyser.ad $(DESTDIR)$(prefix)/lib/X11/app-defaults/XAnalyser + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + + diff --git a/audio/xanalyser/patches/patch-aj b/audio/xanalyser/patches/patch-aj new file mode 100644 index 00000000000..ddc5a7fbdeb --- /dev/null +++ b/audio/xanalyser/patches/patch-aj @@ -0,0 +1,12 @@ +$NetBSD: patch-aj,v 1.1.2.2 2002/06/23 18:39:35 jlam Exp $ + +--- src/utils.cc.orig Sat Dec 1 19:37:13 2001 ++++ src/utils.cc +@@ -7,6 +7,7 @@ + + #include <stdio.h> + #include <math.h> ++#include <ctype.h> + + #include <X11/Xlib.h> + #include <Xm/Xm.h> diff --git a/audio/xmms-mad/DESCR b/audio/xmms-mad/DESCR new file mode 100644 index 00000000000..fd23afe87da --- /dev/null +++ b/audio/xmms-mad/DESCR @@ -0,0 +1,7 @@ +xmms-mad is an input plugin for xmms that uses libmad to decode MPEG +layer 1/2/3 file and streams. Current featured include: + local mp3 file playback + shoutchast/icecast stream playback + seeking + ID3 tag parsing + http header parsing diff --git a/audio/xmms-mad/Makefile b/audio/xmms-mad/Makefile new file mode 100644 index 00000000000..6033d2d573b --- /dev/null +++ b/audio/xmms-mad/Makefile @@ -0,0 +1,28 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:39:37 jlam Exp $ +# + +DISTNAME= xmms-mad-0.0.9 +CATEGORIES= audio +MASTER_SITES= http://www.superduper.net/downloads/xmms-mad/ + +MAINTAINER= jmcneill@netbsd.org +HOMEPAGE= http://www.superduper.net/xmms-mad/ +COMMENT= Input plugin for XMMS that uses libmad + +DEPENDS+= mad>=0.14:../../audio/mad + +GNU_CONFIGURE= YES +CONFIGURE_ENV+= LDFLAGS="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib" +CONFIGURE_ENV+= CFLAGS="-I${LOCALBASE}/include" +CPPFLAGS+= -D_POSIX_THREAD_SYSCALL_SOFT=1 + +.include "../../mk/bsd.prefs.mk" + +.if (${OPSYS} == NetBSD) +CPPFLAGS+= -DHAVE_NANOSLEEP=1 +.endif + +.include "../../audio/xmms/buildlink.mk" +.include "../../mk/ossaudio.buildlink.mk" +.include "../../mk/x11.buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/audio/xmms-mad/PLIST b/audio/xmms-mad/PLIST new file mode 100644 index 00000000000..da3418a984c --- /dev/null +++ b/audio/xmms-mad/PLIST @@ -0,0 +1,3 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.10.2 2002/06/23 18:39:38 jlam Exp $ +lib/xmms/Input/libxmmsmad.la +lib/xmms/Input/libxmmsmad.so diff --git a/audio/xmms-mad/distinfo b/audio/xmms-mad/distinfo new file mode 100644 index 00000000000..7f20db705b7 --- /dev/null +++ b/audio/xmms-mad/distinfo @@ -0,0 +1,6 @@ +$NetBSD: distinfo,v 1.1.1.1.2.2 2002/06/23 18:39:38 jlam Exp $ + +SHA1 (xmms-mad-0.0.9.tar.gz) = b8743ff110ef0c61062f25cdd0f8a591f43b789c +Size (xmms-mad-0.0.9.tar.gz) = 203320 bytes +SHA1 (patch-aa) = f502b03b845cb54078c5d086f6bcf88ca8e8111f +SHA1 (patch-ab) = 556c28f55718acc0bb1178c107fa22bd120a5660 diff --git a/audio/xmms-mad/patches/patch-aa b/audio/xmms-mad/patches/patch-aa new file mode 100644 index 00000000000..18c36857372 --- /dev/null +++ b/audio/xmms-mad/patches/patch-aa @@ -0,0 +1,14 @@ +$NetBSD: patch-aa,v 1.1.1.1.2.2 2002/06/23 18:39:39 jlam Exp $ + +--- src/decoder.c.orig Sat May 25 21:06:58 2002 ++++ src/decoder.c Sat May 25 21:07:05 2002 +@@ -205,6 +205,9 @@ + /* main loop */ + do + { ++#ifdef __NetBSD__ ++ pthread_yield_np(); ++#endif + if (info->stop) + break; + if (seek_skip) diff --git a/audio/xmms-mad/patches/patch-ab b/audio/xmms-mad/patches/patch-ab new file mode 100644 index 00000000000..01331506d7a --- /dev/null +++ b/audio/xmms-mad/patches/patch-ab @@ -0,0 +1,24 @@ +$NetBSD: patch-ab,v 1.1.1.1.2.2 2002/06/23 18:39:40 jlam Exp $ + +--- src/xmms-mad.c.orig Sat May 25 21:07:02 2002 ++++ src/xmms-mad.c Sat May 25 21:07:05 2002 +@@ -83,6 +83,9 @@ + printf ("waiting for thread\n"); + #endif /* DEBUG */ + pthread_join (decode_thread, 0); ++#ifdef __NetBSD__ ++ pthread_yield_np (); ++#endif + #ifdef DEBUG + printf ("thread done\n"); + #endif /* DEBUG */ +@@ -99,6 +102,9 @@ + info.playing = 1; + input_get_info (&info); + pthread_create (&decode_thread, 0, decode, (void *) &info); ++#ifdef __NetBSD__ ++ pthread_yield_np (); ++#endif + } + } + diff --git a/benchmarks/bonnie/distinfo b/benchmarks/bonnie/distinfo index e680b417486..96c2c2004e0 100644 --- a/benchmarks/bonnie/distinfo +++ b/benchmarks/bonnie/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.3 2001/07/16 22:50:48 garbled Exp $ +$NetBSD: distinfo,v 1.3.2.1 2002/06/23 18:39:41 jlam Exp $ SHA1 (bonnie.tar.gz) = f435ae56903883c8e3e011eb989783c8410f5ee3 Size (bonnie.tar.gz) = 7140 bytes SHA1 (patch-aa) = 33ac03e1c70bba2aedf0482e23c16cf19956b47e +SHA1 (patch-ac) = c05ff777135943cff5439010d6d3b420e9cc84a0 diff --git a/benchmarks/bonnie/patches/patch-ac b/benchmarks/bonnie/patches/patch-ac new file mode 100644 index 00000000000..806e9d9c597 --- /dev/null +++ b/benchmarks/bonnie/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.1.2.2 2002/06/23 18:39:42 jlam Exp $ + +--- bonnie.c.orig Thu Aug 29 02:23:49 1996 ++++ bonnie.c Sun Jun 9 10:20:02 2002 +@@ -458,7 +458,7 @@ + usage() + { + fprintf(stderr, +- "usage: Bonnie [-d scratch-dir] [-s size-in-Mb] [-html] [-m machine-label]\n"); ++ "usage: bonnie [-d scratch-dir] [-s size-in-Mb] [-html] [-m machine-label]\n"); + exit(1); + } + diff --git a/benchmarks/ttcp/distinfo b/benchmarks/ttcp/distinfo index 245ccaa5259..6259486ebf5 100644 --- a/benchmarks/ttcp/distinfo +++ b/benchmarks/ttcp/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.3 2002/03/26 16:30:03 abs Exp $ +$NetBSD: distinfo,v 1.3.2.1 2002/06/23 18:39:43 jlam Exp $ SHA1 (ttcp.tar.Z) = 33a60af208eff3dc9ae745060f44b24c4e74aa7e Size (ttcp.tar.Z) = 18163 bytes SHA1 (patch-aa) = a9717aa9fd5f8cdff1a39c9b7d6ab17abbe399ad -SHA1 (patch-ab) = 433b6665948d12155bc0e9fad0ffc9207b18294b +SHA1 (patch-ab) = 8ee4942958765029f50a0b87e45be1f5ca4c56e2 diff --git a/benchmarks/ttcp/patches/patch-ab b/benchmarks/ttcp/patches/patch-ab index 1e6d8907efc..f027c3224ee 100644 --- a/benchmarks/ttcp/patches/patch-ab +++ b/benchmarks/ttcp/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.2 2002/03/26 16:30:04 abs Exp $ +$NetBSD: patch-ab,v 1.2.2.1 2002/06/23 18:39:44 jlam Exp $ ---- ttcp.c.orig Thu Feb 27 21:30:23 1997 -+++ ttcp.c +--- ttcp.c.orig Fri Feb 28 06:30:23 1997 ++++ ttcp.c Wed Jun 12 06:54:28 2002 @@ -55,6 +55,7 @@ #include <arpa/inet.h> #include <netdb.h> @@ -10,6 +10,15 @@ $NetBSD: patch-ab,v 1.2 2002/03/26 16:30:04 abs Exp $ #if defined(SYSV) #include <sys/times.h> +@@ -151,7 +152,7 @@ + int argc; + char **argv; + { +- unsigned long addr_tmp; ++ in_addr_t addr_tmp; + int c; + + if (argc < 2) goto usage; @@ -263,7 +264,7 @@ if ( (buf = (char *)malloc(buflen+bufalign)) == (char *)NULL) err("malloc"); diff --git a/biology/chemtool/patches/patch-aa b/biology/chemtool/patches/patch-aa index 821b70ed940..4f6fcb77931 100644 --- a/biology/chemtool/patches/patch-aa +++ b/biology/chemtool/patches/patch-aa @@ -1,3 +1,4 @@ +$NetBSD: patch-aa,v 1.5.2.1 2002/06/23 18:39:45 jlam Exp $ --- Makefile.orig Sat Sep 8 15:56:18 2001 +++ Makefile Mon Apr 29 10:27:24 2002 @@ -1,22 +1,12 @@ diff --git a/biology/chemtool/patches/patch-ab b/biology/chemtool/patches/patch-ab index 9ae8c466ea1..7df28ca679d 100644 --- a/biology/chemtool/patches/patch-ab +++ b/biology/chemtool/patches/patch-ab @@ -1,3 +1,4 @@ +$NetBSD: patch-ab,v 1.2.2.1 2002/06/23 18:39:46 jlam Exp $ --- src-cht/cht-1.8.c.orig Mon Apr 29 10:21:47 2002 +++ src-cht/cht-1.8.c Mon Apr 29 10:22:03 2002 @@ -14,7 +14,7 @@ diff --git a/biology/chemtool/patches/patch-ad b/biology/chemtool/patches/patch-ad index 393ee40a29e..aa95f57245f 100644 --- a/biology/chemtool/patches/patch-ad +++ b/biology/chemtool/patches/patch-ad @@ -1,3 +1,4 @@ +$NetBSD: patch-ad,v 1.1.2.1 2002/06/23 18:39:46 jlam Exp $ --- ct.h.orig Mon Apr 29 10:18:39 2002 +++ ct.h Mon Apr 29 10:18:45 2002 @@ -1,4 +1,3 @@ diff --git a/biology/rasmol/Makefile b/biology/rasmol/Makefile index 2b461c81ded..3209f3d2856 100644 --- a/biology/rasmol/Makefile +++ b/biology/rasmol/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2002/04/20 14:41:05 cjep Exp $ +# $NetBSD: Makefile,v 1.5.2.1 2002/06/23 18:39:47 jlam Exp $ DISTNAME= RasMol_2.7.1 PKGNAME= rasmol-2.7.1 @@ -30,7 +30,6 @@ DEPTHDEF= -DSIXTEENBIT .endif DEPTHDEF?= -DEIGHTBIT - post-patch: ${LN} -sf ${WRKDIR}/${DISTNAME}/doc ${WRKSRC} ${LN} -sf ${WRKDIR}/${DISTNAME}/data ${WRKSRC} diff --git a/cad/geda-docs/Makefile b/cad/geda-docs/Makefile index b61ef5f1117..a7855b30c49 100644 --- a/cad/geda-docs/Makefile +++ b/cad/geda-docs/Makefile @@ -1,9 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2001/07/17 02:56:44 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.5.2.1 2002/06/23 18:39:48 jlam Exp $ # -DISTNAME= docs-${PKGVERSION} -PKGNAME= geda-${DISTNAME} -WRKSRC= ${WRKDIR}/docs +DISTNAME= geda-docs-${PKGVERSION} CATEGORIES= cad MASTER_SITES= ftp://ftp.geda.seul.org/pub/geda/devel/${PKGVERSION}/ \ ftp://ieee.ing.uniroma1.it/pub/geda/devel/${PKGVERSION}/ \ @@ -17,7 +15,7 @@ COMMENT= HTML documentation for gEDA CONFLICTS+= gEDA<19991011 DIST_SUBDIR= geda -PKGVERSION= 20010304 +PKGVERSION= 20020209 NO_PATCH= YES NO_CONFIGURE= YES @@ -26,7 +24,9 @@ USE_X11BASE= YES do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gEDA -.for file in README fileformats.html keymapping.html symbols.html +.for file in README attributes.txt hooks_and_scheme.txt keymapping.tex \ +symbols.html README.keymapping fileformats.html keymapping.html \ +netattrib.txt ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/gEDA .endfor diff --git a/cad/geda-docs/PLIST b/cad/geda-docs/PLIST index a653bac49dd..c4a785bca2b 100644 --- a/cad/geda-docs/PLIST +++ b/cad/geda-docs/PLIST @@ -1,6 +1,11 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:48:03 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.1.2.1 2002/06/23 18:39:49 jlam Exp $ share/doc/gEDA/README +share/doc/gEDA/README.keymapping +share/doc/gEDA/attributes.txt share/doc/gEDA/fileformats.html +share/doc/gEDA/hooks_and_scheme.txt share/doc/gEDA/keymapping.html +share/doc/gEDA/keymapping.tex +share/doc/gEDA/netattrib.txt share/doc/gEDA/symbols.html @dirrm share/doc/gEDA diff --git a/cad/geda-docs/distinfo b/cad/geda-docs/distinfo index 80fe3edf7f0..b66a5350efc 100644 --- a/cad/geda-docs/distinfo +++ b/cad/geda-docs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2001/07/17 02:56:44 dmcmahill Exp $ +$NetBSD: distinfo,v 1.3.2.1 2002/06/23 18:39:50 jlam Exp $ -SHA1 (geda/docs-20010304.tar.gz) = 6148d0fd886b1fff372ccd368a6dd588621a7010 -Size (geda/docs-20010304.tar.gz) = 17650 bytes +SHA1 (geda/geda-docs-20020209.tar.gz) = e6d909bcbb6f2d3f6067b15aad18cb1eca1201c4 +Size (geda/geda-docs-20020209.tar.gz) = 18938 bytes diff --git a/cad/geda-symbols/Makefile b/cad/geda-symbols/Makefile index b939c40edfe..58a60506a56 100644 --- a/cad/geda-symbols/Makefile +++ b/cad/geda-symbols/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/07/17 03:05:01 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.5.2.1 2002/06/23 18:39:51 jlam Exp $ # DISTNAME= geda-symbols-${PKGVERSION} @@ -15,7 +15,7 @@ COMMENT= Library of symbols for gEDA CONFLICTS+= gEDA<19991011 DIST_SUBDIR= geda -PKGVERSION= 20010708 +PKGVERSION= 20020414 GNU_CONFIGURE= YES USE_X11BASE= YES diff --git a/cad/geda-symbols/PLIST b/cad/geda-symbols/PLIST index 157de4db6e8..0db334ee40c 100644 --- a/cad/geda-symbols/PLIST +++ b/cad/geda-symbols/PLIST @@ -1,21 +1,161 @@ -@comment $NetBSD: PLIST,v 1.3 2002/02/05 22:39:01 skrll Exp $ +@comment $NetBSD: PLIST,v 1.3.2.1 2002/06/23 18:39:51 jlam Exp $ bin/gesym-config share/gEDA/sym/4000/4000-1.sym share/gEDA/sym/4000/4001-1.sym +share/gEDA/sym/4000/4002-1.sym +share/gEDA/sym/4000/4006-1.sym +share/gEDA/sym/4000/4007-1.sym +share/gEDA/sym/4000/4008-1.sym +share/gEDA/sym/4000/4009-1.sym +share/gEDA/sym/4000/4010-1.sym +share/gEDA/sym/4000/40100-1.sym +share/gEDA/sym/4000/40101-1.sym +share/gEDA/sym/4000/40102-1.sym +share/gEDA/sym/4000/40103-1.sym +share/gEDA/sym/4000/40104-1.sym +share/gEDA/sym/4000/40105-1.sym +share/gEDA/sym/4000/40106-1.sym +share/gEDA/sym/4000/40107-1.sym +share/gEDA/sym/4000/40107-2.sym +share/gEDA/sym/4000/40108-1.sym +share/gEDA/sym/4000/40109-1.sym +share/gEDA/sym/4000/4011-1.sym +share/gEDA/sym/4000/4011-2.sym +share/gEDA/sym/4000/40110-1.sym +share/gEDA/sym/4000/40117-1.sym +share/gEDA/sym/4000/4012-1.sym share/gEDA/sym/4000/4013-1.sym +share/gEDA/sym/4000/4014-1.sym +share/gEDA/sym/4000/40147-1.sym share/gEDA/sym/4000/4015-1.sym share/gEDA/sym/4000/4016-1.sym +share/gEDA/sym/4000/40160-1.sym +share/gEDA/sym/4000/40161-1.sym +share/gEDA/sym/4000/40162-1.sym +share/gEDA/sym/4000/40163-1.sym +share/gEDA/sym/4000/4017-1.sym +share/gEDA/sym/4000/40174-1.sym +share/gEDA/sym/4000/40175-1.sym +share/gEDA/sym/4000/4018-1.sym +share/gEDA/sym/4000/40181-1.sym +share/gEDA/sym/4000/40182-1.sym +share/gEDA/sym/4000/4019-1.sym +share/gEDA/sym/4000/40192-1.sym +share/gEDA/sym/4000/40193-1.sym +share/gEDA/sym/4000/40194-1.sym +share/gEDA/sym/4000/40195-1.sym share/gEDA/sym/4000/4020-1.sym +share/gEDA/sym/4000/40208-1.sym +share/gEDA/sym/4000/4021-1.sym +share/gEDA/sym/4000/4021-2.sym +share/gEDA/sym/4000/4022-1.sym +share/gEDA/sym/4000/4023-1.sym share/gEDA/sym/4000/4024-1.sym +share/gEDA/sym/4000/40240-1.sym +share/gEDA/sym/4000/40244-1.sym +share/gEDA/sym/4000/40245-1.sym +share/gEDA/sym/4000/4025-1.sym +share/gEDA/sym/4000/40257-1.sym +share/gEDA/sym/4000/4026-1.sym +share/gEDA/sym/4000/4027-1.sym +share/gEDA/sym/4000/4028-1.sym +share/gEDA/sym/4000/4029-1.sym +share/gEDA/sym/4000/4030-1.sym +share/gEDA/sym/4000/4031-1.sym +share/gEDA/sym/4000/4032-1.sym +share/gEDA/sym/4000/4033-1.sym +share/gEDA/sym/4000/4034-1.sym +share/gEDA/sym/4000/4035-1.sym +share/gEDA/sym/4000/40373-1.sym +share/gEDA/sym/4000/40374-1.sym +share/gEDA/sym/4000/4038-1.sym share/gEDA/sym/4000/4040-1.sym +share/gEDA/sym/4000/4041-1.sym +share/gEDA/sym/4000/4042-1.sym +share/gEDA/sym/4000/4043-1.sym +share/gEDA/sym/4000/4044-1.sym +share/gEDA/sym/4000/4045-1.sym share/gEDA/sym/4000/4046-1.sym share/gEDA/sym/4000/4047-1.sym +share/gEDA/sym/4000/4048-1.sym +share/gEDA/sym/4000/4049-1.sym +share/gEDA/sym/4000/4050-1.sym share/gEDA/sym/4000/4051-1.sym share/gEDA/sym/4000/4052-1.sym +share/gEDA/sym/4000/4053-1.sym +share/gEDA/sym/4000/4054-1.sym +share/gEDA/sym/4000/4055-1.sym +share/gEDA/sym/4000/4056-1.sym +share/gEDA/sym/4000/4059-1.sym +share/gEDA/sym/4000/4060-1.sym +share/gEDA/sym/4000/4061-1.sym +share/gEDA/sym/4000/4062-1.sym +share/gEDA/sym/4000/4063-1.sym share/gEDA/sym/4000/4066-1.sym +share/gEDA/sym/4000/4067-1.sym +share/gEDA/sym/4000/4068-1.sym +share/gEDA/sym/4000/4069-1.sym +share/gEDA/sym/4000/4069-2.sym +share/gEDA/sym/4000/4069-3.sym +share/gEDA/sym/4000/4070-1.sym +share/gEDA/sym/4000/4071-1.sym +share/gEDA/sym/4000/4072-1.sym +share/gEDA/sym/4000/4073-1.sym +share/gEDA/sym/4000/4075-1.sym +share/gEDA/sym/4000/4076-1.sym +share/gEDA/sym/4000/4077-1.sym +share/gEDA/sym/4000/4078-1.sym +share/gEDA/sym/4000/4081-1.sym +share/gEDA/sym/4000/4082-1.sym +share/gEDA/sym/4000/4085-1.sym +share/gEDA/sym/4000/4086-1.sym +share/gEDA/sym/4000/4089-1.sym share/gEDA/sym/4000/4093-1.sym +share/gEDA/sym/4000/4094-1.sym +share/gEDA/sym/4000/4094-2.sym +share/gEDA/sym/4000/4095-1.sym +share/gEDA/sym/4000/4096-1.sym +share/gEDA/sym/4000/4097-1.sym +share/gEDA/sym/4000/4098-1.sym +share/gEDA/sym/4000/4099-1.sym +share/gEDA/sym/4000/4316-1.sym +share/gEDA/sym/4000/4352-1.sym +share/gEDA/sym/4000/4353-1.sym +share/gEDA/sym/4000/4501-1.sym +share/gEDA/sym/4000/4502-1.sym +share/gEDA/sym/4000/4503-1.sym +share/gEDA/sym/4000/4504-1.sym +share/gEDA/sym/4000/4508-1.sym +share/gEDA/sym/4000/4510-1.sym +share/gEDA/sym/4000/4511-1.sym +share/gEDA/sym/4000/4512-1.sym +share/gEDA/sym/4000/4513-1.sym +share/gEDA/sym/4000/4514-1.sym +share/gEDA/sym/4000/4515-1.sym +share/gEDA/sym/4000/4516-1.sym +share/gEDA/sym/4000/4517-1.sym share/gEDA/sym/4000/4518-1.sym +share/gEDA/sym/4000/4520-1.sym +share/gEDA/sym/4000/4521-1.sym +share/gEDA/sym/4000/4522-1.sym +share/gEDA/sym/4000/4527-1.sym +share/gEDA/sym/4000/4528-1.sym +share/gEDA/sym/4000/4531-1.sym +share/gEDA/sym/4000/4532-1.sym +share/gEDA/sym/4000/4534-1.sym +share/gEDA/sym/4000/4536-1.sym share/gEDA/sym/4000/4538-1.sym +share/gEDA/sym/4000/4541-1.sym +share/gEDA/sym/4000/4543-1.sym +share/gEDA/sym/4000/4555-1.sym +share/gEDA/sym/4000/4556-1.sym +share/gEDA/sym/4000/4572-1.sym +share/gEDA/sym/4000/4580-1.sym +share/gEDA/sym/4000/4582-1.sym +share/gEDA/sym/4000/4585-1.sym +share/gEDA/sym/4000/4723-1.sym +share/gEDA/sym/4000/4724-1.sym +share/gEDA/sym/4000/4737-1.sym share/gEDA/sym/74/7400-1.sym share/gEDA/sym/74/7400-2.sym share/gEDA/sym/74/7401-1.sym @@ -50,10 +190,12 @@ share/gEDA/sym/74/74121-1.sym share/gEDA/sym/74/74122-1.sym share/gEDA/sym/74/74123-1.sym share/gEDA/sym/74/74123-2.sym +share/gEDA/sym/74/74123-3.sym share/gEDA/sym/74/74124-1.sym share/gEDA/sym/74/74125-1.sym share/gEDA/sym/74/74126-1.sym share/gEDA/sym/74/74131-1.sym +share/gEDA/sym/74/74132-1.sym share/gEDA/sym/74/74137-1.sym share/gEDA/sym/74/74138-1.sym share/gEDA/sym/74/74138-2.sym @@ -94,10 +236,12 @@ share/gEDA/sym/74/74173-1.sym share/gEDA/sym/74/74175-1.sym share/gEDA/sym/74/74181-1.sym share/gEDA/sym/74/74182-1.sym +share/gEDA/sym/74/74189-1.sym share/gEDA/sym/74/74190-1.sym share/gEDA/sym/74/74191-1.sym share/gEDA/sym/74/74191-2.sym share/gEDA/sym/74/74192-1.sym +share/gEDA/sym/74/74193-1.sym share/gEDA/sym/74/74194-1.sym share/gEDA/sym/74/74195-1.sym share/gEDA/sym/74/74196-1.sym @@ -108,19 +252,27 @@ share/gEDA/sym/74/7421-1.sym share/gEDA/sym/74/7421-2.sym share/gEDA/sym/74/7422-1.sym share/gEDA/sym/74/7422-2.sym +share/gEDA/sym/74/74240-1.sym share/gEDA/sym/74/74243-1.sym share/gEDA/sym/74/74244-1.sym share/gEDA/sym/74/74244-2.sym share/gEDA/sym/74/74245-1.sym +share/gEDA/sym/74/74257-1.sym share/gEDA/sym/74/74265-1.sym share/gEDA/sym/74/7427-1.sym share/gEDA/sym/74/74273-1.sym share/gEDA/sym/74/74280-1.sym +share/gEDA/sym/74/74283-1.sym +share/gEDA/sym/74/7430-1.sym +share/gEDA/sym/74/7430-2.sym share/gEDA/sym/74/7431-1.sym share/gEDA/sym/74/7432-1.sym share/gEDA/sym/74/74367-1.sym share/gEDA/sym/74/74373-1.sym share/gEDA/sym/74/74374-1.sym +share/gEDA/sym/74/74377-1.sym +share/gEDA/sym/74/74379-1.sym +share/gEDA/sym/74/74393-1.sym share/gEDA/sym/74/7442-1.sym share/gEDA/sym/74/7445-1.sym share/gEDA/sym/74/7446-1.sym @@ -136,6 +288,7 @@ share/gEDA/sym/74/7457-1.sym share/gEDA/sym/74/74573-1.sym share/gEDA/sym/74/74574-1.sym share/gEDA/sym/74/74673A-1.sym +share/gEDA/sym/74/74684-1.sym share/gEDA/sym/74/74688-1.sym share/gEDA/sym/74/7472-1.sym share/gEDA/sym/74/7473-1.sym @@ -159,6 +312,7 @@ share/gEDA/sym/74/74HCT03-1.sym share/gEDA/sym/74/74HCT05-1.sym share/gEDA/sym/74/74HCT08-1.sym share/gEDA/sym/74/74HCT245-1.sym +share/gEDA/sym/74/74HCT4094-1.sym share/gEDA/sym/74/74HCT541-1.sym share/gEDA/sym/IEC417/ac-ac.sym share/gEDA/sym/IEC417/ac-dc.sym @@ -283,6 +437,7 @@ share/gEDA/sym/analog/coil-2.sym share/gEDA/sym/analog/crystal-1.sym share/gEDA/sym/analog/current-1.sym share/gEDA/sym/analog/fuse-1.sym +share/gEDA/sym/analog/glow-lamp-1.sym share/gEDA/sym/analog/inamp-1.sym share/gEDA/sym/analog/inductor-1.sym share/gEDA/sym/analog/inductor-dot-1.sym @@ -298,6 +453,7 @@ share/gEDA/sym/analog/npn-3.sym share/gEDA/sym/analog/opamp-1.sym share/gEDA/sym/analog/opamp-2.sym share/gEDA/sym/analog/photo-resistor-1.sym +share/gEDA/sym/analog/photodiode-1.sym share/gEDA/sym/analog/pmos-1.sym share/gEDA/sym/analog/pmos-2.sym share/gEDA/sym/analog/pnp-1.sym @@ -311,8 +467,16 @@ share/gEDA/sym/analog/resistor-2.sym share/gEDA/sym/analog/resistor-variable-1.sym share/gEDA/sym/analog/resistor-variable-2.sym share/gEDA/sym/analog/resistorpack10-1.sym +share/gEDA/sym/analog/resistorpack11-1.sym +share/gEDA/sym/analog/resistorpack12-1.sym +share/gEDA/sym/analog/resistorpack3-1.sym +share/gEDA/sym/analog/resistorpack4-1.sym +share/gEDA/sym/analog/resistorpack5-1.sym share/gEDA/sym/analog/resistorpack6-1.sym +share/gEDA/sym/analog/resistorpack7-1.sym share/gEDA/sym/analog/resistorpack8-1.sym +share/gEDA/sym/analog/resistorpack8-2.sym +share/gEDA/sym/analog/resistorpack9-1.sym share/gEDA/sym/analog/rpack-1.sym share/gEDA/sym/analog/speaker-1.sym share/gEDA/sym/analog/speaker-2.sym @@ -332,6 +496,9 @@ share/gEDA/sym/connector/DB9-2.sym share/gEDA/sym/connector/DIN41612C48-1.sym share/gEDA/sym/connector/DIN41612C56-1.sym share/gEDA/sym/connector/DIN41612C96-1.sym +share/gEDA/sym/connector/DIN41617C13-1.sym +share/gEDA/sym/connector/DIN41617C15-1.sym +share/gEDA/sym/connector/DIN41617C31-1.sym share/gEDA/sym/connector/MCX-1.sym share/gEDA/sym/connector/connector10-1.sym share/gEDA/sym/connector/connector15-1.sym @@ -343,18 +510,22 @@ share/gEDA/sym/connector/connector26-1.sym share/gEDA/sym/connector/connector3-1.sym share/gEDA/sym/connector/connector4-1.sym share/gEDA/sym/connector/connector41-1.sym +share/gEDA/sym/connector/connector5-1.sym share/gEDA/sym/connector/connector6-1.sym share/gEDA/sym/connector/connector8-1.sym share/gEDA/sym/connector/connector9-1.sym +share/gEDA/sym/connector/dip24-1.sym share/gEDA/sym/connector/gpib-1.sym share/gEDA/sym/connector/header10-1.sym share/gEDA/sym/connector/header10-2.sym share/gEDA/sym/connector/header18-2.sym share/gEDA/sym/connector/header20-1.sym share/gEDA/sym/connector/header20-2.sym +share/gEDA/sym/connector/header20-3.sym share/gEDA/sym/connector/header22-1.sym share/gEDA/sym/connector/header26-1.sym share/gEDA/sym/connector/header3-1.sym +share/gEDA/sym/connector/header34-1.sym share/gEDA/sym/connector/header40-2.sym share/gEDA/sym/connector/header50-2.sym share/gEDA/sym/connector/jumper-1.sym @@ -434,67 +605,67 @@ share/gEDA/sym/font/Y.sym share/gEDA/sym/font/Z.sym share/gEDA/sym/font/a-diaeresis.sym share/gEDA/sym/font/a-ring.sym -share/gEDA/sym/font/a.sym +share/gEDA/sym/font/a_.sym share/gEDA/sym/font/amper.sym share/gEDA/sym/font/apost.sym share/gEDA/sym/font/astericks.sym share/gEDA/sym/font/at.sym -share/gEDA/sym/font/b.sym +share/gEDA/sym/font/b_.sym share/gEDA/sym/font/backslash.sym share/gEDA/sym/font/backtick.sym share/gEDA/sym/font/box.sym -share/gEDA/sym/font/c.sym +share/gEDA/sym/font/c_.sym share/gEDA/sym/font/caret.sym share/gEDA/sym/font/colon.sym share/gEDA/sym/font/comma.sym -share/gEDA/sym/font/d.sym +share/gEDA/sym/font/d_.sym share/gEDA/sym/font/dollar.sym -share/gEDA/sym/font/e.sym +share/gEDA/sym/font/e_.sym share/gEDA/sym/font/equal.sym share/gEDA/sym/font/excl.sym -share/gEDA/sym/font/f.sym -share/gEDA/sym/font/g.sym -share/gEDA/sym/font/h.sym -share/gEDA/sym/font/i.sym -share/gEDA/sym/font/j.sym -share/gEDA/sym/font/k.sym -share/gEDA/sym/font/l.sym +share/gEDA/sym/font/f_.sym +share/gEDA/sym/font/g_.sym +share/gEDA/sym/font/h_.sym +share/gEDA/sym/font/i_.sym +share/gEDA/sym/font/j_.sym +share/gEDA/sym/font/k_.sym +share/gEDA/sym/font/l_.sym share/gEDA/sym/font/lbrace.sym share/gEDA/sym/font/lbrack.sym share/gEDA/sym/font/less.sym share/gEDA/sym/font/lparen.sym -share/gEDA/sym/font/m.sym +share/gEDA/sym/font/m_.sym share/gEDA/sym/font/minus.sym share/gEDA/sym/font/more.sym -share/gEDA/sym/font/n.sym +share/gEDA/sym/font/n_.sym share/gEDA/sym/font/o-diaeresis.sym -share/gEDA/sym/font/o.sym -share/gEDA/sym/font/p.sym +share/gEDA/sym/font/o_.sym +share/gEDA/sym/font/p_.sym share/gEDA/sym/font/percent.sym share/gEDA/sym/font/period.sym share/gEDA/sym/font/plus.sym share/gEDA/sym/font/pound.sym -share/gEDA/sym/font/q.sym +share/gEDA/sym/font/q_.sym share/gEDA/sym/font/quest.sym share/gEDA/sym/font/quote.sym -share/gEDA/sym/font/r.sym +share/gEDA/sym/font/r_.sym share/gEDA/sym/font/rbrace.sym share/gEDA/sym/font/rbrack.sym share/gEDA/sym/font/rparen.sym -share/gEDA/sym/font/s.sym +share/gEDA/sym/font/s_.sym share/gEDA/sym/font/semi.sym share/gEDA/sym/font/slash.sym share/gEDA/sym/font/space.sym -share/gEDA/sym/font/t.sym +share/gEDA/sym/font/t_.sym share/gEDA/sym/font/tilde.sym -share/gEDA/sym/font/u.sym +share/gEDA/sym/font/u_.sym share/gEDA/sym/font/under.sym -share/gEDA/sym/font/v.sym +share/gEDA/sym/font/v_.sym share/gEDA/sym/font/vbar.sym -share/gEDA/sym/font/w.sym -share/gEDA/sym/font/x.sym -share/gEDA/sym/font/y.sym -share/gEDA/sym/font/z.sym +share/gEDA/sym/font/w_.sym +share/gEDA/sym/font/x_.sym +share/gEDA/sym/font/y_.sym +share/gEDA/sym/font/z_.sym share/gEDA/sym/foot/cap.foot share/gEDA/sym/foot/dip300_18.foot share/gEDA/sym/foot/led.foot @@ -506,6 +677,7 @@ share/gEDA/sym/io/input-1.sym share/gEDA/sym/io/out-1.sym share/gEDA/sym/io/output-1.sym share/gEDA/sym/lattice/isp2032-1.sym +share/gEDA/sym/linear/SLA7024M.sym share/gEDA/sym/linear/TDA2822M-1.sym share/gEDA/sym/linear/ad633JN-1.sym share/gEDA/sym/linear/ad633JN-2.sym @@ -527,6 +699,13 @@ share/gEDA/sym/linear/lm75-1.sym share/gEDA/sym/linear/lm7805-1.sym share/gEDA/sym/linear/lm7805-2.sym share/gEDA/sym/linear/lm7805c-1.sym +share/gEDA/sym/linear/lm7806-1.sym +share/gEDA/sym/linear/lm7810-1.sym +share/gEDA/sym/linear/lm7812-1.sym +share/gEDA/sym/linear/lm7815-1.sym +share/gEDA/sym/linear/lm7818-1.sym +share/gEDA/sym/linear/lm7824-1.sym +share/gEDA/sym/linear/lm7885-1.sym share/gEDA/sym/linear/lm78l05-1.sym share/gEDA/sym/linear/lm78l05ac-1.sym share/gEDA/sym/linear/lm78l05c-1.sym @@ -536,6 +715,7 @@ share/gEDA/sym/linear/lm79m05-1.sym share/gEDA/sym/linear/lt1108-1.sym share/gEDA/sym/linear/lt1181-1.sym share/gEDA/sym/linear/lt1308.sym +share/gEDA/sym/linear/lt1374cs8.sym share/gEDA/sym/linear/lt1376-5.sym share/gEDA/sym/linear/lt1761sd-1.sym share/gEDA/sym/linear/ltc2400-1.sym @@ -558,13 +738,16 @@ share/gEDA/sym/maxim/max1620-1.sym share/gEDA/sym/maxim/max1637-1.sym share/gEDA/sym/maxim/max1674-1.sym share/gEDA/sym/maxim/max186-1.sym +share/gEDA/sym/maxim/max186-2.sym share/gEDA/sym/maxim/max189-1.sym share/gEDA/sym/maxim/max202-1.sym share/gEDA/sym/maxim/max214-1.sym share/gEDA/sym/maxim/max218-1.sym share/gEDA/sym/maxim/max232-1.sym share/gEDA/sym/maxim/max233-1.sym +share/gEDA/sym/maxim/max233-2.sym share/gEDA/sym/maxim/max237-1.sym +share/gEDA/sym/maxim/max238-1.sym share/gEDA/sym/maxim/max3120-1.sym share/gEDA/sym/maxim/max3226-1.sym share/gEDA/sym/maxim/max3491-1.sym @@ -573,6 +756,7 @@ share/gEDA/sym/maxim/max400-1.sym share/gEDA/sym/maxim/max4005-1.sym share/gEDA/sym/maxim/max436-1.sym share/gEDA/sym/maxim/max4636-1.sym +share/gEDA/sym/maxim/max4662-2.sym share/gEDA/sym/maxim/max478-1.sym share/gEDA/sym/maxim/max488-1.sym share/gEDA/sym/maxim/max492-1.sym @@ -590,6 +774,7 @@ share/gEDA/sym/memory/24Cxx-1.sym share/gEDA/sym/memory/27256-1.sym share/gEDA/sym/memory/27512-1.sym share/gEDA/sym/memory/27C256-1.sym +share/gEDA/sym/memory/4164-1.sym share/gEDA/sym/memory/581000-1.sym share/gEDA/sym/memory/62256-1.sym share/gEDA/sym/memory/62256-2.sym @@ -598,13 +783,42 @@ share/gEDA/sym/memory/HM6264P15-1.sym share/gEDA/sym/memory/N82S23N-1.sym share/gEDA/sym/memory/am27S13D-1.sym share/gEDA/sym/memory/am9128-1.sym +share/gEDA/sym/micro/6821-1.sym share/gEDA/sym/micro/8031.sym share/gEDA/sym/micro/8086-1.sym share/gEDA/sym/micro/8088-1.sym share/gEDA/sym/micro/8254-1.sym share/gEDA/sym/micro/8255A-1.sym share/gEDA/sym/micro/8259A-1.sym +share/gEDA/sym/micro/AT43USB320A.sym +share/gEDA/sym/micro/AT89C51_DIP.sym +share/gEDA/sym/micro/AT89C51_PLCC.sym +share/gEDA/sym/micro/AT89C51_TQFP.sym share/gEDA/sym/micro/AT89S8252-24PC-1.sym +share/gEDA/sym/micro/AT90S1200.sym +share/gEDA/sym/micro/AT90S2313.sym +share/gEDA/sym/micro/AT90S2323.sym +share/gEDA/sym/micro/AT90S2343.sym +share/gEDA/sym/micro/AT90S4433_DIP.sym +share/gEDA/sym/micro/AT90S4433_TQFP.sym +share/gEDA/sym/micro/AT90S8515_DIP.sym +share/gEDA/sym/micro/AT90S8515_PLCC.sym +share/gEDA/sym/micro/AT90S8515_TQFP.sym +share/gEDA/sym/micro/AT90S8535.sym +share/gEDA/sym/micro/AT90S8535J-1.sym +share/gEDA/sym/micro/AT90S8535P-1.sym +share/gEDA/sym/micro/AT90S8535_DIP.sym +share/gEDA/sym/micro/AT90S8535_PLCC.sym +share/gEDA/sym/micro/AT90S8535_TQFP.sym +share/gEDA/sym/micro/ATmega103.sym +share/gEDA/sym/micro/ATmega161_DIP.sym +share/gEDA/sym/micro/ATmega161_TQFP.sym +share/gEDA/sym/micro/ATmega163_DIP.sym +share/gEDA/sym/micro/ATmega163_TQFP.sym +share/gEDA/sym/micro/ATtiny11.sym +share/gEDA/sym/micro/ATtiny12.sym +share/gEDA/sym/micro/ATtiny28_DIP.sym +share/gEDA/sym/micro/ATtiny28_TQFP.sym share/gEDA/sym/micro/DS80C310.sym share/gEDA/sym/micro/DS80C320.sym share/gEDA/sym/micro/mc68hc05j1a-1.sym @@ -657,9 +871,15 @@ share/gEDA/sym/opto/HSDL7000-1.sym share/gEDA/sym/opto/hcpl-2630-1.sym share/gEDA/sym/opto/hcpl-2631-1.sym share/gEDA/sym/opto/hcpl-4534-1.sym +share/gEDA/sym/opto/mct9001-1.sym share/gEDA/sym/opto/ps2501-1.sym share/gEDA/sym/pla/22V10-PLCC.sym share/gEDA/sym/pla/N82S100N-1.sym +share/gEDA/sym/pla/PAL12H6-1.sym +share/gEDA/sym/pla/PAL16L8-1.sym +share/gEDA/sym/pla/PAL20X10-1.sym +share/gEDA/sym/pla/PAL20X4-1.sym +share/gEDA/sym/pla/PAL20X8-1.sym share/gEDA/sym/power/12V-minus-1.sym share/gEDA/sym/power/12V-plus-1.sym share/gEDA/sym/power/3.3V-plus-1.sym @@ -669,9 +889,11 @@ share/gEDA/sym/power/9V-minus-1.sym share/gEDA/sym/power/9V-plus-1.sym share/gEDA/sym/power/generic-power.sym share/gEDA/sym/power/gnd-1.sym +share/gEDA/sym/power/gnd-2.sym share/gEDA/sym/power/vcc-1.sym share/gEDA/sym/power/vcc-2.sym share/gEDA/sym/power/vcc-minus-1.sym +share/gEDA/sym/power/vcc-orcad-circle-1.sym share/gEDA/sym/power/vdd-1.sym share/gEDA/sym/power/vee-1.sym share/gEDA/sym/power/vss-1.sym @@ -741,11 +963,14 @@ share/gEDA/sym/titleblock/title-B.sym share/gEDA/sym/titleblock/title-C.sym share/gEDA/sym/titleblock/title-D.sym share/gEDA/sym/titleblock/title-E.sym +share/gEDA/sym/transistor/2N3055-1.sym +share/gEDA/sym/transistor/2N3904-1.sym share/gEDA/sym/transistor/2N5245-1.sym share/gEDA/sym/transistor/2N5911-1.sym share/gEDA/sym/transistor/2S2K3-1.sym share/gEDA/sym/transistor/ULN2003-1.sym share/gEDA/sym/transistor/ULN2801A-1.sym +share/gEDA/sym/transistor/dgnmos-1.sym share/gEDA/sym/tube/12SA7-1.sym share/gEDA/sym/tube/12SK7-1.sym share/gEDA/sym/tube/12SQ7-1.sym diff --git a/cad/geda-symbols/distinfo b/cad/geda-symbols/distinfo index 927bbad21e8..10c7da592cb 100644 --- a/cad/geda-symbols/distinfo +++ b/cad/geda-symbols/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2001/07/17 03:05:01 dmcmahill Exp $ +$NetBSD: distinfo,v 1.3.2.1 2002/06/23 18:39:52 jlam Exp $ -SHA1 (geda/geda-symbols-20010708.tar.gz) = e173fd140f00f8c8433e96509a5ffc1a03e94a67 -Size (geda/geda-symbols-20010708.tar.gz) = 255631 bytes +SHA1 (geda/geda-symbols-20020414.tar.gz) = 029358a9eef40f8be588b2d0ac5ccf44bd2e8d1d +Size (geda/geda-symbols-20020414.tar.gz) = 360821 bytes diff --git a/cad/geda-utils/Makefile b/cad/geda-utils/Makefile index 3c9777782e3..ba4ea35a34b 100644 --- a/cad/geda-utils/Makefile +++ b/cad/geda-utils/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.6 2002/03/13 17:36:39 fredb Exp $ +# $NetBSD: Makefile,v 1.6.2.1 2002/06/23 18:39:53 jlam Exp $ # DISTNAME= geda-utils-${PKGVERSION} CATEGORIES= cad -PKGREVISION= 1 MASTER_SITES= ftp://ftp.geda.seul.org/pub/geda/devel/${PKGVERSION}/ \ ftp://ieee.ing.uniroma1.it/pub/geda/devel/${PKGVERSION}/ \ http://www.geda.seul.org/devel/${PKGVERSION}/ \ @@ -13,12 +12,12 @@ MAINTAINER= rh@netbsd.org HOMEPAGE= http://www.geda.seul.org/ COMMENT= Set of utilites for gEDA -DEPENDS+= libgeda-${PKGVERSION}nb1:../../cad/libgeda +DEPENDS+= libgeda-${PKGVERSION}:../../cad/libgeda CONFLICTS+= gEDA<19991011 DIST_SUBDIR= geda -PKGVERSION= 20010708 +PKGVERSION= 20020414 GNU_CONFIGURE= YES USE_X11BASE= YES diff --git a/cad/geda-utils/distinfo b/cad/geda-utils/distinfo index 60d362c8951..c96f497531a 100644 --- a/cad/geda-utils/distinfo +++ b/cad/geda-utils/distinfo @@ -1,5 +1,4 @@ -$NetBSD: distinfo,v 1.3 2001/07/17 03:03:57 dmcmahill Exp $ +$NetBSD: distinfo,v 1.3.2.1 2002/06/23 18:39:53 jlam Exp $ -SHA1 (geda/geda-utils-20010708.tar.gz) = bb7ca9b2c5ecf6f558eb4ccbd9ce62ca92b21ab1 -Size (geda/geda-utils-20010708.tar.gz) = 71884 bytes -SHA1 (patch-aa) = c338a971f37ebfd046c9dfe1819461d03a0de2cd +SHA1 (geda/geda-utils-20020414.tar.gz) = 3817a7dfa85e328b0b1f9a6bd28f07e8386ed3f6 +Size (geda/geda-utils-20020414.tar.gz) = 122242 bytes diff --git a/cad/geda-utils/patches/patch-aa b/cad/geda-utils/patches/patch-aa deleted file mode 100644 index fb35486c8df..00000000000 --- a/cad/geda-utils/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2001/07/17 03:03:57 dmcmahill Exp $ - ---- src/char_width.c.orig Thu Jul 22 21:32:32 1999 -+++ src/char_width.c Mon Jul 16 17:56:45 2001 -@@ -1,3 +1,8 @@ - -+#include "config.h" -+#ifdef HAVE_STRINGS_H -+#include <strings.h> -+#endif -+ - #define CHAR_POINTS 2 - diff --git a/cad/geda/Makefile b/cad/geda/Makefile index 186b0f823e4..2532b5483ad 100644 --- a/cad/geda/Makefile +++ b/cad/geda/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.17 2002/03/14 00:39:35 wiz Exp $ +# $NetBSD: Makefile,v 1.17.2.1 2002/06/23 18:39:48 jlam Exp $ # DISTNAME= gEDA-${PKGVERSION} CATEGORIES= cad -PKGREVISION= 1 MASTER_SITES= # empty DISTFILES= # empty @@ -14,8 +13,8 @@ COMMENT= Toolset for automating electronic design DEPENDS+= gschem>=${PKGVERSION}:../../cad/gschem DEPENDS+= gnetlist>=${PKGVERSION}:../../cad/gnetlist DEPENDS+= gsymcheck>=${PKGVERSION}:../../cad/gsymcheck -DEPENDS+= geda-utils-${PKGVERSION}nb1:../../cad/geda-utils -DEPENDS+= geda-docs-20010304:../../cad/geda-docs +DEPENDS+= geda-utils-${PKGVERSION}:../../cad/geda-utils +DEPENDS+= geda-docs-20020209:../../cad/geda-docs USE_X11BASE= yes EXTRACT_ONLY= # empty @@ -24,7 +23,7 @@ NO_PATCH= yes NO_CONFIGURE= yes NO_BUILD= yes -PKGVERSION= 20010708 +PKGVERSION= 20020414 do-install: # empty diff --git a/cad/gnetlist/Makefile b/cad/gnetlist/Makefile index 250d91ba0c8..8c73af26a54 100644 --- a/cad/gnetlist/Makefile +++ b/cad/gnetlist/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.8 2002/03/13 17:36:39 fredb Exp $ +# $NetBSD: Makefile,v 1.8.2.1 2002/06/23 18:39:56 jlam Exp $ # DISTNAME= geda-gnetlist-${PKGVERSION} PKGNAME= gnetlist-${PKGVERSION} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= cad MASTER_SITES= ftp://ftp.geda.seul.org/pub/geda/devel/${PKGVERSION}/ \ ftp://ieee.ing.uniroma1.it/pub/geda/devel/${PKGVERSION}/ \ @@ -15,10 +15,12 @@ HOMEPAGE= http://www.geda.seul.org/ COMMENT= Netlist generation program DIST_SUBDIR= geda -PKGVERSION= 20010708 +PKGVERSION= 20020414 -DEPENDS+= libgeda-${PKGVERSION}nb1:../../cad/libgeda +DEPENDS+= libgeda-${PKGVERSION}:../../cad/libgeda DEPENDS+= geda-symbols-${PKGVERSION}:../../cad/geda-symbols +# needs GNU m4 for the PCBboard netlister +DEPENDS+= m4-1.4:../../devel/m4 CONFLICTS+= gEDA<19991011 @@ -29,4 +31,10 @@ USE_GMAKE= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig +post-patch: + ${MV} -f ${WRKSRC}/scheme/gnet-PCBboard.scm ${WRKSRC}/scheme/gnet-PCBboard.scm.bak + ${SED} 's;@pcb_confdir@;${PKG_SYSCONFDIR}/pcb;g' \ + ${WRKSRC}/scheme/gnet-PCBboard.scm.bak > ${WRKSRC}/scheme/gnet-PCBboard.scm + ${RM} -f ${WRKSRC}/scheme/gnet-PCBboard.scm.bak + .include "../../mk/bsd.pkg.mk" diff --git a/cad/gnetlist/PLIST b/cad/gnetlist/PLIST index 3d4757c5fe3..f838f4bd761 100644 --- a/cad/gnetlist/PLIST +++ b/cad/gnetlist/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:30 skrll Exp $ +@comment $NetBSD: PLIST,v 1.2.2.1 2002/06/23 18:39:56 jlam Exp $ bin/gnetlist bin/gschem2pcb bin/mk_verilog_syms @@ -13,6 +13,7 @@ share/gEDA/scheme/gnet-bom2.scm share/gEDA/scheme/gnet-drc.scm share/gEDA/scheme/gnet-geda.scm share/gEDA/scheme/gnet-gossip.scm +share/gEDA/scheme/gnet-maxascii.scm share/gEDA/scheme/gnet-pads.scm share/gEDA/scheme/gnet-partslist-common.scm share/gEDA/scheme/gnet-partslist1.scm diff --git a/cad/gnetlist/distinfo b/cad/gnetlist/distinfo index 37e61cfc3d9..4af9cfd62ce 100644 --- a/cad/gnetlist/distinfo +++ b/cad/gnetlist/distinfo @@ -1,9 +1,6 @@ -$NetBSD: distinfo,v 1.3 2001/07/17 03:02:51 dmcmahill Exp $ +$NetBSD: distinfo,v 1.3.2.1 2002/06/23 18:39:57 jlam Exp $ -SHA1 (geda/geda-gnetlist-20010708.tar.gz) = 901a6f1cdfe69d210918b11c9504043b4c76ad97 -Size (geda/geda-gnetlist-20010708.tar.gz) = 181258 bytes -SHA1 (patch-aa) = aaefde49f95790a6fbdfa1cc79619b94947cabda -SHA1 (patch-ab) = 1b5613e3cc0144a919b51f528335045eb59cf71a -SHA1 (patch-ac) = da34fd6502363724f587bb14de379aa671a03530 -SHA1 (patch-ad) = cbaa1389b1ffdef48a3c90384b28990531c0e3b0 -SHA1 (patch-ae) = 9d75c7e132d0732b2290fc80c79607fbe2a18076 +SHA1 (geda/geda-gnetlist-20020414.tar.gz) = f568fc3dc198046d7865b38d99a9de36d47f17fb +Size (geda/geda-gnetlist-20020414.tar.gz) = 236941 bytes +SHA1 (patch-aa) = 5ff82fea2ae9afb672fc1c270be57da1c5f4b293 +SHA1 (patch-ab) = 7546a526795b2e42c0fe716030c3e0c93687e4c3 diff --git a/cad/gnetlist/patches/patch-aa b/cad/gnetlist/patches/patch-aa index 922e0d1b20f..8ac44effd4a 100644 --- a/cad/gnetlist/patches/patch-aa +++ b/cad/gnetlist/patches/patch-aa @@ -1,13 +1,15 @@ -$NetBSD: patch-aa,v 1.1 2001/07/17 03:02:51 dmcmahill Exp $ +$NetBSD: patch-aa,v 1.1.2.1 2002/06/23 18:39:57 jlam Exp $ ---- src/i_vars.c.orig Mon Jun 11 18:50:26 2001 -+++ src/i_vars.c Mon Jul 16 19:51:56 2001 -@@ -21,4 +21,8 @@ - #include <stdio.h> +needs GNU m4 + +--- scheme/gnet-PCBboard.scm.orig Sun Jan 27 13:48:35 2002 ++++ scheme/gnet-PCBboard.scm +@@ -151,7 +151,7 @@ + ;; Original pipe command commented out by AVH (bugfix by Rich Walker) + ;; (let ((pipe (open-output-pipe (string-append "m4 " *m4-pcbdir* "/common.m4 - >> " output-filename)))) + ;; Fixed pipe command (AVH 1/27/02) +- (let ((pipe (open-output-pipe (string-append "m4 -d -I" *m4-pcbdir* " " *m4-pcbdir* "/common.m4 - >> " output-filename)))) ++ (let ((pipe (open-output-pipe (string-append "gm4 -d -I" *m4-pcbdir* " -I@pcb_confdir@ -I$HOME/.pcb -I. " *m4-pcbdir* "/common.m4 - >> " output-filename)))) -+#ifdef HAVE_STRINGS_H -+#include <strings.h> -+#endif -+ - #include <libgeda/libgeda.h> + ;; packages is a list with the different uref value diff --git a/cad/gnetlist/patches/patch-ab b/cad/gnetlist/patches/patch-ab index 68333d84b9f..10917ffcc26 100644 --- a/cad/gnetlist/patches/patch-ab +++ b/cad/gnetlist/patches/patch-ab @@ -1,12 +1,71 @@ -$NetBSD: patch-ab,v 1.1 2001/07/17 03:02:51 dmcmahill Exp $ +$NetBSD: patch-ab,v 1.1.2.1 2002/06/23 18:39:58 jlam Exp $ ---- src/gnetlist.c.orig Sun Jul 8 12:13:54 2001 -+++ src/gnetlist.c Mon Jul 16 19:52:44 2001 -@@ -20,4 +20,7 @@ - #include <config.h> - #include <stdio.h> -+#ifdef HAVE_STRINGS_H -+#include <strings.h> -+#endif - #include <signal.h> - #ifdef HAVE_UNISTD_H +use sh(1) and awk(1) not bash(1) and gawk(1). Also use short options for +head(1) and tail(1). + +--- src/gschem2pcb.orig Fri Apr 21 16:48:38 2000 ++++ src/gschem2pcb +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by +@@ -43,7 +43,7 @@ + fi + + # Search for the beginning of the filename assuming it ends by .sch +-FILENAME=`echo "$1" | sed 's/.sch//g' -` ++FILENAME=`echo "$1" | sed 's/.sch//g' ` + PCBFILENAME=$FILENAME.pcb + + # test if a .pcb file exists +@@ -59,7 +59,7 @@ + gnetlist -g PCB -o $NETFILENAME $1 + gnetlist -g PCBboard -o $PCBTEMPFILENAME $1 + echo +- gawk 'BEGIN {FS=","} ++ awk 'BEGIN {FS=","} + /^PKG_*/{ + footprint=$1 + sub(/PKG_/,"",footprint) +@@ -68,23 +68,23 @@ + value=substr($3,0,length($3)-1) + printf("Error: the footprint %s for the device %s does not exist\n",footprint,$2,value) + }' $PCBTEMPFILENAME +- gawk '/^Element\(.*/{printf("%s\t%s\t\n",$3,$4)}' $PCBFILENAME|sort > $LISTFILE +- gawk '/^Element\(.*/{printf("%s\t%s\t\n",$3,$4)}' $PCBTEMPFILENAME|sort > $NEWLISTFILE +- UREF=`diff $NEWLISTFILE $LISTFILE | gawk '/</{printf("%s\n",$2)}' -` ++ awk '/^Element\(.*/{printf("%s\t%s\t\n",$3,$4)}' $PCBFILENAME|sort > $LISTFILE ++ awk '/^Element\(.*/{printf("%s\t%s\t\n",$3,$4)}' $PCBTEMPFILENAME|sort > $NEWLISTFILE ++ UREF=`diff $NEWLISTFILE $LISTFILE | awk '/</{printf("%s\n",$2)}' -` + #Search for UREF if $PCBTEMPFILENAME and create $PCBNEWFILENAME + #Header of the pcb file +- head --lines 5 $PCBTEMPFILENAME > $PCBNEWFILENAME ++ head -n 5 $PCBTEMPFILENAME > $PCBNEWFILENAME + for f in `echo $UREF`; do + echo "Find new element $f" +- LINE=`grep -n $f $PCBTEMPFILENAME|sed 's/:.*$//g' -` +- gawk -v line=$LINE '{if (NR>=line) ++ LINE=`grep -n $f $PCBTEMPFILENAME|sed 's/:.*$//g' ` ++ awk -v line=$LINE '{if (NR>=line) + {print + if ($1==")") exit} + }' $PCBTEMPFILENAME >> $PCBNEWFILENAME + + done + # End of the pcb file +- tail --lines 24 $PCBTEMPFILENAME >> $PCBNEWFILENAME ++ tail -n 24 $PCBTEMPFILENAME >> $PCBNEWFILENAME + + # Un peu de ménage (in french in the texte) + rm $PCBTEMPFILENAME $NEWLISTFILE $LISTFILE +@@ -96,7 +96,7 @@ + gnetlist -g PCB -o $NETFILENAME $1 + gnetlist -g PCBboard -o $PCBFILENAME $1 + # Test if a footprint has not been found +- gawk 'BEGIN {FS=","} ++ awk 'BEGIN {FS=","} + /^PKG_*/{ + footprint=$1 + sub(/PKG_/,"",footprint) diff --git a/cad/gnetlist/patches/patch-ac b/cad/gnetlist/patches/patch-ac deleted file mode 100644 index 320c3fe87ba..00000000000 --- a/cad/gnetlist/patches/patch-ac +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2001/07/17 03:02:51 dmcmahill Exp $ - ---- src/parsecmd.c.orig Sun Feb 18 17:47:48 2001 -+++ src/parsecmd.c Mon Jul 16 19:53:14 2001 -@@ -20,4 +20,7 @@ - #include <config.h> - #include <stdio.h> -+#ifdef HAVE_STRINGS_H -+#include <strings.h> -+#endif - #ifdef HAVE_UNISTD_H - #include <unistd.h> diff --git a/cad/gnetlist/patches/patch-ad b/cad/gnetlist/patches/patch-ad deleted file mode 100644 index c433838ac21..00000000000 --- a/cad/gnetlist/patches/patch-ad +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2001/07/17 03:02:51 dmcmahill Exp $ - ---- src/s_net.c.orig Fri Jun 15 20:37:43 2001 -+++ src/s_net.c Mon Jul 16 19:53:43 2001 -@@ -20,4 +20,7 @@ - #include <config.h> - #include <stdio.h> -+#ifdef HAVE_STRINGS_H -+#include <strings.h> -+#endif - #include <stdlib.h> - #include <assert.h> diff --git a/cad/gnetlist/patches/patch-ae b/cad/gnetlist/patches/patch-ae deleted file mode 100644 index 94b3f844ac1..00000000000 --- a/cad/gnetlist/patches/patch-ae +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2001/07/17 03:02:51 dmcmahill Exp $ - ---- src/s_rename.c.orig Thu Mar 1 21:54:03 2001 -+++ src/s_rename.c Mon Jul 16 19:54:17 2001 -@@ -20,4 +20,7 @@ - #include <config.h> - #include <stdio.h> -+#ifdef HAVE_STRINGS_H -+#include <strings.h> -+#endif - #include <stdlib.h> - #include <assert.h> diff --git a/cad/gschem/Makefile b/cad/gschem/Makefile index ab3fafc2386..3ef22f8190f 100644 --- a/cad/gschem/Makefile +++ b/cad/gschem/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2002/03/13 17:36:39 fredb Exp $ +# $NetBSD: Makefile,v 1.8.2.1 2002/06/23 18:39:59 jlam Exp $ # DISTNAME= geda-gschem-${PKGVERSION} PKGNAME= gschem-${PKGVERSION} -PKGREVISION= 1 CATEGORIES= cad MASTER_SITES= ftp://ftp.geda.seul.org/pub/geda/devel/${PKGVERSION}/ \ ftp://ieee.ing.uniroma1.it/pub/geda/devel/${PKGVERSION}/ \ @@ -14,13 +13,13 @@ MAINTAINER= rh@netbsd.org HOMEPAGE= http://www.geda.seul.org/ COMMENT= Schematic capture tool -DEPENDS+= libgeda-${PKGVERSION}nb1:../../cad/libgeda +DEPENDS+= libgeda-${PKGVERSION}:../../cad/libgeda DEPENDS+= geda-symbols-${PKGVERSION}:../../cad/geda-symbols CONFLICTS+= gEDA<19991011 DIST_SUBDIR= geda -PKGVERSION= 20010708 +PKGVERSION= 20020414 GNU_CONFIGURE= YES USE_X11BASE= YES @@ -28,4 +27,5 @@ USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/cad/gschem/PLIST b/cad/gschem/PLIST index cc1ddc7d385..951902671a7 100644 --- a/cad/gschem/PLIST +++ b/cad/gschem/PLIST @@ -1,5 +1,25 @@ -@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:30 skrll Exp $ +@comment $NetBSD: PLIST,v 1.2.2.1 2002/06/23 18:40:00 jlam Exp $ bin/gschem +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/gschemdoc.info +info/gschemdoc.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/gschemdoc.info +info/gschemdoc.info-1 +info/gschemdoc.info-10 +info/gschemdoc.info-11 +info/gschemdoc.info-12 +info/gschemdoc.info-13 +info/gschemdoc.info-14 +info/gschemdoc.info-15 +info/gschemdoc.info-16 +info/gschemdoc.info-17 +info/gschemdoc.info-2 +info/gschemdoc.info-3 +info/gschemdoc.info-4 +info/gschemdoc.info-5 +info/gschemdoc.info-6 +info/gschemdoc.info-7 +info/gschemdoc.info-8 +info/gschemdoc.info-9 man/man1/gschem.1 share/gEDA/gschem-gtkrc share/gEDA/system-gschemrc diff --git a/cad/gschem/distinfo b/cad/gschem/distinfo index 4eb08245199..67fac4123bf 100644 --- a/cad/gschem/distinfo +++ b/cad/gschem/distinfo @@ -1,10 +1,4 @@ -$NetBSD: distinfo,v 1.3 2001/07/17 03:01:09 dmcmahill Exp $ +$NetBSD: distinfo,v 1.3.2.1 2002/06/23 18:40:01 jlam Exp $ -SHA1 (geda/geda-gschem-20010708.tar.gz) = 61dfefd636f34c4d74d80d1cd01a3191cdbbbc83 -Size (geda/geda-gschem-20010708.tar.gz) = 500646 bytes -SHA1 (patch-aa) = 36c091285b4c945e59b0d15c813bd2ac9b4b5061 -SHA1 (patch-ab) = a265360f08d162f0ade6693fd358b62ce173421b -SHA1 (patch-ac) = 2b6a83225bfa791efb82d2ca4aa85b1b44fc2fd3 -SHA1 (patch-ad) = c971ff92bdd27ef13aea8363bf15ebada10cd41d -SHA1 (patch-ae) = 1f324d6aa22c78442930b16d47f1d3758ca66691 -SHA1 (patch-af) = a820657e17c95bbeb0ac1f90ca41f449e02a4182 +SHA1 (geda/geda-gschem-20020414.tar.gz) = 07d740f4af4a1dc49e47d4c6e868b6ea23bd670f +Size (geda/geda-gschem-20020414.tar.gz) = 1050665 bytes diff --git a/cad/gschem/patches/patch-aa b/cad/gschem/patches/patch-aa deleted file mode 100644 index 35240883288..00000000000 --- a/cad/gschem/patches/patch-aa +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2001/07/17 03:01:09 dmcmahill Exp $ - ---- src/gschem.c.orig Sun Jul 8 22:03:46 2001 -+++ src/gschem.c Mon Jul 16 21:32:55 2001 -@@ -23,4 +23,7 @@ - #include <config.h> - #include <stdio.h> -+#ifdef HAVE_STRINGS_H -+#include <strings.h> -+#endif - #include <signal.h> - #ifdef HAVE_UNISTD_H diff --git a/cad/gschem/patches/patch-ab b/cad/gschem/patches/patch-ab deleted file mode 100644 index 208787cbef2..00000000000 --- a/cad/gschem/patches/patch-ab +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2001/07/17 03:01:10 dmcmahill Exp $ - ---- src/i_basic.c.orig Sun Jul 8 22:03:46 2001 -+++ src/i_basic.c Mon Jul 16 21:33:35 2001 -@@ -22,4 +22,7 @@ - - #include <config.h> -+#ifdef HAVE_STRINGS_H -+#include <strings.h> -+#endif - - #include <libgeda/libgeda.h> diff --git a/cad/gschem/patches/patch-ac b/cad/gschem/patches/patch-ac deleted file mode 100644 index 4fccf928483..00000000000 --- a/cad/gschem/patches/patch-ac +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2001/07/17 03:01:10 dmcmahill Exp $ - ---- src/o_slot.c.orig Sun Jul 8 22:03:46 2001 -+++ src/o_slot.c Mon Jul 16 21:50:03 2001 -@@ -23,4 +23,7 @@ - #include <config.h> - #include <stdio.h> -+#ifdef HAVE_STRINGS_H -+#include <strings.h> -+#endif - - #include <libgeda/libgeda.h> diff --git a/cad/gschem/patches/patch-ad b/cad/gschem/patches/patch-ad deleted file mode 100644 index cc921e2e751..00000000000 --- a/cad/gschem/patches/patch-ad +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2001/07/17 03:01:10 dmcmahill Exp $ - ---- src/o_undo.c.orig Sun Jul 8 22:03:47 2001 -+++ src/o_undo.c Mon Jul 16 21:50:39 2001 -@@ -23,4 +23,7 @@ - #include <config.h> - #include <stdio.h> -+#ifdef HAVE_STRINGS_H -+#include <strings.h> -+#endif - #ifdef HAVE_UNISTD_H - #include <unistd.h> diff --git a/cad/gschem/patches/patch-ae b/cad/gschem/patches/patch-ae deleted file mode 100644 index b4a0249b873..00000000000 --- a/cad/gschem/patches/patch-ae +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2001/07/17 03:01:10 dmcmahill Exp $ - ---- src/x_grid.c.orig Sun Jul 8 22:03:47 2001 -+++ src/x_grid.c Mon Jul 16 21:51:09 2001 -@@ -23,4 +23,7 @@ - #include <config.h> - #include <math.h> -+#ifdef HAVE_STRINGS_H -+#include <strings.h> -+#endif - - #include <libgeda/libgeda.h> diff --git a/cad/gschem/patches/patch-af b/cad/gschem/patches/patch-af deleted file mode 100644 index 8c4cfaa2ff6..00000000000 --- a/cad/gschem/patches/patch-af +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-af,v 1.1 2001/07/17 03:01:10 dmcmahill Exp $ - ---- src/x_color.c.orig Sun Jul 8 22:03:48 2001 -+++ src/x_color.c Mon Jul 16 21:51:46 2001 -@@ -23,4 +23,7 @@ - #include <config.h> - #include <stdio.h> -+#ifdef HAVE_STRINGS_H -+#include <strings.h> -+#endif - #include <signal.h> - #include <math.h> diff --git a/cad/gsymcheck/Makefile b/cad/gsymcheck/Makefile index e432c964761..8208ab1a3de 100644 --- a/cad/gsymcheck/Makefile +++ b/cad/gsymcheck/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2002/03/13 17:36:39 fredb Exp $ +# $NetBSD: Makefile,v 1.8.2.1 2002/06/23 18:40:04 jlam Exp $ # DISTNAME= geda-gsymcheck-${PKGVERSION} PKGNAME= gsymcheck-${PKGVERSION} -PKGREVISION= 1 CATEGORIES= cad MASTER_SITES= ftp://ftp.geda.seul.org/pub/geda/devel/${PKGVERSION}/ \ ftp://ieee.ing.uniroma1.it/pub/geda/devel/${PKGVERSION}/ \ @@ -14,13 +13,13 @@ MAINTAINER= rh@netbsd.org HOMEPAGE= http://www.geda.seul.org/ COMMENT= EDA (Electronic Design Automation) symbol checker -DEPENDS+= libgeda-${PKGVERSION}nb1:../../cad/libgeda +DEPENDS+= libgeda-${PKGVERSION}:../../cad/libgeda DEPENDS+= geda-symbols-${PKGVERSION}:../../cad/geda-symbols CONFLICTS+= gEDA<19991011 DIST_SUBDIR= geda -PKGVERSION= 20010708 +PKGVERSION= 20020414 GNU_CONFIGURE= YES USE_X11BASE= YES diff --git a/cad/gsymcheck/distinfo b/cad/gsymcheck/distinfo index 84b6b23d732..e9da8c6c7b5 100644 --- a/cad/gsymcheck/distinfo +++ b/cad/gsymcheck/distinfo @@ -1,6 +1,4 @@ -$NetBSD: distinfo,v 1.3 2001/07/17 02:59:06 dmcmahill Exp $ +$NetBSD: distinfo,v 1.3.2.1 2002/06/23 18:40:05 jlam Exp $ -SHA1 (geda/geda-gsymcheck-20010708.tar.gz) = e6d9fe274cd77fe6016986b8fdebe56e718a683d -Size (geda/geda-gsymcheck-20010708.tar.gz) = 69377 bytes -SHA1 (patch-aa) = 803754998c604d64f97ba21118b86417f7bec0cb -SHA1 (patch-ab) = 31fc19861993eb007f86690880ef0d4feddff48f +SHA1 (geda/geda-gsymcheck-20020414.tar.gz) = f8a27263a81ff516bb51cc6a5e2c7d888868ab8e +Size (geda/geda-gsymcheck-20020414.tar.gz) = 121660 bytes diff --git a/cad/gsymcheck/patches/patch-aa b/cad/gsymcheck/patches/patch-aa deleted file mode 100644 index f8ec20fd5e1..00000000000 --- a/cad/gsymcheck/patches/patch-aa +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2001/07/17 02:59:06 dmcmahill Exp $ - ---- src/gsymcheck.c.orig Sun Jul 8 12:14:33 2001 -+++ src/gsymcheck.c Mon Jul 16 22:27:26 2001 -@@ -20,4 +20,7 @@ - #include <config.h> - #include <stdio.h> -+#ifdef HAVE_STRINGS_H -+#include <strings.h> -+#endif - #include <signal.h> - #ifdef HAVE_UNISTD_H diff --git a/cad/gsymcheck/patches/patch-ab b/cad/gsymcheck/patches/patch-ab deleted file mode 100644 index 839809984bd..00000000000 --- a/cad/gsymcheck/patches/patch-ab +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2001/07/17 02:59:06 dmcmahill Exp $ - ---- src/s_check.c.orig Tue Jul 4 16:19:36 2000 -+++ src/s_check.c Mon Jul 16 22:28:15 2001 -@@ -20,4 +20,7 @@ - #include <config.h> - #include <stdio.h> -+#ifdef HAVE_STRINGS_H -+#include <strings.h> -+#endif - #include <signal.h> - #ifdef HAVE_UNISTD_H diff --git a/cad/gwave/Makefile b/cad/gwave/Makefile index 13cbfa71d35..0bdcc7063ee 100644 --- a/cad/gwave/Makefile +++ b/cad/gwave/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2002/03/13 17:36:40 fredb Exp $ +# $NetBSD: Makefile,v 1.10.2.1 2002/06/23 18:40:07 jlam Exp $ # -DISTNAME= gwave-20011021 -PKGREVISION= 1 +DISTNAME= gwave-20020122 CATEGORIES= cad MASTER_SITES= http://www.cs.unc.edu/~tell/dist/ diff --git a/cad/gwave/distinfo b/cad/gwave/distinfo index 6a87b1b235a..48ff3202981 100644 --- a/cad/gwave/distinfo +++ b/cad/gwave/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2001/10/23 01:39:16 dmcmahill Exp $ +$NetBSD: distinfo,v 1.3.2.1 2002/06/23 18:40:07 jlam Exp $ -SHA1 (gwave-20011021.tar.gz) = a21e8c0fc75ab81576cce86871b355fb8bc90d73 -Size (gwave-20011021.tar.gz) = 375467 bytes +SHA1 (gwave-20020122.tar.gz) = 5bbfd775c6dd3752e33df1b4cfd85e544d800f69 +Size (gwave-20020122.tar.gz) = 391488 bytes diff --git a/cad/libgeda/Makefile b/cad/libgeda/Makefile index 06ee0f9d153..de39248bfa4 100644 --- a/cad/libgeda/Makefile +++ b/cad/libgeda/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.9 2002/03/13 17:36:40 fredb Exp $ +# $NetBSD: Makefile,v 1.9.2.1 2002/06/23 18:40:09 jlam Exp $ # DISTNAME= libgeda-${PKGVERSION} -PKGREVISION= 1 CATEGORIES= cad MASTER_SITES= ftp://ftp.geda.seul.org/pub/geda/devel/${PKGVERSION}/ \ ftp://ieee.ing.uniroma1.it/pub/geda/devel/${PKGVERSION}/ \ @@ -21,7 +20,7 @@ DEPENDS+= gtk+>=1.2.3:../../x11/gtk CONFLICTS+= gEDA<19991011 DIST_SUBDIR= geda -PKGVERSION= 20010708 +PKGVERSION= 20020414 GNU_CONFIGURE= YES USE_LIBTOOL= YES diff --git a/cad/libgeda/PLIST b/cad/libgeda/PLIST index d0bb3a51578..c94a84dec18 100644 --- a/cad/libgeda/PLIST +++ b/cad/libgeda/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:48:36 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.1.2.1 2002/06/23 18:40:09 jlam Exp $ bin/libgeda-config include/libgeda/colors.h include/libgeda/defines.h @@ -9,9 +9,25 @@ include/libgeda/o_types.h include/libgeda/pcb_struct.h include/libgeda/prototype.h include/libgeda/struct.h +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/libgedadoc.info +info/libgedadoc.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/libgedadoc.info +info/libgedadoc.info-1 +info/libgedadoc.info-10 +info/libgedadoc.info-11 +info/libgedadoc.info-12 +info/libgedadoc.info-13 +info/libgedadoc.info-2 +info/libgedadoc.info-3 +info/libgedadoc.info-4 +info/libgedadoc.info-5 +info/libgedadoc.info-6 +info/libgedadoc.info-7 +info/libgedadoc.info-8 +info/libgedadoc.info-9 lib/libgeda.a lib/libgeda.la lib/libgeda.so -lib/libgeda.so.13 -lib/libgeda.so.13.0 +lib/libgeda.so.15 +lib/libgeda.so.15.0 @dirrm include/libgeda diff --git a/cad/libgeda/distinfo b/cad/libgeda/distinfo index 63eed00a9c0..346a5808fe5 100644 --- a/cad/libgeda/distinfo +++ b/cad/libgeda/distinfo @@ -1,9 +1,4 @@ -$NetBSD: distinfo,v 1.3 2001/07/17 03:06:27 dmcmahill Exp $ +$NetBSD: distinfo,v 1.3.2.1 2002/06/23 18:40:10 jlam Exp $ -SHA1 (geda/libgeda-20010708.tar.gz) = 5065d32555d8cf752f9cd60914e9e96b1785bc93 -Size (geda/libgeda-20010708.tar.gz) = 378209 bytes -SHA1 (patch-aa) = 67ec389e7e4d71e9b8f6054cbe0ea236c01544e6 -SHA1 (patch-ab) = 05a8cbf224376dab4359957acac678dc83de4dfb -SHA1 (patch-ac) = b23cd3e8400e0e58f3e54aac8031beb325ba5009 -SHA1 (patch-ad) = 31845d02fd867b0580feb8e410ca974d3786c737 -SHA1 (patch-ae) = 9453d3fd6825e2d85b87f836eaa923836f3fd980 +SHA1 (geda/libgeda-20020414.tar.gz) = b545f581fd04283238416efda29b3a9301a8abc4 +Size (geda/libgeda-20020414.tar.gz) = 838513 bytes diff --git a/cad/libgeda/patches/patch-aa b/cad/libgeda/patches/patch-aa deleted file mode 100644 index e88030d974d..00000000000 --- a/cad/libgeda/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2001/07/17 03:06:27 dmcmahill Exp $ - ---- src/s_attrib.c.orig Sun Jul 8 22:03:09 2001 -+++ src/s_attrib.c Mon Jul 16 14:52:57 2001 -@@ -27,4 +27,8 @@ - #include <sys/types.h> - -+#ifdef HAVE_STRINGS_H -+#include <strings.h> -+#endif -+ - #include <gtk/gtk.h> - #include <gdk/gdk.h> diff --git a/cad/libgeda/patches/patch-ab b/cad/libgeda/patches/patch-ab deleted file mode 100644 index 195d6ea4837..00000000000 --- a/cad/libgeda/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2001/07/17 03:06:27 dmcmahill Exp $ - ---- src/s_basic.c.orig Sun Jul 8 22:03:09 2001 -+++ src/s_basic.c Mon Jul 16 14:53:41 2001 -@@ -31,4 +31,8 @@ - #endif - -+#ifdef HAVE_STRINGS_H -+#include <strings.h> -+#endif -+ - #include <gtk/gtk.h> - #include <gdk/gdk.h> diff --git a/cad/libgeda/patches/patch-ac b/cad/libgeda/patches/patch-ac deleted file mode 100644 index df47d30f209..00000000000 --- a/cad/libgeda/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2001/07/17 03:06:27 dmcmahill Exp $ - ---- src/s_papersizes.c.orig Sun Jul 8 22:03:10 2001 -+++ src/s_papersizes.c Mon Jul 16 14:54:18 2001 -@@ -27,4 +27,8 @@ - #include <sys/types.h> - -+#ifdef HAVE_STRINGS_H -+#include <strings.h> -+#endif -+ - #include <gtk/gtk.h> - #include <gdk/gdk.h> diff --git a/cad/libgeda/patches/patch-ad b/cad/libgeda/patches/patch-ad deleted file mode 100644 index f00e82dc1ee..00000000000 --- a/cad/libgeda/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2001/07/17 03:06:27 dmcmahill Exp $ - ---- src/s_log.c.orig Sun Jul 8 22:03:10 2001 -+++ src/s_log.c Mon Jul 16 14:55:15 2001 -@@ -31,4 +31,8 @@ - #include <errno.h> - -+#ifdef HAVE_STRINGS_H -+#include <strings.h> -+#endif -+ - #include <gtk/gtk.h> - #include <gdk/gdk.h> diff --git a/cad/libgeda/patches/patch-ae b/cad/libgeda/patches/patch-ae deleted file mode 100644 index 51b309465ae..00000000000 --- a/cad/libgeda/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2001/07/17 03:06:27 dmcmahill Exp $ - ---- src/s_color.c.orig Sun Jul 8 22:03:10 2001 -+++ src/s_color.c Mon Jul 16 14:55:50 2001 -@@ -26,4 +26,8 @@ - #include <math.h> - -+#ifdef HAVE_STRINGS_H -+#include <strings.h> -+#endif -+ - #include <gtk/gtk.h> - #include <gdk/gdk.h> diff --git a/cad/magic/MESSAGE b/cad/magic/MESSAGE index fb41f6693ab..8fe9cdd0595 100644 --- a/cad/magic/MESSAGE +++ b/cad/magic/MESSAGE @@ -1,7 +1,7 @@ ====================================================================== -$NetBSD: MESSAGE,v 1.1.1.1 2002/04/06 21:37:29 dmcmahill Exp $ +$NetBSD: MESSAGE,v 1.1.1.1.2.1 2002/06/23 18:40:13 jlam Exp $ -You must set the environment variable CAD_HOME to ${PREFIX} to +You must set the environment variable MAGIC_HOME to ${PREFIX} to use the tools in this package. ====================================================================== diff --git a/cad/magic/Makefile b/cad/magic/Makefile index 01e1fd6ffa5..84d04ef93f2 100644 --- a/cad/magic/Makefile +++ b/cad/magic/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/04/06 21:37:28 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.1.1.1.2.1 2002/06/23 18:40:13 jlam Exp $ # DISTNAME= magic-7.1 +PKGREVISION= 1 CATEGORIES= cad MASTER_SITES= http://vlsi.cornell.edu/magic/ @@ -10,7 +11,15 @@ HOMEPAGE= http://vlsi.cornell.edu/magic/ COMMENT= Integrated circuit layout system USE_GMAKE= yes -MAKE_ENV+= CAD_HOME=${PREFIX} +MAKE_ENV+= MAGIC_HOME=${PREFIX} + +post-patch: + cd ${WRKSRC} && for f in `${FIND} . -type f -exec ${GREP} -l CAD_HOME {} /dev/null \;` ; do \ + ${ECHO} "Replacing CAD_HOME in $$f" ; \ + ${MV} -f $$f $$f.bak ; ${SED} 's;CAD_HOME;MAGIC_HOME;g' $$f.bak > $$f ; \ + ${RM} $$f.bak ; \ + done + ${CHMOD} 755 ${WRKSRC}/scripts/config do-configure: cd ${WRKSRC} && printf "1\n2\n6\n\n\n\n\n\n\n\n\n\n\n" | \ diff --git a/cad/pcb/DEINSTALL b/cad/pcb/DEINSTALL new file mode 100644 index 00000000000..8153b60b4b2 --- /dev/null +++ b/cad/pcb/DEINSTALL @@ -0,0 +1,18 @@ +#! /bin/sh +# +# $NetBSD: DEINSTALL,v 1.1.2.2 2002/06/23 18:40:15 jlam Exp $ +# + +case "$2" in + DEINSTALL) cat <<EOF + +============================================================= +Note that the local library configuration file +(@pkg_sysconfdir@/pcb/local.inc) is not removed by the +deinstallation process. You should remove this by hand, if +you no longer need it. +============================================================= + +EOF + ;; +esac diff --git a/cad/pcb/MESSAGE b/cad/pcb/MESSAGE new file mode 100644 index 00000000000..55b3d472972 --- /dev/null +++ b/cad/pcb/MESSAGE @@ -0,0 +1,12 @@ +====================================================================== +$NetBSD: MESSAGE,v 1.1.2.2 2002/06/23 18:40:16 jlam Exp $ + +${PCB_CONFDIR}, $HOME/.pcb and the current working directory are +all included in the search path for m4 files. In addition, the +files "site-config.inc" (which would normally live in ${PCB_CONFDIR}), +"user-config.inc" (which would normally live $HOME/.pcb) and +"proj-config.inc" (in the working directory) are included if they +exist. This provides a mechanism for per-site, per-user, +and per-project libraries + +====================================================================== diff --git a/cad/pcb/Makefile b/cad/pcb/Makefile index eccb4e9fe32..f29a71544b7 100644 --- a/cad/pcb/Makefile +++ b/cad/pcb/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.10 2002/02/18 15:14:03 seb Exp $ +# $NetBSD: Makefile,v 1.10.2.1 2002/06/23 18:40:16 jlam Exp $ # FreeBSD Id: Makefile,v 1.19 1998/10/31 18:05:31 jseger Exp # DISTNAME= pcb-1.6.3 +PKGREVISION= 2 CATEGORIES= cad MASTER_SITES= ftp://ftp.linuxppc.org/pub/linuxppc/users/harry/PCB/ \ ftp://ftp.uni-ulm.de/pub/pcb/mirror/ @@ -10,7 +11,7 @@ EXTRACT_SUFX= .tgz DISTFILES= pcb-1.6.3.tgz \ pcb-docs-1.6.3.tar.gz -MAINTAINER= packages@netbsd.org +MAINTAINER= dmcmahill@netbsd.org HOMEPAGE= http://bach.ece.jhu.edu/~haceaton/pcb/ COMMENT= X11 interactive printed circuit board layout system @@ -20,6 +21,20 @@ USE_IMAKE= yes INFO_FILES= pcb.info +DEINSTALL_FILE= ${WRKDIR}/DEINSTALL + +PCB_CONFDIR= ${PKG_SYSCONFDIR}/pcb +MESSAGE_SUBST+= PCB_CONFDIR=${PCB_CONFDIR} +# avoid picking up any user config files during the build +MAKE_ENV+= HOME=${WRKSRC} + +post-patch: + ${MV} -f ${WRKSRC}/config.h ${WRKSRC}/config.h.bak + ${SED} 's;@pkg_sysconfdir@;${PCB_CONFDIR};g' ${WRKSRC}/config.h.bak > ${WRKSRC}/config.h + +pre-install: + ${SED} 's;@pkg_sysconfdir@;${PKG_SYSCONFDIR};g' ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} + post-install: ${INSTALL_MAN_DIR} ${PREFIX}/share/doc/pcb/ ${INSTALL_MAN} ${WRKSRC}/doc/index.html ${PREFIX}/share/doc/pcb/ @@ -27,6 +42,20 @@ post-install: ${INSTALL_MAN} ${WRKSRC}/doc/pcb.info ${PREFIX}/info/ ${INSTALL_MAN} ${WRKSRC}/doc/pcb.ps ${PREFIX}/share/doc/pcb/ ${INSTALL_MAN} ${WRKSRC}/doc/refcard.ps ${PREFIX}/share/doc/pcb/ + ${INSTALL_DATA_DIR} ${PCB_CONFDIR} + if [ ! -f "${PCB_CONFDIR}/local.inc" ]; then \ + ${ECHO} "# list your local includes here" > ${PCB_CONFDIR}/local.inc ; \ + fi + ${MV} -f ${X11BASE}/lib/X11/pcb/m4/common.m4 ${X11BASE}/lib/X11/pcb/m4/common.m4.bak + ${AWK} '/^divert\(0\)dnl/ { \ + printf("include(${PCB_CONFDIR}/local.inc)\n"); \ + printf("sinclude(site-config.inc)\n"); \ + printf("sinclude(user-config.inc)\n"); \ + printf("sinclude(proj-config.inc)\n"); \ + } \ + {gsub(/^include\(/,"include(${X11BASE}/lib/X11/pcb/m4/"); print } ' \ + ${X11BASE}/lib/X11/pcb/m4/common.m4.bak > ${X11BASE}/lib/X11/pcb/m4/common.m4 + ${RM} -f ${X11BASE}/lib/X11/pcb/m4/common.m4.bak .include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/cad/pcb/distinfo b/cad/pcb/distinfo index a1e8ef46e40..73429989018 100644 --- a/cad/pcb/distinfo +++ b/cad/pcb/distinfo @@ -1,9 +1,24 @@ -$NetBSD: distinfo,v 1.2 2001/04/19 16:27:01 agc Exp $ +$NetBSD: distinfo,v 1.2.2.1 2002/06/23 18:40:17 jlam Exp $ SHA1 (pcb-1.6.3.tgz) = 79cca1a0ed9567cefd2e98556e1895c86e453010 Size (pcb-1.6.3.tgz) = 577803 bytes SHA1 (pcb-docs-1.6.3.tar.gz) = d645df42d7a9758f2112f02f47530eb2c05128a7 Size (pcb-docs-1.6.3.tar.gz) = 252728 bytes SHA1 (patch-aa) = 348159ad2c6d0eef4c61bbbd0ff2b30eec3f5728 -SHA1 (patch-ab) = 8b2a39f3301766cdc1108ebe1d3f280d7ec93cfb +SHA1 (patch-ab) = c035596d9981968e1faf80390a778b31ca807154 SHA1 (patch-ac) = 39f423dddd3bce9bd6c625cde9aa5ccb1831ac9d +SHA1 (patch-ad) = 9edcce665f1a930f857b8ffd65a25c4dad5fa289 +SHA1 (patch-ae) = 3b0b42796c2e8fd5d6d221293593e1e4f80ff660 +SHA1 (patch-af) = 5bee94569170e82a6b29ff04d4cf173dc2da9b49 +SHA1 (patch-ag) = b56547dedeb1672f9e3747b956c0d24fecb200ef +SHA1 (patch-ah) = c17dd08069b600591e848a568a11c3b300e7d5a5 +SHA1 (patch-ai) = 42200d92387e9132ad1e60dfed5223d306fe201f +SHA1 (patch-aj) = 5aea947a9e94f7af568feb7086d8071bda8e1523 +SHA1 (patch-ak) = 9e4005721329f6cf7321e593bd07e577643fe31d +SHA1 (patch-al) = d873599ad739ce54fc2dc98b2a37ec36b4cc75e5 +SHA1 (patch-am) = 3173f8bc6ef90629d64de5c86c45fd2f57d90f5f +SHA1 (patch-an) = 9f3ccc70c33b32ca069e4c9a874ef553c96c6e7d +SHA1 (patch-ao) = 23277a25c79fa45ff704049274c73c6837fd6595 +SHA1 (patch-ap) = 1e68a6b6e4cccfa29c8944fad05218fab7cf46ff +SHA1 (patch-aq) = 1964ce89b506a5b70510dd8e8e795eb94bfe055a +SHA1 (patch-ar) = 055a31f976afb9caf05b972ec5b2c9b4e9930218 diff --git a/cad/pcb/patches/patch-ab b/cad/pcb/patches/patch-ab index 6172a128715..61d9af8ae06 100644 --- a/cad/pcb/patches/patch-ab +++ b/cad/pcb/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.1.1.1 1998/11/07 14:30:34 frueauf Exp $ +$NetBSD: patch-ab,v 1.1.1.1.2.1 2002/06/23 18:40:18 jlam Exp $ --- config.h.orig Wed Jan 28 17:28:11 1998 +++ config.h Wed Jan 28 17:29:04 1998 @@ -16,7 +16,7 @@ $NetBSD: patch-ab,v 1.1.1.1 1998/11/07 14:30:34 frueauf Exp $ * the name of GNU m4 (you MUST use GNU m4) */ -GNUM4 = m4 -+GNUM4 = gm4 ++GNUM4 = "gm4 -I@pkg_sysconfdir@ -I\$$HOME/.pcb -I." /* ---------------------------------------------------------------------- * BTNMOD determies the modifier key to be used for the diff --git a/cad/pcb/patches/patch-ad b/cad/pcb/patches/patch-ad new file mode 100644 index 00000000000..b80e033ed6c --- /dev/null +++ b/cad/pcb/patches/patch-ad @@ -0,0 +1,17 @@ +$NetBSD: patch-ad,v 1.1.2.2 2002/06/23 18:40:18 jlam Exp $ + +--- src/main.c.orig Wed May 13 06:29:47 1998 ++++ src/main.c +@@ -787,9 +787,9 @@ + Output.fgGC = XCreateGC(Dpy, Output.OutputWindow, 0, NULL); + Output.bgGC = XCreateGC(Dpy, Output.OutputWindow, 0, NULL); + Output.GridGC = XCreateGC(Dpy, Output.OutputWindow, 0, NULL); +- if (!VALID_GC((int) Output.fgGC) || +- !VALID_GC((int) Output.bgGC) || +- !VALID_GC((int) Output.GridGC)) ++ if (!VALID_GC( (long int) Output.fgGC) || ++ !VALID_GC( (long int) Output.bgGC) || ++ !VALID_GC( (long int) Output.GridGC)) + MyFatal("can't create default GC\n"); + + XSetForeground(Dpy, Output.bgGC, Settings.bgColor); diff --git a/cad/pcb/patches/patch-ae b/cad/pcb/patches/patch-ae new file mode 100644 index 00000000000..83892f23e51 --- /dev/null +++ b/cad/pcb/patches/patch-ae @@ -0,0 +1,49 @@ +$NetBSD: patch-ae,v 1.1.2.2 2002/06/23 18:40:19 jlam Exp $ + +--- src/move.c.orig Wed May 13 06:29:49 1998 ++++ src/move.c +@@ -359,7 +359,7 @@ + DrawArc(Layer, Arc, 0); + Draw(); + } +- if (((int) Dest == -1) || Dest == Layer) ++ if (((long int) Dest == -1) || Dest == Layer) + return(Arc); + AddObjectToMoveToLayerUndoList(ARC_TYPE, Layer, Arc, Arc); + if (Layer->On) +@@ -391,7 +391,7 @@ + DrawLine(Layer, Line, 0); + Draw(); + } +- if (((int) Dest == -1) || Dest == Layer) ++ if (((long int) Dest == -1) || Dest == Layer) + return(Line); + + AddObjectToMoveToLayerUndoList(LINE_TYPE, Layer, Line, Line); +@@ -473,7 +473,7 @@ + TextTypePtr new; + + /* Dest == -1 means move to silkscreen layer */ +- if (((int) Dest == -1) || (Dest == Layer)) ++ if (((long int) Dest == -1) || (Dest == Layer)) + AddObjectToFlagUndoList(TEXT_TYPE, Layer, Text, Text); + else + AddObjectToMoveToLayerUndoList(TEXT_TYPE, Layer, Text, Text); +@@ -481,7 +481,7 @@ + (TEST_FLAG(ONSILKFLAG, Text) && (PCB->InvisibleObjectsOn || + (TEST_FLAG(ONSOLDERFLAG, Text) !=0) == SWAP_IDENT))) + EraseText(Text); +- if ((int) Dest == -1) ++ if ((long int) Dest == -1) + { + SET_FLAG(ONSILKFLAG, Text); + if (PCB->ElementOn || (TEST_FLAG(ONSOLDERFLAG, Text) !=0) == SWAP_IDENT) +@@ -536,7 +536,7 @@ + PolygonTypePtr new; + int LayerThermFlag, DestThermFlag; + +- if (((int) Dest == -1) || (Layer == Dest)) ++ if (((long int) Dest == -1) || (Layer == Dest)) + return(Polygon); + AddObjectToMoveToLayerUndoList(POLYGON_TYPE, Layer, Polygon, Polygon); + if (Layer->On) diff --git a/cad/pcb/patches/patch-af b/cad/pcb/patches/patch-af new file mode 100644 index 00000000000..91cbaaaf74e --- /dev/null +++ b/cad/pcb/patches/patch-af @@ -0,0 +1,40 @@ +$NetBSD: patch-af,v 1.1.2.2 2002/06/23 18:40:20 jlam Exp $ + +--- src/control.c.orig Wed May 13 06:29:41 1998 ++++ src/control.c +@@ -153,7 +153,7 @@ + static void AddDrawingLayerSelection(Widget Parent) + { + static char name[MAX_LAYER][20]; +- int i; ++ long int i; + Widget label; + Pixel background; + +@@ -191,7 +191,7 @@ + { + static char name[MAX_LAYER+4][20]; + Widget last; +- int i; ++ long int i; + char *text; + Pixel color; + +@@ -392,7 +392,7 @@ + static void CB_SetDrawingLayer(Widget W, + XtPointer ClientData, XtPointer CallData) + { +- ChangeGroupVisibility((int) ClientData, True, True); ++ ChangeGroupVisibility((long int) ClientData, True, True); + XtVaSetValues(DrawingLayerMenuButton.W, + XtNlabel, UNKNOWN(CURRENT->Name), + XtNbackground, CURRENT->Color, +@@ -406,7 +406,7 @@ + static void CB_SetOnOff(Widget W, XtPointer ClientData, XtPointer CallData) + { + Boolean state; +- int layer = (int) ClientData; ++ long int layer = (long int) ClientData; + + /* get new state of widget */ + XtVaGetValues(W, XtNstate, &state, NULL); diff --git a/cad/pcb/patches/patch-ag b/cad/pcb/patches/patch-ag new file mode 100644 index 00000000000..bc0f65ecda5 --- /dev/null +++ b/cad/pcb/patches/patch-ag @@ -0,0 +1,13 @@ +$NetBSD: patch-ag,v 1.1.2.2 2002/06/23 18:40:20 jlam Exp $ + +--- src/crosshair.c.orig Wed May 13 06:29:42 1998 ++++ src/crosshair.c +@@ -820,7 +820,7 @@ + memset(&Crosshair, 0, sizeof(CrosshairType)); + + Crosshair.GC = XCreateGC(Dpy, Output.OutputWindow, 0, NULL); +- if (!VALID_GC((int) Crosshair.GC)) ++ if (!VALID_GC((long int) Crosshair.GC)) + MyFatal("can't create default crosshair GC\n"); + XSetState(Dpy, Crosshair.GC, Settings.CrosshairColor, Settings.bgColor, + GXxor, AllPlanes); diff --git a/cad/pcb/patches/patch-ah b/cad/pcb/patches/patch-ah new file mode 100644 index 00000000000..4a6a92bb3e8 --- /dev/null +++ b/cad/pcb/patches/patch-ah @@ -0,0 +1,13 @@ +$NetBSD: patch-ah,v 1.1.2.2 2002/06/23 18:40:21 jlam Exp $ + +--- src/misc.c.orig Wed May 13 06:29:49 1998 ++++ src/misc.c +@@ -1066,7 +1066,7 @@ + { + static char path[MAXPATHLEN+1]; + +-#if defined(SYSV) || defined(linux) ++#if defined(SYSV) || defined(linux) || defined(__NetBSD__) + return(getcwd(path, MAXPATHLEN)); + #else + /* seems that some BSD releases lack of a prototype for getwd() */ diff --git a/cad/pcb/patches/patch-ai b/cad/pcb/patches/patch-ai new file mode 100644 index 00000000000..d438b91389d --- /dev/null +++ b/cad/pcb/patches/patch-ai @@ -0,0 +1,31 @@ +$NetBSD: patch-ai,v 1.1.2.2 2002/06/23 18:40:22 jlam Exp $ + +--- src/dialog.c.orig Wed May 13 06:29:43 1998 ++++ src/dialog.c +@@ -55,7 +55,7 @@ + /* --------------------------------------------------------------------------- + * some local identifiers + */ +-static int ReturnCode; /* used by standard dialogs */ ++static long int ReturnCode; /* used by standard dialogs */ + + /* --------------------------------------------------------------------------- + * some local prototypes +@@ -71,7 +71,7 @@ + */ + static void CB_OK(Widget W, XtPointer ClientData, XtPointer CallData) + { +- ReturnCode = (int) ClientData; ++ ReturnCode = (long int) ClientData; + } + + /* --------------------------------------------------------------------------- +@@ -124,7 +124,7 @@ + * waits until returncode is differnt from -1 + * see also CB_OK() + */ +-int DialogEventLoop(int *Code) ++int DialogEventLoop(long int *Code) + { + XEvent event; + diff --git a/cad/pcb/patches/patch-aj b/cad/pcb/patches/patch-aj new file mode 100644 index 00000000000..58e2409abdf --- /dev/null +++ b/cad/pcb/patches/patch-aj @@ -0,0 +1,13 @@ +$NetBSD: patch-aj,v 1.1.2.2 2002/06/23 18:40:22 jlam Exp $ + +--- src/dialog.h.orig Wed May 13 06:29:43 1998 ++++ src/dialog.h +@@ -53,7 +53,7 @@ + } DialogButtonType, *DialogButtonTypePtr; + + +-int DialogEventLoop(int *); ++int DialogEventLoop(long int *); + Widget AddButtons(Widget, Widget, DialogButtonTypePtr, size_t); + Widget CreateDialogBox(char *, DialogButtonTypePtr, size_t, char *); + void StartDialog(Widget); diff --git a/cad/pcb/patches/patch-ak b/cad/pcb/patches/patch-ak new file mode 100644 index 00000000000..30e8762f7db --- /dev/null +++ b/cad/pcb/patches/patch-ak @@ -0,0 +1,22 @@ +$NetBSD: patch-ak,v 1.1.2.2 2002/06/23 18:40:23 jlam Exp $ + +--- src/fileselect.c.orig Wed May 13 06:29:45 1998 ++++ src/fileselect.c +@@ -79,7 +79,7 @@ + */ + static Widget InputW, /* input field */ + CurrentW; /* label (current directory) */ +-static int ReturnCode; /* returncode of buttons */ ++static long int ReturnCode; /* returncode of buttons */ + static String CurrentDir; /* current directory */ + static Boolean LockCallback; /* used by CB_Text() */ + static SelectorType DirectorySelector = +@@ -138,7 +138,7 @@ + */ + static void CB_CancelOrOK(Widget W, XtPointer ClientData, XtPointer CallData) + { +- ReturnCode = (int) ClientData; ++ ReturnCode = (long int) ClientData; + } + + /* --------------------------------------------------------------------------- diff --git a/cad/pcb/patches/patch-al b/cad/pcb/patches/patch-al new file mode 100644 index 00000000000..b2a574a4334 --- /dev/null +++ b/cad/pcb/patches/patch-al @@ -0,0 +1,40 @@ +$NetBSD: patch-al,v 1.1.2.2 2002/06/23 18:40:24 jlam Exp $ + +--- src/lgdialog.c.orig Wed May 13 06:29:46 1998 ++++ src/lgdialog.c +@@ -57,7 +57,7 @@ + /* --------------------------------------------------------------------------- + * some local identifiers + */ +-static int ReturnCode; /* return code of buttons */ ++static long int ReturnCode; /* return code of buttons */ + static LayerGroupType LayerGroups; /* working copy of current lg */ + + /* --------------------------------------------------------------------------- +@@ -65,7 +65,7 @@ + */ + static void CB_CancelOrOK(Widget W, XtPointer ClientData, XtPointer CallData) + { +- ReturnCode = (int) ClientData; ++ ReturnCode = (long int) ClientData; + } + + /* --------------------------------------------------------------------------- +@@ -78,7 +78,7 @@ + last, + layernameW, + radioGroup[MAX_LAYER+2]; +- int i, ++ long int i, + group, + layer; + XtTranslations translationtable; +@@ -223,7 +223,7 @@ + LayerGroups.Number[group] = 0; + for (i = 0; i < MAX_LAYER+2; i++) + { +- if ((group = (int) XawToggleGetCurrent(radioGroup[i])) != 0) ++ if ((group = (long int) XawToggleGetCurrent(radioGroup[i])) != 0) + { + group--; + LayerGroups.Entries[group][LayerGroups.Number[group]++] = i; diff --git a/cad/pcb/patches/patch-am b/cad/pcb/patches/patch-am new file mode 100644 index 00000000000..551f30546bd --- /dev/null +++ b/cad/pcb/patches/patch-am @@ -0,0 +1,31 @@ +$NetBSD: patch-am,v 1.1.2.2 2002/06/23 18:40:24 jlam Exp $ + +--- src/printdialog.c.orig Wed May 13 06:29:56 1998 ++++ src/printdialog.c +@@ -80,7 +80,7 @@ + FilenameLabelW, /* a label */ + FilenameW; /* input line */ + static float Scale = 1.0; /* initial scaling factor */ +-static int ReturnCode; /* returncode of buttons */ ++static long int ReturnCode; /* returncode of buttons */ + static Boolean RotateFlag = False, /* initial rotation flag */ + OutlineFlag = False,/* don't draw board outline.. */ + AlignmentFlag = False, +@@ -218,7 +218,7 @@ + */ + static void CB_CancelOrOK(Widget W, XtPointer ClientData, XtPointer CallData) + { +- ReturnCode = (int) ClientData; ++ ReturnCode = (long int) ClientData; + } + + /* --------------------------------------------------------------------------- +@@ -240,7 +240,7 @@ + static void CB_ScrollProc(Widget W, XtPointer ClientData, XtPointer CallData) + { + float top; +- int delta = (int) CallData; ++ long int delta = (long int) CallData; + + /* get thumb postion */ + XtVaGetValues(W, XtNtopOfThumb, &top, NULL); diff --git a/cad/pcb/patches/patch-an b/cad/pcb/patches/patch-an new file mode 100644 index 00000000000..fb37607d43c --- /dev/null +++ b/cad/pcb/patches/patch-an @@ -0,0 +1,22 @@ +$NetBSD: patch-an,v 1.1.2.2 2002/06/23 18:40:25 jlam Exp $ + +--- src/report.c.orig Wed May 13 06:29:57 1998 ++++ src/report.c +@@ -47,7 +47,7 @@ + #include <X11/Xaw/Toggle.h> + + +-static int ReturnCode; /* filled in by dialog */ ++static long int ReturnCode; /* filled in by dialog */ + + /* + * some local prototypes +@@ -61,7 +61,7 @@ + */ + static void CB_OK(Widget W, XtPointer ClientData, XtPointer CallData) + { +- ReturnCode = (int) ClientData; ++ ReturnCode = (long int) ClientData; + } + + void ReportDrills(void) diff --git a/cad/pcb/patches/patch-ao b/cad/pcb/patches/patch-ao new file mode 100644 index 00000000000..861ba77ea0f --- /dev/null +++ b/cad/pcb/patches/patch-ao @@ -0,0 +1,31 @@ +$NetBSD: patch-ao,v 1.1.2.2 2002/06/23 18:40:25 jlam Exp $ + +--- src/sizedialog.c.orig Wed May 13 06:29:59 1998 ++++ src/sizedialog.c +@@ -87,7 +87,7 @@ + /* --------------------------------------------------------------------------- + * some local identifiers + */ +-static int ReturnCode; /* returncode of buttons */ ++static long int ReturnCode; /* returncode of buttons */ + static SliderType Sliders[] = { + { "linewidth", MIN_LINESIZE, MAX_LINESIZE, CHUNK, 0, NULL, NULL }, + { "via hole", MIN_PINORVIAHOLE, 0, CHUNK, 0, NULL, NULL }, +@@ -180,7 +180,7 @@ + */ + static void CB_CancelOrOK(Widget W, XtPointer ClientData, XtPointer CallData) + { +- ReturnCode = (int) ClientData; ++ ReturnCode = (long int) ClientData; + } + + /* --------------------------------------------------------------------------- +@@ -190,7 +190,7 @@ + */ + static void CB_ScrollProc(Widget W, XtPointer ClientData, XtPointer CallData) + { +- int delta = (int) CallData; ++ long int delta = (long int) CallData; + SliderTypePtr slider = (SliderTypePtr) ClientData; + + UpdateScrollbar(slider, diff --git a/cad/pcb/patches/patch-ap b/cad/pcb/patches/patch-ap new file mode 100644 index 00000000000..06e3f38263d --- /dev/null +++ b/cad/pcb/patches/patch-ap @@ -0,0 +1,11 @@ +$NetBSD: patch-ap,v 1.1.2.2 2002/06/23 18:40:27 jlam Exp $ + +--- lib/QueryLibrary.sh.raw.orig Sat May 16 17:11:06 1998 ++++ lib/QueryLibrary.sh.raw Sat Jun 1 14:57:50 2002 +@@ -30,5 +30,5 @@ + # usage: QueryLibrary.sh template value package + +-M4=GNUM4 ++M4="GNUM4" + + Usage() diff --git a/cad/pcb/patches/patch-aq b/cad/pcb/patches/patch-aq new file mode 100644 index 00000000000..d68a28cea3c --- /dev/null +++ b/cad/pcb/patches/patch-aq @@ -0,0 +1,11 @@ +$NetBSD: patch-aq,v 1.1.2.2 2002/06/23 18:40:27 jlam Exp $ + +--- lib/CreateLibrary.sh.raw.orig Sat May 16 17:11:04 1998 ++++ lib/CreateLibrary.sh.raw Sat Jun 1 14:56:58 2002 +@@ -30,5 +30,5 @@ + # usage: CreateContents.sh library common_macro_file file... + +-M4=GNUM4 ++M4="GNUM4" + + if [ $# -lt 3 ]; then diff --git a/cad/pcb/patches/patch-ar b/cad/pcb/patches/patch-ar new file mode 100644 index 00000000000..d70f12da8de --- /dev/null +++ b/cad/pcb/patches/patch-ar @@ -0,0 +1,11 @@ +$NetBSD: patch-ar,v 1.1.2.2 2002/06/23 18:40:28 jlam Exp $ + +--- lib/CreateLibraryContents.sh.raw.orig Sat May 16 17:11:04 1998 ++++ lib/CreateLibraryContents.sh.raw Sat Jun 1 15:00:46 2002 +@@ -30,5 +30,5 @@ + # usage: CreateLibraryContents.sh common_macro_file file... + +-M4=GNUM4 ++M4="GNUM4" + + # a TAB plus one blank for some stupid old sed implementations diff --git a/chat/Makefile b/chat/Makefile index a22f1520f64..ee89667c84e 100644 --- a/chat/Makefile +++ b/chat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2002/05/03 15:50:31 zuntum Exp $ +# $NetBSD: Makefile,v 1.35.2.1 2002/06/23 18:40:29 jlam Exp $ # COMMENT= communication programs @@ -10,6 +10,7 @@ SUBDIR+= bnc SUBDIR+= centericq SUBDIR+= dircproxy SUBDIR+= ekg +SUBDIR+= emech SUBDIR+= epic4 SUBDIR+= epic4-doc SUBDIR+= everybuddy @@ -18,6 +19,7 @@ SUBDIR+= fugu SUBDIR+= gaim SUBDIR+= gale SUBDIR+= gnomeicu +SUBDIR+= goofey SUBDIR+= gtkyahoo SUBDIR+= icb SUBDIR+= icqlib @@ -31,10 +33,12 @@ SUBDIR+= kxicq SUBDIR+= kyahoo SUBDIR+= libirc SUBDIR+= libyahoo +SUBDIR+= lmme SUBDIR+= micq SUBDIR+= naim SUBDIR+= p5-Net-AIM SUBDIR+= p5-Net-AOLIM +SUBDIR+= p5-Net-Goofey SUBDIR+= p5-Net-ICQ2000 SUBDIR+= silc-client SUBDIR+= silc-server diff --git a/chat/bitchx/Makefile b/chat/bitchx/Makefile index 21439270cd9..e1fdfd10464 100644 --- a/chat/bitchx/Makefile +++ b/chat/bitchx/Makefile @@ -1,10 +1,13 @@ -# $NetBSD: Makefile,v 1.9 2001/09/30 13:52:57 blymn Exp $ +# $NetBSD: Makefile,v 1.9.2.1 2002/06/23 18:40:29 jlam Exp $ DISTNAME= ircii-pana-1.0c18 PKGNAME= bitchx-1.0.3.18 WRKSRC= ${WRKDIR}/BitchX CATEGORIES= chat -MASTER_SITES= ftp://ftp.bitchx.org/pub/BitchX/source/ + +# /old/ is for when pkgsrc is not up to date +MASTER_SITES= ftp://ftp.bitchx.org/pub/BitchX/source/ \ + ftp://ftp.bitchx.org/pub/BitchX/source/old/ MAINTAINER= jmcneill@invisible.yi.org HOMEPAGE= http://www.bitchx.org/ diff --git a/chat/ekg/Makefile b/chat/ekg/Makefile index 5c4ccdd5577..e401b0869a5 100644 --- a/chat/ekg/Makefile +++ b/chat/ekg/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.5 2002/05/05 22:24:15 hubertf Exp $ +# $NetBSD: Makefile,v 1.5.2.1 2002/06/23 18:40:30 jlam Exp $ # -DISTNAME= ekg-20020503 -PKGNAME= ekg-0.20020503 +DISTNAME= ekg-20020610 +PKGNAME= ekg-0.20020610 CATEGORIES= chat MASTER_SITES= http://people.arhea.net/dawszy/NetBSD/ekg/ diff --git a/chat/ekg/PLIST b/chat/ekg/PLIST index 24cf9e9b91c..1dc2291a282 100644 --- a/chat/ekg/PLIST +++ b/chat/ekg/PLIST @@ -1,7 +1,8 @@ -@comment $NetBSD: PLIST,v 1.3 2002/05/05 22:25:36 hubertf Exp $ +@comment $NetBSD: PLIST,v 1.3.2.1 2002/06/23 18:40:31 jlam Exp $ bin/ekg man/man1/ekg.1 share/ekg/themes/2k2.theme +share/ekg/themes/arim.theme share/ekg/themes/emers.theme share/ekg/themes/feeg.theme share/ekg/themes/jamzed.theme @@ -10,4 +11,3 @@ share/ekg/themes/lcamtuf.theme share/ekg/themes/sic.theme share/ekg/themes/zdzichu.theme @dirrm share/ekg/themes -@dirrm share/ekg diff --git a/chat/ekg/distinfo b/chat/ekg/distinfo index 0f80c37ca0a..86e7ccd700d 100644 --- a/chat/ekg/distinfo +++ b/chat/ekg/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.3 2002/05/05 22:24:15 hubertf Exp $ +$NetBSD: distinfo,v 1.3.2.1 2002/06/23 18:40:31 jlam Exp $ -SHA1 (ekg-20020503.tar.gz) = 9b0e390843513179a31bc4274e923fe912dfd5d3 -Size (ekg-20020503.tar.gz) = 198293 bytes -SHA1 (patch-aa) = 9d28c16fc027f4db162a343e4489e5f4e560350d +SHA1 (ekg-20020610.tar.gz) = d04cd3ff41754675732645a6cdc61b5e88937dd9 +Size (ekg-20020610.tar.gz) = 214011 bytes +SHA1 (patch-aa) = 30c3e82c4924c56f919cb3eeb0c7a60a028264d9 diff --git a/chat/ekg/patches/patch-aa b/chat/ekg/patches/patch-aa index 2868d84c044..841dea11140 100644 --- a/chat/ekg/patches/patch-aa +++ b/chat/ekg/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.2 2002/04/03 22:47:01 hubertf Exp $ +$NetBSD: patch-aa,v 1.2.2.1 2002/06/23 18:40:32 jlam Exp $ ---- src/Makefile.in.orig Wed Apr 3 19:10:13 2002 +--- src/Makefile.in.orig Fri May 17 22:44:51 2002 +++ src/Makefile.in -@@ -21,7 +21,7 @@ - all: ekg @do_ioctl@ +@@ -18,7 +18,7 @@ + all: ekg @ioctld@ ekg: $(OBJS) $(LOBJS) -- $(CC) $(CFLAGS) -o $(NAME) $(OBJS) $(LOBJS) $(LIBS) -+ $(CC) $(CFLAGS) -o $(NAME) $(OBJS) $(LOBJS) $(LIBS) -Wl -R${LOCALBASE}/lib +- $(CC) $(CFLAGS) -o ekg $(OBJS) $(LOBJS) $(LIBS) ++ $(CC) $(CFLAGS) -o ekg $(OBJS) $(LOBJS) $(LIBS) -Wl -R${LOCALBASE}/lib - ioctl_daemon: ioctl_daemon.c - $(CC) ioctl_daemon.c -o $(IOCTL_DAEMON_NAME) + ioctld: ioctld.c + $(CC) $(CFLAGS) ioctld.c -o ioctld diff --git a/chat/emech/DESCR b/chat/emech/DESCR new file mode 100644 index 00000000000..0c846b23c09 --- /dev/null +++ b/chat/emech/DESCR @@ -0,0 +1,4 @@ +The EnergyMech is a UNIX compatible IRC bot programmed in the C +language, freely distributable under GNU General Public License +(GPL). On this website you can find the largest EnergyMech resource +and help library on the Internet. diff --git a/chat/emech/MESSAGE b/chat/emech/MESSAGE new file mode 100644 index 00000000000..3674e142d73 --- /dev/null +++ b/chat/emech/MESSAGE @@ -0,0 +1,28 @@ +=========================================================================== +$NetBSD: MESSAGE,v 1.1.1.1.2.2 2002/06/23 18:40:34 jlam Exp $ + +Quickstart quide: + +0) Choose a home for emech, where the user running emech will have write + permission. For instance, /var/run/emech + +1) cp ${PREFIX}/share/example/emech/sample.set ${PREFIX}/etc/mech.set + +2) vi ${PREFIX}/etc/mech.set +-- look through the file for sections to change, you will have to remove + lines in order to get the bot to work. Check the file completely! + +3) genuser /var/run/emech/emech.users +-- It seems that things work better with a DNS address in the hostmask + instead of an IP address.. + +4) cd /var/tun/emech/ +-- the user that will be running emech needs write access to this directory + +5) ${PREFIX}/bin/mech -f ${PREFIX}/etc/mech.set +-- The full path to the binary is mandatory. + +6) See documentation in ${PREFIX}/share/example/emech/mech.help and on + http://www.energymech.net/docs/ + +=========================================================================== diff --git a/chat/emech/Makefile b/chat/emech/Makefile new file mode 100644 index 00000000000..21f418fc59c --- /dev/null +++ b/chat/emech/Makefile @@ -0,0 +1,26 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:40:35 jlam Exp $ +# + +DISTNAME= emech-2.8.4 +CATEGORIES= chat +MASTER_SITES= http://www.energymech.net/files/ + +MAINTAINER= manu@netbsd.org +HOMEPAGE= http://www.energymech.net +COMMENT= IRC bot written in C + +HAS_CONFIGURE= YES + +do-configure: + cd ${WRKSRC} && ${ECHO} "\n\n\n\n\n\n\n\n\n\n"|./configure + +post-install: + ${INSTALL_PROGRAM} ${WRKSRC}/mech ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/genuser ${PREFIX}/bin + ${INSTALL_DATA_DIR} ${PREFIX}/share/example/emech + ${INSTALL_DATA} ${WRKSRC}/sample.set \ + ${PREFIX}/share/example/emech/ + ${INSTALL_DATA} ${WRKSRC}/mech.help \ + ${PREFIX}/share/example/emech/ + +.include "../../mk/bsd.pkg.mk" diff --git a/chat/emech/PLIST b/chat/emech/PLIST new file mode 100644 index 00000000000..c9350ded2e8 --- /dev/null +++ b/chat/emech/PLIST @@ -0,0 +1,6 @@ +@comment $NetBSD: PLIST,v 1.2.2.2 2002/06/23 18:40:35 jlam Exp $ +bin/mech +bin/genuser +share/example/emech/sample.set +share/example/emech/mech.help +@dirrm share/example/emech diff --git a/chat/emech/distinfo b/chat/emech/distinfo new file mode 100644 index 00000000000..e2645864068 --- /dev/null +++ b/chat/emech/distinfo @@ -0,0 +1,4 @@ +$NetBSD: distinfo,v 1.1.1.1.12.2 2002/06/23 18:40:36 jlam Exp $ + +SHA1 (emech-2.8.4.tar.gz) = ebc2c21e69f7b54e8657202ee2f72804607b754b +Size (emech-2.8.4.tar.gz) = 170610 bytes diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile index e5282f9b6e2..6a78dd1ba14 100644 --- a/chat/gaim/Makefile +++ b/chat/gaim/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.16.2.2 2002/06/21 23:05:00 jlam Exp $ +# $NetBSD: Makefile,v 1.16.2.3 2002/06/23 18:40:37 jlam Exp $ # -DISTNAME= gaim-0.55 +DISTNAME= gaim-0.58 CATEGORIES= chat x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gaim/} \ ftp://ftp.marko.net/pub/gaim/ diff --git a/chat/gaim/PLIST b/chat/gaim/PLIST index 7a7b12a1611..1a1ebd6570b 100644 --- a/chat/gaim/PLIST +++ b/chat/gaim/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2002/03/30 23:43:03 reinoud Exp $ +@comment $NetBSD: PLIST,v 1.6.2.1 2002/06/23 18:40:37 jlam Exp $ bin/gaim lib/gaim/autorecon.so lib/gaim/chatlist.so @@ -30,11 +30,14 @@ lib/gaim/libzephyr.so lib/gaim/notify.so lib/gaim/spellchk.so man/man1/gaim.1 +${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/gaim.mo +${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gaim.mo ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gaim.mo ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gaim.mo ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gaim.mo ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gaim.mo ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gaim.mo +${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gaim.mo ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gaim.mo ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gaim.mo ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gaim.mo @@ -42,6 +45,7 @@ ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gaim.mo ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gaim.mo ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gaim.mo ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gaim.mo +${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gaim.mo share/gnome/apps/Internet/gaim.desktop share/pixmaps/gaim.xpm @unexec ${RMDIR} -p %D/share/gnome/apps/Internet 2>/dev/null || ${TRUE} diff --git a/chat/gaim/distinfo b/chat/gaim/distinfo index 2ecf7ce741f..cfc12e98cff 100644 --- a/chat/gaim/distinfo +++ b/chat/gaim/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.9 2002/03/30 23:43:03 reinoud Exp $ +$NetBSD: distinfo,v 1.9.2.1 2002/06/23 18:40:38 jlam Exp $ -SHA1 (gaim-0.55.tar.gz) = 26340af747ba2ba640b7e30bd489d5a7f7f7a88f -Size (gaim-0.55.tar.gz) = 1727565 bytes -SHA1 (patch-aa) = 5154ff49e80b85f34dfe3d40368d5d99dc0d0a81 +SHA1 (gaim-0.58.tar.gz) = 5fd319a8de5f13efd646d7fe2d66ec6e9fb09eec +Size (gaim-0.58.tar.gz) = 1928057 bytes +SHA1 (patch-aa) = d4ad7522469c6f73c5497635f32acbabae9b89b9 diff --git a/chat/gaim/patches/patch-aa b/chat/gaim/patches/patch-aa index 9de13845a8e..59ff2083f73 100644 --- a/chat/gaim/patches/patch-aa +++ b/chat/gaim/patches/patch-aa @@ -1,10 +1,10 @@ -$NetBSD: patch-aa,v 1.4 2002/02/17 22:31:21 jlam Exp $ +$NetBSD: patch-aa,v 1.4.2.1 2002/06/23 18:40:39 jlam Exp $ ---- configure.orig Sun Feb 17 15:03:26 2002 +--- configure.orig Tue May 14 04:40:41 2002 +++ configure -@@ -9644,8 +9644,6 @@ - +@@ -10792,8 +10792,6 @@ fi + rm -f conftest.$ac_objext conftest.$ac_ext -CFLAGS="$CFLAGS -I/usr/local/include -I/opt/include -I\$(top_srcdir)" - diff --git a/chat/goofey/DESCR b/chat/goofey/DESCR new file mode 100644 index 00000000000..cbe32761c8e --- /dev/null +++ b/chat/goofey/DESCR @@ -0,0 +1,14 @@ +Goofey is a program which provides many services by communicating +with a central server Pluto. Services provided by goofey include +remote user location, message sending, fortune provision, jargon +file lookup and a timetable service. + +Goofey is the preferred mode of communciation of many people, as +it combines the immediacy of talk(1) and the asyncronous nature of +mail(1). That is, you will know if messages sent with goofey have +been received by the recipient almost immediately. Goofey also +provides facilies for users to supply finger type information, an +'away' message for when you are away, a 'quiet' message for when +you are busy or away from the terminal, in fact just about everything +that people have been put up a good case for being included in the +server. diff --git a/chat/goofey/Makefile b/chat/goofey/Makefile new file mode 100644 index 00000000000..e6a3cbe4e21 --- /dev/null +++ b/chat/goofey/Makefile @@ -0,0 +1,23 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:40:40 jlam Exp $ +# + +DISTNAME= goofey-3.15 +CATEGORIES= chat +MASTER_SITES= http://redback.spyda.net/~grant/ +EXTRACT_SUFX= .tar.bz2 + +MAINTAINER= grant@netbsd.org +HOMEPAGE= http://www.csse.monash.edu.au/~tym/goofey.html +COMMENT= text-based client for goofey, a flexible short message system + +NO_CONFIGURE= # defined + +do-build: + cd ${WRKSRC}; ${CC} ${CFLAGS} ${LDFLAGS} -o goofey goofey.c + +do-install: + ${INSTALL} ${WRKSRC}/goofey ${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/goofey.1 ${PREFIX}/man/man1 + +.include "../../mk/bsd.pkg.mk" + diff --git a/chat/goofey/PLIST b/chat/goofey/PLIST new file mode 100644 index 00000000000..ff9aad3ab75 --- /dev/null +++ b/chat/goofey/PLIST @@ -0,0 +1,3 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.50.2 2002/06/23 18:40:41 jlam Exp $ +bin/goofey +man/man1/goofey.1 diff --git a/chat/goofey/distinfo b/chat/goofey/distinfo new file mode 100644 index 00000000000..58741890d5b --- /dev/null +++ b/chat/goofey/distinfo @@ -0,0 +1,4 @@ +$NetBSD: distinfo,v 1.1.1.1.12.2 2002/06/23 18:40:42 jlam Exp $ + +SHA1 (goofey-3.15.tar.bz2) = 2b3c4f587363ef4f287ea87b3c52d3bb490d35b3 +Size (goofey-3.15.tar.bz2) = 19839 bytes diff --git a/chat/icb/Makefile b/chat/icb/Makefile index 2404bc5c97a..fef7f936905 100644 --- a/chat/icb/Makefile +++ b/chat/icb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/06/26 16:36:50 jlam Exp $ +# $NetBSD: Makefile,v 1.4.2.1 2002/06/23 18:40:43 jlam Exp $ # # Note: The file ftp://ftp.icb.net/pub/icb/icb-0.9grok2.tar.gz is way @@ -15,9 +15,16 @@ COMMENT= Internet CB - a mostly-defunct chat client NO_SRC_ON_FTP= "already in MASTER_SITE_LOCAL" USE_BUILDLINK_ONLY= # defined +.include "../../mk/bsd.prefs.mk" + do-configure: @cd ${WRKSRC}; \ ${SED} -e s,@PREFIX@,${PREFIX},g ${FILESDIR}/config >${WRKSRC}/config +. if (${OPSYS} == "Darwin") + @${SED} -e s,-ltermcap,,g ${WRKSRC}/config >${WRKSRC}/config.new; \ + ${MV} -f ${WRKSRC}/config.new ${WRKSRC}/config +. endif + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/icb/icb ${PREFIX}/bin diff --git a/chat/icb/distinfo b/chat/icb/distinfo index 8522d698c52..0bb8f8f14d7 100644 --- a/chat/icb/distinfo +++ b/chat/icb/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2001/04/18 11:07:17 agc Exp $ +$NetBSD: distinfo,v 1.2.2.1 2002/06/23 18:40:44 jlam Exp $ SHA1 (icb-5.0.9.tar.gz) = 151430ad7fe3e9787627b31f6551bf1f398b1bd8 Size (icb-5.0.9.tar.gz) = 357565 bytes @@ -6,7 +6,7 @@ SHA1 (patch-aa) = 1790a2c85ec28fc6b741d56299dc287c29f6bf90 SHA1 (patch-ab) = 6a5970e1443834e9370c29ace56811f0ba35fa4e SHA1 (patch-ac) = 87bc593c9678ca32d1d87d89ccd4c361bb1a8b53 SHA1 (patch-ad) = 8724940ed0a768298948b183c5573f11b0b5be1f -SHA1 (patch-ae) = 533f5cad7a3004eb721eff193aa9eb89b2265ca0 +SHA1 (patch-ae) = 817514ee1ba9dd82a9790a403ed7028aa505e7d3 SHA1 (patch-af) = e168e171a08246264ebc616f160117f42caf0294 SHA1 (patch-ag) = 9e438a0a3911d08437feb6e4a08a7a8dd93bc461 SHA1 (patch-ah) = c116aecd6f7337c7df89807a62857252847c4917 @@ -16,7 +16,7 @@ SHA1 (patch-ak) = 0bd3aa7b872ae1248586f8f2726b0c6a4bb0b462 SHA1 (patch-al) = d61dcc6fda72137645a23ebeb2aef2e3bfa9a184 SHA1 (patch-am) = 1804aec297fa86f2a47cc7cf095783fedafbd9e5 SHA1 (patch-an) = bdf9ca0b1d791bd25f4bdb532a395146315c0d4d -SHA1 (patch-ao) = 2694ea6016115441b6a4b29c1ff4df113f8e2c42 +SHA1 (patch-ao) = 6a0c0c9cfba5739edd707324e5ac3944444f3796 SHA1 (patch-ap) = 525a8f22f92444ef19612e657396d2b485b7e180 SHA1 (patch-aq) = ea21f5fcae657e0287892bba359977c66b272f7a SHA1 (patch-ar) = 013c19ac1746e0af1a11cbc9161a38640fc2c990 diff --git a/chat/icb/patches/patch-ae b/chat/icb/patches/patch-ae index c692985cebb..0ce5f577b47 100644 --- a/chat/icb/patches/patch-ae +++ b/chat/icb/patches/patch-ae @@ -1,8 +1,18 @@ -$NetBSD: patch-ae,v 1.1.1.1 2000/12/15 00:36:38 wiz Exp $ +$NetBSD: patch-ae,v 1.1.1.1.2.1 2002/06/23 18:40:45 jlam Exp $ diff -x *.orig -urN ./icb/icb.h /usr/pkgsrc/net/icb/work.i386.unpatched/icb-5.0.9/icb/icb.h --- ./icb/icb.h Fri Feb 24 22:20:23 1995 +++ /usr/pkgsrc/net/icb/work.i386.unpatched/icb-5.0.9/icb/icb.h Fri Nov 26 22:56:30 1999 +@@ -9,7 +9,9 @@ + #include <ctype.h> + #endif + ++#ifndef __APPLE__ + char *malloc(); ++#endif + + /* command usage information */ + @@ -38,6 +38,7 @@ int beeps; /* whether beeps are audible */ char *editmode; /* input editing mode */ diff --git a/chat/icb/patches/patch-ao b/chat/icb/patches/patch-ao index dea0259c490..6c09c277420 100644 --- a/chat/icb/patches/patch-ao +++ b/chat/icb/patches/patch-ao @@ -1,4 +1,4 @@ -$NetBSD: patch-ao,v 1.1.1.1 2000/12/15 00:36:39 wiz Exp $ +$NetBSD: patch-ao,v 1.1.1.1.2.1 2002/06/23 18:40:46 jlam Exp $ diff -x *.orig -urN ./tcl/strerror.c /usr/pkgsrc/net/icb/work.i386.unpatched/icb-5.0.9/tcl/strerror.c --- ./tcl/strerror.c Fri Feb 24 22:19:50 1995 @@ -7,7 +7,7 @@ diff -x *.orig -urN ./tcl/strerror.c /usr/pkgsrc/net/icb/work.i386.unpatched/icb #include <stdio.h> #include <string.h> -+#if !defined(BSD4_4) && !defined(__linux__) ++#if !defined(BSD4_4) && !defined(__linux__) && !defined(__APPLE__) /* * List of known errors: */ diff --git a/chat/ircd-hybrid/Makefile b/chat/ircd-hybrid/Makefile index 9f6e87c572b..87edf73dc26 100644 --- a/chat/ircd-hybrid/Makefile +++ b/chat/ircd-hybrid/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/10/21 21:26:51 seb Exp $ +# $NetBSD: Makefile,v 1.1.1.1.2.1 2002/06/23 18:40:46 jlam Exp $ # DISTNAME= ircd-hybrid-6.2 CATEGORIES= chat -MASTER_SITES= http://prdownloads.sourceforge.net/ircd-hybrid/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ircd-hybrid/} EXTRACT_SUFX= .tgz MAINTAINER= seb@pbox.org diff --git a/chat/irssi/Makefile b/chat/irssi/Makefile index bbfda770c83..b82d07f8cbb 100644 --- a/chat/irssi/Makefile +++ b/chat/irssi/Makefile @@ -1,11 +1,12 @@ -# $NetBSD: Makefile,v 1.9 2002/04/12 01:50:34 hubertf Exp $ +# $NetBSD: Makefile,v 1.9.2.1 2002/06/23 18:40:47 jlam Exp $ -DISTNAME= irssi-0.8.4 -PKGREVISION= 1 +DISTNAME= irssi-0.8.5 +WRKSRC= ${WRKDIR}/irssi-0.8.5 CATEGORIES= chat -MASTER_SITES= http://www.irssi.org/files/ +MASTER_SITES= http://real.irssi.org/files/ +EXTRACT_SUFX= .tar.bz2 -MAINTAINER= mutru@cc.hut.fi +MAINTAINER= mutru@iki.fi HOMEPAGE= http://www.irssi.org/ COMMENT= Secure and modular IRC client with text mode user interface @@ -17,11 +18,18 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-terminfo \ --enable-ipv6 -.if defined(IRSSI_USE_PERL) && ${IRSSI_USE_PERL} == "YES" -USE_PERL5= # defined +.include "../../mk/bsd.prefs.mk" + +.if defined(IRSSI_USE_PERL) && (${IRSSI_USE_PERL} == "YES") +PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Irssi/.packlist +PERL5_PACKLIST+= ${PERL5_SITEARCH}/auto/Irssi/Irc/.packlist +PERL5_PACKLIST+= ${PERL5_SITEARCH}/auto/Irssi/UI/.packlist +PERL5_PACKLIST+= ${PERL5_SITEARCH}/auto/Irssi/TextUI/.packlist +.include "../../lang/perl5/buildlink.mk" # actually we don't need --with-perl here, irssi is compiled with it by default # but who knows what may happen in future versions CONFIGURE_ARGS+= --with-perl +CONFIGURE_ARGS+= --with-perl-lib=site .else CONFIGURE_ARGS+= --with-perl=no .endif diff --git a/chat/irssi/distinfo b/chat/irssi/distinfo index 0d458090c06..5360a6db2de 100644 --- a/chat/irssi/distinfo +++ b/chat/irssi/distinfo @@ -1,4 +1,5 @@ -$NetBSD: distinfo,v 1.6 2002/04/19 13:45:52 zuntum Exp $ +$NetBSD: distinfo,v 1.6.2.1 2002/06/23 18:40:48 jlam Exp $ -SHA1 (irssi-0.8.4.tar.gz) = 9876270e26942d96be18528838614f0de885c5ed -Size (irssi-0.8.4.tar.gz) = 954627 bytes +SHA1 (irssi-0.8.5.tar.bz2) = c36ed600d2bb2d7593f0f6c11672dffe061fa5d6 +Size (irssi-0.8.5.tar.bz2) = 738657 bytes +SHA1 (patch-aa) = 45d8161733f58ab3733022c823933bb1cc93a8e2 diff --git a/chat/irssi/patches/patch-aa b/chat/irssi/patches/patch-aa new file mode 100644 index 00000000000..eadbfaa8b47 --- /dev/null +++ b/chat/irssi/patches/patch-aa @@ -0,0 +1,13 @@ +$NetBSD: patch-aa,v 1.3.2.2 2002/06/23 18:40:50 jlam Exp $ + +--- src/fe-text/tparm.c.orig Sat Feb 9 08:40:12 2002 ++++ src/fe-text/tparm.c +@@ -247,7 +247,7 @@ + argcnt = 0; + pos = 0; + termcap = 1; +- while (*sp != '\0') { ++ while ((sp != NULL) && (*sp != '\0')) { + switch(*sp) { + case '\\': + if (scan_for) { diff --git a/chat/lmme/DESCR b/chat/lmme/DESCR new file mode 100644 index 00000000000..f3fb8c2b7dc --- /dev/null +++ b/chat/lmme/DESCR @@ -0,0 +1,4 @@ +LMME (Linux MSN Messenger Engine) is a fully asynchronous, multithreaded +MSN protocol engine. Preliminary releases will be statically combined with +an ncurses console-based EPIC4-like interface for instant messaging +functionality. diff --git a/chat/lmme/Makefile b/chat/lmme/Makefile new file mode 100644 index 00000000000..8cb76c192f0 --- /dev/null +++ b/chat/lmme/Makefile @@ -0,0 +1,22 @@ +# $NetBSD: Makefile,v 1.2.2.2 2002/06/23 18:40:52 jlam Exp $ +# + +DISTNAME= lmme-0.6.4 +CATEGORIES= chat +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lmme/} + +MAINTAINER= collver@linuxfreemail.com +HOMEPAGE= http://lmme.sourceforge.net/ +COMMENT= curses-based client for MSN Messenger chat system + +USE_BUILDLINK_ONLY= YES +USE_GMAKE= YES +USE_PTHREAD= native pth +GNU_CONFIGURE= YES +CXXFLAGS+= -Dselect=pth_select -Dsleep=pth_sleep -Dread=pth_read -Dwrite=pth_write + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/src/lmme ${PREFIX}/bin/lmme + +.include "../../mk/pthread.buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/chat/lmme/PLIST b/chat/lmme/PLIST new file mode 100644 index 00000000000..9e678bbb6d4 --- /dev/null +++ b/chat/lmme/PLIST @@ -0,0 +1,2 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.2.2 2002/06/23 18:40:53 jlam Exp $ +bin/lmme diff --git a/chat/lmme/distinfo b/chat/lmme/distinfo new file mode 100644 index 00000000000..988e8204bc2 --- /dev/null +++ b/chat/lmme/distinfo @@ -0,0 +1,8 @@ +$NetBSD: distinfo,v 1.1.1.1.2.2 2002/06/23 18:40:54 jlam Exp $ + +SHA1 (lmme-0.6.4.tar.gz) = e696c755bbed728c34df09a1d1f0fba45e1bf84e +Size (lmme-0.6.4.tar.gz) = 84213 bytes +SHA1 (patch-aa) = 4d69add3a20952d9b9536aaf3e871640bac508a6 +SHA1 (patch-ab) = a7223ac773cae9802849a36968d1f8790bdf4e9e +SHA1 (patch-ac) = 8535f137781993df7aa32c668f369a529ce86244 +SHA1 (patch-ad) = 0c07ee2ccb98a2585ca301c74631bdd5ae508e2d diff --git a/chat/lmme/patches/patch-aa b/chat/lmme/patches/patch-aa new file mode 100644 index 00000000000..a1eabdf61e3 --- /dev/null +++ b/chat/lmme/patches/patch-aa @@ -0,0 +1,19 @@ +$NetBSD: patch-aa,v 1.1.1.1.2.2 2002/06/23 18:40:55 jlam Exp $ + +--- src/threadTemplate.h.orig Sun Dec 30 20:45:43 2001 ++++ src/threadTemplate.h +@@ -24,10 +24,14 @@ + + #include "headerManager.h" + ++#ifdef _POSIX_THREAD_IS_GNU_PTH ++#define initCond(PCond) PCond = PTHREAD_COND_INITIALIZER; ++#else + #define initCond(PCond) \ + PCond.__c_lock.__status = 0; \ + PCond.__c_lock.__spinlock = 0; \ + PCond.__c_waiting = 0; ++#endif + + + class Thread_Class diff --git a/chat/lmme/patches/patch-ab b/chat/lmme/patches/patch-ab new file mode 100644 index 00000000000..0ae46a8335e --- /dev/null +++ b/chat/lmme/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1.1.1.2.2 2002/06/23 18:40:55 jlam Exp $ + +--- src/interfaceModule.h.orig Sun May 26 19:36:58 2002 ++++ src/interfaceModule.h Sun May 26 19:37:20 2002 +@@ -62,7 +62,7 @@ + GFX_Modes = Interface_Data.GFX_Modes; + objectFlow = direction; + tabComplete = NULL; +- ThreadID = makeThread(NULL); ++ ThreadID = (pthread_st *)makeThread(NULL); + } + + ~Interface_Object() diff --git a/chat/lmme/patches/patch-ac b/chat/lmme/patches/patch-ac new file mode 100644 index 00000000000..6d83bea1265 --- /dev/null +++ b/chat/lmme/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.1.1.1.2.2 2002/06/23 18:40:56 jlam Exp $ + +--- src/msnLayerModule.h.orig Sun May 26 19:43:35 2002 ++++ src/msnLayerModule.h Sun May 26 19:43:49 2002 +@@ -46,7 +46,7 @@ + threadAwake = THREAD_DEAD; + QueueOut = myqueue; + Buddy_List = mybuddy; +- ThreadID = makeThread(NULL); ++ ThreadID = (pthread_st *)makeThread(NULL); + } + + ~MSN_Object() diff --git a/chat/lmme/patches/patch-ad b/chat/lmme/patches/patch-ad new file mode 100644 index 00000000000..7ae410f080b --- /dev/null +++ b/chat/lmme/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.1.1.1.2.2 2002/06/23 18:40:58 jlam Exp $ + +--- src/socketModule.h.orig Sun May 26 19:44:36 2002 ++++ src/socketModule.h Sun May 26 19:44:48 2002 +@@ -49,7 +49,7 @@ + { + threadAwake = THREAD_DEAD; + objectFlow = direction; +- ThreadID = makeThread(NULL); ++ ThreadID = (pthread_st *)makeThread(NULL); + } + + ~Socket_Object() diff --git a/chat/micq/Makefile b/chat/micq/Makefile index 845114d56ef..247c21807c7 100644 --- a/chat/micq/Makefile +++ b/chat/micq/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.5 2001/11/28 17:30:38 wiz Exp $ +# $NetBSD: Makefile,v 1.5.2.1 2002/06/23 18:40:59 jlam Exp $ -DISTNAME= micq-0.4.7 +DISTNAME= micq-0.4.9 CATEGORIES= chat MASTER_SITES= http://micq.ukeer.de/source/ EXTRACT_SUFX= .tgz diff --git a/chat/micq/distinfo b/chat/micq/distinfo index cf2b99b3d1c..d754c301dce 100644 --- a/chat/micq/distinfo +++ b/chat/micq/distinfo @@ -1,6 +1,4 @@ -$NetBSD: distinfo,v 1.4 2001/11/28 17:30:38 wiz Exp $ +$NetBSD: distinfo,v 1.4.2.1 2002/06/23 18:40:59 jlam Exp $ -SHA1 (micq-0.4.7.tgz) = 9eafac726ba1766c365c3fe13c93bd2846d0e558 -Size (micq-0.4.7.tgz) = 254626 bytes -SHA1 (patch-ab) = a2f834722669baa3371a1e2cfb0a819d56cb279e -SHA1 (patch-ac) = 3d10352b5bbd2717874384154ca4a58e22a04f7d +SHA1 (micq-0.4.9.tgz) = 6641c416964e8abd694a062409395f2173c381b9 +Size (micq-0.4.9.tgz) = 419381 bytes diff --git a/chat/micq/patches/patch-ab b/chat/micq/patches/patch-ab deleted file mode 100644 index 4d0d9a9b38d..00000000000 --- a/chat/micq/patches/patch-ab +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2001/11/28 17:30:39 wiz Exp $ - ---- src/mreadline.c.orig Thu Nov 22 00:29:15 2001 -+++ src/mreadline.c -@@ -166,9 +166,10 @@ - } - - if ((uin = TabGetNext ())) -- sprintf (s, "%s %s/", message_cmd, UIN2Name (uin)); -+ snprintf (s, sizeof(s), "%s %s/", message_cmd, UIN2Name (uin)); - else -- sprintf (s, "%s ", message_cmd); -+ snprintf (s, sizeof(2), "%s ", message_cmd); -+ - - clen = cpos = strlen (s); - R_undraw (); diff --git a/chat/micq/patches/patch-ac b/chat/micq/patches/patch-ac deleted file mode 100644 index e8d866f2f68..00000000000 --- a/chat/micq/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.2 2001/11/28 17:30:39 wiz Exp $ - ---- src/sendmsg.c.orig Thu Nov 22 00:32:01 2001 -+++ src/sendmsg.c -@@ -1087,7 +1087,7 @@ - { - char buf[450]; - -- sprintf (buf, "%s\xFE%s", url, description); -+ snprintf (buf, sizeof(buf), "%s\xFE%s", url, description); - icq_sendmsg (sok, uin, buf, URL_MESS); - } - diff --git a/chat/p5-Net-AIM/Makefile b/chat/p5-Net-AIM/Makefile index b9825418341..78805d0c1a5 100644 --- a/chat/p5-Net-AIM/Makefile +++ b/chat/p5-Net-AIM/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/01/31 07:33:40 martti Exp $ +# $NetBSD: Makefile,v 1.1.1.1.2.1 2002/06/23 18:41:01 jlam Exp $ # -DISTNAME= Net-AIM-1.21 +DISTNAME= Net-AIM-1.22 PKGNAME= p5-${DISTNAME} CATEGORIES= chat perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Net/} -MAINTAINER= schmonz+netbsd@schmonz.com +MAINTAINER= schmonz@netbsd.org HOMEPAGE= http://www.aryeh.net/Net-AIM/ COMMENT= implementation of the AOL Instant Messenger TOC protocol diff --git a/chat/p5-Net-AIM/distinfo b/chat/p5-Net-AIM/distinfo index 1c53d4caec7..700d88d5b2b 100644 --- a/chat/p5-Net-AIM/distinfo +++ b/chat/p5-Net-AIM/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/01/31 07:33:40 martti Exp $ +$NetBSD: distinfo,v 1.1.1.1.2.1 2002/06/23 18:41:01 jlam Exp $ -SHA1 (Net-AIM-1.21.tar.gz) = 3cf1c17f53eb26841e83feb3b77020fae06b0048 -Size (Net-AIM-1.21.tar.gz) = 22140 bytes +SHA1 (Net-AIM-1.22.tar.gz) = db7aa8eb0613a788e7f8c303e02ac45015b9c9d4 +Size (Net-AIM-1.22.tar.gz) = 21261 bytes diff --git a/chat/p5-Net-AOLIM/Makefile b/chat/p5-Net-AOLIM/Makefile index 75cee17afae..cdcf31bc74e 100644 --- a/chat/p5-Net-AOLIM/Makefile +++ b/chat/p5-Net-AOLIM/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/01/31 07:34:51 martti Exp $ +# $NetBSD: Makefile,v 1.1.1.1.2.1 2002/06/23 18:41:02 jlam Exp $ # -DISTNAME= Net-AOLIM-1.2 +DISTNAME= Net-AOLIM-1.4 PKGNAME= p5-${DISTNAME} CATEGORIES= chat perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Net/} -MAINTAINER= schmonz+netbsd@schmonz.com +MAINTAINER= schmonz@netbsd.org HOMEPAGE= http://www.phonon.net/pub/Net-AOLIM/ COMMENT= perl5 module for connecting to AOL IM (TOC protocol) diff --git a/chat/p5-Net-AOLIM/distinfo b/chat/p5-Net-AOLIM/distinfo index 458fc84086f..df6f91bf459 100644 --- a/chat/p5-Net-AOLIM/distinfo +++ b/chat/p5-Net-AOLIM/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/01/31 07:34:51 martti Exp $ +$NetBSD: distinfo,v 1.1.1.1.2.1 2002/06/23 18:41:03 jlam Exp $ -SHA1 (Net-AOLIM-1.2.tar.gz) = a9394dc20a600b5fc6492a9bd0960b6e260c1e84 -Size (Net-AOLIM-1.2.tar.gz) = 33178 bytes +SHA1 (Net-AOLIM-1.4.tar.gz) = f4f1a7f51d72929083b7b5c7a3baab969f2ffe90 +Size (Net-AOLIM-1.4.tar.gz) = 34569 bytes diff --git a/chat/p5-Net-Goofey/DESCR b/chat/p5-Net-Goofey/DESCR new file mode 100644 index 00000000000..f186b624648 --- /dev/null +++ b/chat/p5-Net-Goofey/DESCR @@ -0,0 +1,5 @@ +This is a really simple module for communicating with a Goofey server. + +Goofey is a bit like IRC and a bit like ICQ and a bit like email, it's +used mostly at Monash University. See the Goofey web page at: + http://www.cs.monash.edu.au/~tym/goofey.html diff --git a/chat/p5-Net-Goofey/Makefile b/chat/p5-Net-Goofey/Makefile new file mode 100644 index 00000000000..ce258781a8a --- /dev/null +++ b/chat/p5-Net-Goofey/Makefile @@ -0,0 +1,20 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:41:05 jlam Exp $ +# + +DISTNAME= Net-Goofey-1.5 +PKGNAME= p5-${DISTNAME} +CATEGORIES= chat perl5 +MASTER_SITES= http://tertius.net.au/~gossamer/code/Net-Goofey/ + +MAINTAINER= grant@netbsd.org +HOMEPAGE= http://tertius.net.au/~gossamer/code/ +COMMENT= perl module for communicating with a Goofey server + +USE_BUILDLINK_ONLY= YES +PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Net/Goofey/.packlist + +do-configure: + @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL + +.include "../../lang/perl5/buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/chat/p5-Net-Goofey/PLIST b/chat/p5-Net-Goofey/PLIST new file mode 100644 index 00000000000..a19604f6029 --- /dev/null +++ b/chat/p5-Net-Goofey/PLIST @@ -0,0 +1 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.34.2 2002/06/23 18:41:06 jlam Exp $ diff --git a/chat/p5-Net-Goofey/distinfo b/chat/p5-Net-Goofey/distinfo new file mode 100644 index 00000000000..f80014eb4dd --- /dev/null +++ b/chat/p5-Net-Goofey/distinfo @@ -0,0 +1,4 @@ +$NetBSD: distinfo,v 1.1.1.1.12.2 2002/06/23 18:41:07 jlam Exp $ + +SHA1 (Net-Goofey-1.5.tar.gz) = 44034e2c5308090217bab83703ac9f9f79b4aabc +Size (Net-Goofey-1.5.tar.gz) = 31333 bytes diff --git a/chat/silc-client/Makefile b/chat/silc-client/Makefile index 1739ed6c288..0434aa07cf5 100644 --- a/chat/silc-client/Makefile +++ b/chat/silc-client/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.11 2002/05/03 21:51:56 hubertf Exp $ +# $NetBSD: Makefile,v 1.11.2.1 2002/06/23 18:41:08 jlam Exp $ -DISTNAME= silc-client-0.8.6 -CATEGORIES= chat +DISTNAME= silc-client-0.9.2 +CATEGORIES= chat security MASTER_SITES= http://www.silcnet.org/download/client/sources/ \ ftp://ftp.silcnet.org/silc/client/sources/ \ http://www.fi.silcnet.org/download/client/sources/ \ @@ -17,7 +17,6 @@ COMMENT= Client for the Secure Internet Live Conferencing (SILC) GNU_CONFIGURE= yes USE_GMAKE= yes -USE_NCURSES= yes USE_LIBTOOL= yes USE_BUILDLINK_ONLY= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig diff --git a/chat/silc-client/PLIST b/chat/silc-client/PLIST index 0a170400c11..05b88113b15 100644 --- a/chat/silc-client/PLIST +++ b/chat/silc-client/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2002/05/03 21:51:56 hubertf Exp $ +@comment $NetBSD: PLIST,v 1.5.2.1 2002/06/23 18:41:09 jlam Exp $ bin/silc etc/silc/silc.conf share/doc/silc/CHANGES @@ -32,6 +32,7 @@ share/silc/help/cumode share/silc/help/cycle share/silc/help/date share/silc/help/dehilight +share/silc/help/detach share/silc/help/disconnect share/silc/help/echo share/silc/help/eval @@ -62,6 +63,7 @@ share/silc/help/motd share/silc/help/msg share/silc/help/names share/silc/help/nick +share/silc/help/note share/silc/help/notice share/silc/help/oper share/silc/help/part @@ -92,6 +94,7 @@ share/silc/help/unquery share/silc/help/upgrade share/silc/help/users share/silc/help/version +share/silc/help/watch share/silc/help/whois share/silc/help/whowas share/silc/help/window diff --git a/chat/silc-client/distinfo b/chat/silc-client/distinfo index 39205cf0706..b067e34d953 100644 --- a/chat/silc-client/distinfo +++ b/chat/silc-client/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.10 2002/05/03 21:51:56 hubertf Exp $ +$NetBSD: distinfo,v 1.10.2.1 2002/06/23 18:41:09 jlam Exp $ -SHA1 (silc-client-0.8.6.tar.bz2) = e9ec6a0ed233432ba223023b047a1af9df389d7a -Size (silc-client-0.8.6.tar.bz2) = 1313927 bytes +SHA1 (silc-client-0.9.2.tar.bz2) = 8cdccecf8c841e8c18fefd03678ea2ef33e089fb +Size (silc-client-0.9.2.tar.bz2) = 1394309 bytes SHA1 (patch-aa) = 70dbd7ae4e0cf465f39086e0490781c61d48d7e1 diff --git a/chat/silc-server/Makefile b/chat/silc-server/Makefile index 48bbccfafec..f0658ea78c2 100644 --- a/chat/silc-server/Makefile +++ b/chat/silc-server/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2002/05/03 22:02:49 hubertf Exp $ +# $NetBSD: Makefile,v 1.10.2.1 2002/06/23 18:41:10 jlam Exp $ -DISTNAME= silc-server-0.8.4 -CATEGORIES= chat +DISTNAME= silc-server-0.9.2 +CATEGORIES= chat security MASTER_SITES= http://www.silcnet.org/download/server/sources/ \ ftp://ftp.silcnet.org/silc/server/sources/ \ http://www.fi.silcnet.org/download/server/sources/ \ @@ -46,14 +46,13 @@ RCD_SCRIPTS_MODE= 0555 OWN_DIRS_PERMS+= /var/log/silcd ${SILCD_USER} ${SILCD_GROUP} 0700 -INSTALL_EXTRA_TMPL= ${PKGDIR}/INSTALL DEINSTALL_EXTRA_TMPL= ${PKGDIR}/DEINSTALL CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/silcd CONFIGURE_ARGS+= --with-etcdir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --with-silcd-config-file=${PKG_SYSCONFDIR}/silcd.conf CONFIGURE_ARGS+= --with-logsdir=/var/log/silcd -CONFIGURE_ARGS+= --with-silcd-pid-file=/var/log/silcd/silcd.pid +CONFIGURE_ARGS+= --with-silcd-pid-file=/var/run/silcd.pid CONFIGURE_ARGS+= --without-ncurses # list it into IPv6-ready packages @@ -75,7 +74,7 @@ post-install: .else @${SED} ${FILES_SUBST_SED} ${FILESDIR}/silcd.generic \ > ${PREFIX}/share/doc/silcd/silcd.default -.endif +.endif @${SED} ${FILES_SUBST_SED} ${FILESDIR}/motd.txt \ > ${PREFIX}/share/doc/silcd/motd.txt.default diff --git a/chat/silc-server/distinfo b/chat/silc-server/distinfo index dc75aec118b..63d12c23591 100644 --- a/chat/silc-server/distinfo +++ b/chat/silc-server/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.10 2002/05/03 22:02:49 hubertf Exp $ +$NetBSD: distinfo,v 1.10.2.1 2002/06/23 18:41:11 jlam Exp $ -SHA1 (silc-server-0.8.4.tar.bz2) = 1549594faa6f21b760f4240ae167bc501efa3101 -Size (silc-server-0.8.4.tar.bz2) = 940368 bytes +SHA1 (silc-server-0.9.2.tar.bz2) = 08fbd405661245d101f2ae3cb410e22999bd669d +Size (silc-server-0.9.2.tar.bz2) = 964021 bytes SHA1 (patch-aa) = 97ccff02e5d2d1bd3ff64a1a1942525e5a4522bd -SHA1 (patch-ab) = 482b7580cb95a0833c85f64a3d94c16b2b1c984f +SHA1 (patch-ab) = c1563b7d56fca05113b6cc884c4f7c266383de82 diff --git a/chat/silc-server/files/silcd.generic b/chat/silc-server/files/silcd.generic index c8280e49670..f7bae127302 100644 --- a/chat/silc-server/files/silcd.generic +++ b/chat/silc-server/files/silcd.generic @@ -1,4 +1,4 @@ -# $NetBSD: silcd.generic,v 1.1 2002/05/03 22:02:49 hubertf Exp $ +# $NetBSD: silcd.generic,v 1.1.2.1 2002/06/23 18:41:12 jlam Exp $ # KILL="/bin/kill" @@ -9,7 +9,7 @@ name="silcd" confdir="@PKG_SYSCONFDIR@" required_files="$confdir/silcd.conf" required_dirs="/var/log/silcd" -pidfile="/var/log/silcd/${name}.pid" +pidfile="/var/run/${name}.pid" command="@PREFIX@/sbin/silcd" start_precmd="silcd_precmd" diff --git a/chat/silc-server/files/silcd.sh b/chat/silc-server/files/silcd.sh index 60c255c95b9..af8eea95132 100644 --- a/chat/silc-server/files/silcd.sh +++ b/chat/silc-server/files/silcd.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: silcd.sh,v 1.4 2002/05/03 22:02:49 hubertf Exp $ +# $NetBSD: silcd.sh,v 1.4.2.1 2002/06/23 18:41:12 jlam Exp $ # # PROVIDE: silcd # REQUIRE: DAEMON @@ -15,7 +15,7 @@ rcvar=$name confdir="@PKG_SYSCONFDIR@" required_files="$confdir/silcd.conf" required_dirs="/var/log/silcd" -pidfile="/var/log/silcd/${name}.pid" +pidfile="/var/run/${name}.pid" command="@PREFIX@/sbin/silcd" start_precmd="silcd_precmd" stop_cmd="silcd_stop" @@ -29,7 +29,11 @@ silcd_precmd() silcd_stop() { - if [ -z "$_pid" ]; then + # Backward compat with NetBSD <1.6: + [ -z "$rc_pid" ] && rc_pid=$_pid + [ -z "$rc_pidcmd" ] && rc_pidcmd=$_pidcmd + + if [ -z "$rc_pid" ]; then if [ -n "$pidfile" ]; then echo "${name} not running? (check $pidfile)." else @@ -40,11 +44,11 @@ silcd_stop() echo "Stopping ${name}." _doit=\ -"${_user:+su -m $_user -c '}kill -${sig_stop:-TERM} $_pid${_user:+'}" +"${_user:+su -m $_user -c '}kill -${sig_stop:-TERM} $rc_pid${_user:+'}" eval $_doit - eval $_pidcmd - if [ ! $_pid ]; then + eval $rc_pidcmd + if [ ! $rc_pid ]; then rm -f $pidfile fi } diff --git a/chat/silc-server/patches/patch-ab b/chat/silc-server/patches/patch-ab index 5b98e4f4441..8aa3ac6b11f 100644 --- a/chat/silc-server/patches/patch-ab +++ b/chat/silc-server/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.5 2002/03/29 11:34:51 rh Exp $ +$NetBSD: patch-ab,v 1.5.2.1 2002/06/23 18:41:13 jlam Exp $ ---- doc/example_silcd.conf.in.orig Sun Mar 17 14:39:17 2002 -+++ doc/example_silcd.conf.in Wed Mar 27 21:05:25 2002 +--- doc/example_silcd.conf.in.orig Thu May 30 16:09:43 2002 ++++ doc/example_silcd.conf.in Tue Jun 18 01:27:59 2002 @@ -36,7 +36,7 @@ # This is the default path where to search modules. If omitted # built-in modules will be used. Built-in modules will also be @@ -11,18 +11,33 @@ $NetBSD: patch-ab,v 1.5 2002/03/29 11:34:51 rh Exp $ # If both passphrase and public key authentication is set for a # connection the public key authentication is the preferred one -@@ -139,8 +139,8 @@ +@@ -148,14 +148,14 @@ # - # Server FQDN and IP address + # Server name (FQDN) # - hostname = "lassi.kuo.fi.ssh.com"; -- ip = "10.2.1.6"; + hostname = "localhost"; -+ ip = "127.0.0.1"; - port = 706; # -@@ -152,7 +152,7 @@ + # Primary listener. Specify the IP address and the port to bind + # the server. + # + Primary { +- ip = "10.2.1.6"; ++ ip = "127.0.0.1"; + port = 706; + }; + +@@ -164,7 +164,7 @@ + # several interfaces use the Secondary to specify the listener(s). + # + #Secondary { ip = "10.2.1.60"; port = 706; }; +- #Secondary { ip = "10.2.1.160"; port = 706; }; ++ Secondary { ip = "::1"; port = 706; }; + + # + # ServerType field specifies the purpose of this server +@@ -175,7 +175,7 @@ # # Geographic location # @@ -31,7 +46,7 @@ $NetBSD: patch-ab,v 1.5 2002/03/29 11:34:51 rh Exp $ # # Full admin name -@@ -168,8 +168,8 @@ +@@ -191,8 +191,8 @@ # Run SILC server as specific user and group. The server must be # initially run as root. # @@ -42,7 +57,7 @@ $NetBSD: patch-ab,v 1.5 2002/03/29 11:34:51 rh Exp $ # # Public and private keys -@@ -182,7 +182,7 @@ +@@ -205,7 +205,7 @@ # # Specifies the text file displayed on client connection # @@ -51,7 +66,7 @@ $NetBSD: patch-ab,v 1.5 2002/03/29 11:34:51 rh Exp $ # # Pid file -@@ -209,7 +209,7 @@ +@@ -232,7 +232,7 @@ # reduces memory usage. By default it is false and log files are # written with FlushDelay timeout. # @@ -60,7 +75,7 @@ $NetBSD: patch-ab,v 1.5 2002/03/29 11:34:51 rh Exp $ # FlushDelay tells log files update delay (seconds) in case you # have chosen buffering output. This setting has effect only if -@@ -368,9 +368,9 @@ +@@ -391,9 +391,9 @@ # required. # Admin { @@ -73,7 +88,7 @@ $NetBSD: patch-ab,v 1.5 2002/03/29 11:34:51 rh Exp $ Passphrase = "verysecret"; # PublicKey = "/path/to/the/public.key"; }; -@@ -393,13 +393,13 @@ +@@ -416,13 +416,13 @@ # to true. For normal connections set it false. If it is set to true then # this server will be backup router. # @@ -94,7 +109,7 @@ $NetBSD: patch-ab,v 1.5 2002/03/29 11:34:51 rh Exp $ # # Configured router connections -@@ -426,17 +426,17 @@ +@@ -452,17 +452,17 @@ # backup router is in our cell then set the "BackupLocal" option to true. # If the backup router is in other cell then set it to false. # diff --git a/chat/vicq/Makefile b/chat/vicq/Makefile index 47776db3d2d..e2e1f148825 100644 --- a/chat/vicq/Makefile +++ b/chat/vicq/Makefile @@ -1,15 +1,17 @@ -# $NetBSD: Makefile,v 1.6 2002/05/07 15:41:37 wiz Exp $ +# $NetBSD: Makefile,v 1.6.2.1 2002/06/23 18:41:14 jlam Exp $ DISTNAME= vicq-0.4.1 +PKGREVISION= 1 +WRKSRC= ${WRKDIR}/vicq CATEGORIES= chat -MASTER_SITES= http://gonzo.kiev.ua/projects/vicq/ +MASTER_SITES= ${HOMEPAGE} EXTRACT_SUFX= .tar.bz2 MAINTAINER= packages@netbsd.org HOMEPAGE= http://gonzo.kiev.ua/projects/vicq/ COMMENT= simple icq client written in perl -WRKSRC= ${WRKDIR}/vicq +DEPEND+= p5-Term-ReadLine>=1.11:../../devel/p5-Term-ReadLine REPLACE_PERL= ${WRKSRC}/vicq NO_BUILD= YES diff --git a/chat/xchat/Makefile b/chat/xchat/Makefile index 618d36b3a14..784fc7c2d99 100644 --- a/chat/xchat/Makefile +++ b/chat/xchat/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.20 2002/04/09 09:14:58 tron Exp $ +# $NetBSD: Makefile,v 1.20.2.1 2002/06/23 18:41:15 jlam Exp $ -DISTNAME= xchat-1.8.8 +DISTNAME= xchat-1.8.9 CATEGORIES= chat x11 gnome MASTER_SITES= ${HOMEPAGE}files/source/1.8/ EXTRACT_SUFX= .tar.bz2 @@ -16,6 +16,7 @@ GNU_CONFIGURE= YES CONFIGURE_ENV+= ac_cv_lib_intl_bindtextdomain='yes' CONFIGURE_ENV+= pythonpath=${PYTHONBIN} MAKE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}" +BUILD_USES_MSGFMT= YES BUILD_DEFS+= USE_INET6 diff --git a/chat/xchat/distinfo b/chat/xchat/distinfo index 5d0fb218b51..141b314f8dd 100644 --- a/chat/xchat/distinfo +++ b/chat/xchat/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.11 2002/04/09 09:14:58 tron Exp $ +$NetBSD: distinfo,v 1.11.2.1 2002/06/23 18:41:15 jlam Exp $ -SHA1 (xchat-1.8.8.tar.bz2) = c47dd8bfbc6f7f7a455fc183cc2208a45e2d1f52 -Size (xchat-1.8.8.tar.bz2) = 735589 bytes -SHA1 (patch-aa) = c744594c0be4f65b37a356708e70e61ac432ff19 -SHA1 (patch-ab) = abfe6acc7dc1c6509a3da3e771d75bac50c13cf6 +SHA1 (xchat-1.8.9.tar.bz2) = feb8dab8dab8170586ff18caa09fe510ba0a4d46 +Size (xchat-1.8.9.tar.bz2) = 747762 bytes +SHA1 (patch-aa) = 86bcdaf1ccd33d64fc44583eec39e192dfcba06d +SHA1 (patch-ab) = 416a335b6e8d77a61fddabc823d77e3151dc359d SHA1 (patch-ac) = 10dce1c565b8d95fd6b4941ddb1fbf7bb82e52ed +SHA1 (patch-ad) = 7453ab165db9c166dae6221f80884de8de7511a7 diff --git a/chat/xchat/patches/patch-aa b/chat/xchat/patches/patch-aa index 7940ab11a84..abce9f6a7de 100644 --- a/chat/xchat/patches/patch-aa +++ b/chat/xchat/patches/patch-aa @@ -1,38 +1,15 @@ -$NetBSD: patch-aa,v 1.3 2002/01/16 14:59:39 tron Exp $ +$NetBSD: patch-aa,v 1.3.2.1 2002/06/23 18:41:16 jlam Exp $ -x--- configure.in.orig Sun Jan 6 07:43:37 2002 -+++ configure.in Wed Jan 16 15:40:37 2002 -@@ -8,7 +8,7 @@ +--- configure.in.orig Thu Jun 6 13:02:43 2002 ++++ configure.in Thu Jun 6 13:04:13 2002 +@@ -7,9 +7,9 @@ + AC_PROG_CC AC_PROG_RANLIB AC_PROG_CPP --ALL_LINGUAS="ca cs da de el es fi fr he hu it ja ko lt lv nl no pt pt_BR ro ru sk sl sr sv tr uk zh_CN zh_TW.Big5" +-ALL_LINGUAS="ca cs da de el es fi fr he hu it ja ko lt lv nl no pl pt pt_BR ro ru sk sl sr sv tr uk zh_CN zh_TW.Big5" +ALL_LINGUAS="ca cs da de el es fi fr he hu it ja ko lt lv nl no pt pt_BR ro ru sk sl sr sv tr uk zh_CN" AM_GNU_GETTEXT AC_PATH_PROG(sedpath, sed) -@@ -317,6 +317,7 @@ - PY_VERSION=`$pythonpath -c 'import sys ; print sys.version[0:3]'` - PY_MAJOR=`$pythonpath -c 'import sys ; print sys.version[0:2]'` - changequote([, ])dnl -+ AC_CHECK_LIB(util, openpty, LIBS="$LIBS -lutil") - if test -f $PY_PREFIX/include/python$PY_VERSION/Python.h; then - PY_LIBS="-lpython$PY_VERSION" - PY_LIB_LOC="-L$PY_EXEC_PREFIX/lib/python$PY_VERSION/config" -@@ -585,6 +586,8 @@ - AC_PATH_PROG(sortpath, sort) - AC_PATH_PROG(uniqpath, uniq) - -+dnl order matters on the link line.... -+if false; then - if test "_$trpath" != _; then - if test "_$sortpath" != _; then - if test "_$uniqpath" != _; then -@@ -597,6 +600,7 @@ - GUI_CFLAGS=`cat cflags` - rm -f cflags cflags2 - -+fi - fi - fi - fi + if test "_$sedpath" = _; then diff --git a/chat/xchat/patches/patch-ab b/chat/xchat/patches/patch-ab index 2a5a4f84391..119ae4275b4 100644 --- a/chat/xchat/patches/patch-ab +++ b/chat/xchat/patches/patch-ab @@ -1,363 +1,20 @@ -$NetBSD: patch-ab,v 1.5 2002/04/09 09:14:58 tron Exp $ +$NetBSD: patch-ab,v 1.5.2.1 2002/06/23 18:41:17 jlam Exp $ ---- configure.orig Wed Mar 6 03:23:05 2002 -+++ configure Tue Apr 9 11:06:52 2002 -@@ -15,12 +15,12 @@ - --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer" - ac_help="$ac_help -- --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib" --ac_help="$ac_help - --disable-nls do not use Native Language Support" - ac_help="$ac_help - --with-included-gettext use the GNU gettext library included here" - ac_help="$ac_help -+ --with-catgets use catgets functions if available" -+ac_help="$ac_help - --enable-debug enable use of Memory Debug (default: no)" - ac_help="$ac_help - --enable-socks enable use of SOCKS5 (default: no)" -@@ -1192,84 +1192,35 @@ +--- configure.orig Sat Apr 27 06:57:11 2002 ++++ configure Thu Jun 6 13:14:57 2002 +@@ -1191,9 +1191,9 @@ + fi echo "$ac_t""$CPP" 1>&6 -ALL_LINGUAS="ca cs da de el es fi fr he hu it ja ko lt lv nl no pt pt_BR ro ru sk sl sr sv tr uk zh_CN zh_TW.Big5" -- --# Make sure we can run config.sub. --if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : --else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } --fi -- --echo $ac_n "checking host system type""... $ac_c" 1>&6 --echo "configure:1204: checking host system type" >&5 -- --host_alias=$host --case "$host_alias" in --NONE) -- case $nonopt in -- NONE) -- if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : -- else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } -- fi ;; -- *) host_alias=$nonopt ;; -- esac ;; --esac -- --host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` --host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` --host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` --host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` --echo "$ac_t""$host" 1>&6 -- -- -- echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6 --echo "configure:1226: checking for strerror in -lcposix" >&5 --ac_lib_var=`echo cposix'_'strerror | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- ac_save_LIBS="$LIBS" --LIBS="-lcposix $LIBS" --cat > conftest.$ac_ext <<EOF --#line 1234 "configure" --#include "confdefs.h" --/* Override any gcc2 internal prototype to avoid an error. */ --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char strerror(); -- --int main() { --strerror() --; return 0; } +ALL_LINGUAS="ca cs da de el es fi fr he hu it ja ko lt lv nl no pt pt_BR ro ru sk sl sr sv tr uk zh_CN" -+echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 -+echo "configure:1198: checking for POSIXized ISC" >&5 -+if test -d /etc/conf/kconfig.d && -+ grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 -+then -+ echo "$ac_t""yes" 1>&6 -+ ISC=yes # If later tests want to check for ISC. -+ cat >> confdefs.h <<\EOF -+#define _POSIX_SOURCE 1 - EOF --if { (eval echo configure:1245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" --fi --rm -f conftest* --LIBS="$ac_save_LIBS" - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- LIBS="$LIBS -lcposix" -+ if test "$GCC" = yes; then -+ CC="$CC -posix" -+ else -+ CC="$CC -Xp" -+ fi - else - echo "$ac_t""no" 1>&6 -+ ISC= - fi - -- -- - echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 --echo "configure:1268: checking for ANSI C header files" >&5 -+echo "configure:1219: checking for ANSI C header files" >&5 - if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 1273 "configure" -+#line 1224 "configure" - #include "confdefs.h" - #include <stdlib.h> - #include <stdarg.h> -@@ -1277,7 +1228,7 @@ - #include <float.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1281: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1232: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -1294,7 +1245,7 @@ - if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat > conftest.$ac_ext <<EOF --#line 1298 "configure" -+#line 1249 "configure" - #include "confdefs.h" - #include <string.h> - EOF -@@ -1312,7 +1263,7 @@ - if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat > conftest.$ac_ext <<EOF --#line 1316 "configure" -+#line 1267 "configure" - #include "confdefs.h" - #include <stdlib.h> - EOF -@@ -1333,7 +1284,7 @@ - : - else - cat > conftest.$ac_ext <<EOF --#line 1337 "configure" -+#line 1288 "configure" - #include "confdefs.h" - #include <ctype.h> - #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -@@ -1344,7 +1295,7 @@ - exit (0); } + # Make sure we can run config.sub. + if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : + else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } +@@ -1781,9 +1781,9 @@ EOF --if { (eval echo configure:1348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:1299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else -@@ -1368,12 +1319,12 @@ - fi - - echo $ac_n "checking for working const""... $ac_c" 1>&6 --echo "configure:1372: checking for working const" >&5 -+echo "configure:1323: checking for working const" >&5 - if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 1377 "configure" -+#line 1328 "configure" - #include "confdefs.h" - - int main() { -@@ -1422,7 +1373,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:1426: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:1377: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_c_const=yes - else -@@ -1443,21 +1394,21 @@ - fi - - echo $ac_n "checking for inline""... $ac_c" 1>&6 --echo "configure:1447: checking for inline" >&5 -+echo "configure:1398: checking for inline" >&5 - if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_cv_c_inline=no - for ac_kw in inline __inline__ __inline; do - cat > conftest.$ac_ext <<EOF --#line 1454 "configure" -+#line 1405 "configure" - #include "confdefs.h" - - int main() { - } $ac_kw foo() { - ; return 0; } - EOF --if { (eval echo configure:1461: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:1412: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_c_inline=$ac_kw; break - else -@@ -1483,12 +1434,12 @@ - esac - - echo $ac_n "checking for off_t""... $ac_c" 1>&6 --echo "configure:1487: checking for off_t" >&5 -+echo "configure:1438: checking for off_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 1492 "configure" -+#line 1443 "configure" - #include "confdefs.h" - #include <sys/types.h> - #if STDC_HEADERS -@@ -1516,12 +1467,12 @@ - fi - - echo $ac_n "checking for size_t""... $ac_c" 1>&6 --echo "configure:1520: checking for size_t" >&5 -+echo "configure:1471: checking for size_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 1525 "configure" -+#line 1476 "configure" - #include "confdefs.h" - #include <sys/types.h> - #if STDC_HEADERS -@@ -1551,19 +1502,19 @@ - # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works - # for constant arguments. Useless! - echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 --echo "configure:1555: checking for working alloca.h" >&5 -+echo "configure:1506: checking for working alloca.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 1560 "configure" -+#line 1511 "configure" - #include "confdefs.h" - #include <alloca.h> - int main() { - char *p = alloca(2 * sizeof(int)); - ; return 0; } - EOF --if { (eval echo configure:1567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_header_alloca_h=yes - else -@@ -1584,12 +1535,12 @@ - fi - - echo $ac_n "checking for alloca""... $ac_c" 1>&6 --echo "configure:1588: checking for alloca" >&5 -+echo "configure:1539: checking for alloca" >&5 - if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 1593 "configure" -+#line 1544 "configure" - #include "confdefs.h" - - #ifdef __GNUC__ -@@ -1617,7 +1568,7 @@ - char *p = (char *) alloca(1); - ; return 0; } - EOF --if { (eval echo configure:1621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_func_alloca_works=yes - else -@@ -1649,12 +1600,12 @@ - - - echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 --echo "configure:1653: checking whether alloca needs Cray hooks" >&5 -+echo "configure:1604: checking whether alloca needs Cray hooks" >&5 - if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 1658 "configure" -+#line 1609 "configure" - #include "confdefs.h" - #if defined(CRAY) && ! defined(CRAY2) - webecray -@@ -1679,12 +1630,12 @@ - if test $ac_cv_os_cray = yes; then - for ac_func in _getb67 GETB67 getb67; do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:1683: checking for $ac_func" >&5 -+echo "configure:1634: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 1688 "configure" -+#line 1639 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -1707,7 +1658,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:1711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -1734,7 +1685,7 @@ - fi - - echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 --echo "configure:1738: checking stack direction for C alloca" >&5 -+echo "configure:1689: checking stack direction for C alloca" >&5 - if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1742,7 +1693,7 @@ - ac_cv_c_stack_direction=0 - else - cat > conftest.$ac_ext <<EOF --#line 1746 "configure" -+#line 1697 "configure" - #include "confdefs.h" - find_stack_direction () - { -@@ -1761,7 +1712,7 @@ - exit (find_stack_direction() < 0); - } - EOF --if { (eval echo configure:1765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:1716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_c_stack_direction=1 - else -@@ -1782,21 +1733,21 @@ fi @@ -366,66 +23,9 @@ $NetBSD: patch-ab,v 1.5 2002/04/09 09:14:58 tron Exp $ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:1790: checking for $ac_hdr" >&5 -+echo "configure:1741: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 1795 "configure" -+#line 1746 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1800: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1751: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -1825,12 +1776,12 @@ - for ac_func in getpagesize - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:1829: checking for $ac_func" >&5 -+echo "configure:1780: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 1834 "configure" -+#line 1785 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -1853,7 +1804,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:1857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -1878,7 +1829,7 @@ - done - - echo $ac_n "checking for working mmap""... $ac_c" 1>&6 --echo "configure:1882: checking for working mmap" >&5 -+echo "configure:1833: checking for working mmap" >&5 - if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1886,7 +1837,7 @@ - ac_cv_func_mmap_fixed_mapped=no - else - cat > conftest.$ac_ext <<EOF --#line 1890 "configure" -+#line 1841 "configure" - #include "confdefs.h" - - /* Thanks to Mike Haertel and Jim Avera for this test. -@@ -1914,24 +1865,11 @@ + echo "configure:1790: checking for $ac_hdr" >&5 +@@ -1913,26 +1913,13 @@ + #include <sys/types.h> #include <fcntl.h> #include <sys/mman.h> @@ -453,328 +53,206 @@ $NetBSD: patch-ab,v 1.5 2002/04/09 09:14:58 tron Exp $ /* Assume that all systems that can run configure have sys/param.h. */ # ifndef HAVE_SYS_PARAM_H -@@ -2039,7 +1977,7 @@ + # define HAVE_SYS_PARAM_H 1 +@@ -2038,9 +2025,9 @@ + exit(0); } EOF -if { (eval echo configure:2043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:1981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:2030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else -@@ -2061,60 +1999,23 @@ - + echo "configure: failed program was:" >&5 +@@ -2062,14 +2049,14 @@ fi -- -- echo $ac_n "checking whether we are using the GNU C Library 2.1 or newer""... $ac_c" 1>&6 + + echo $ac_n "checking whether we are using the GNU C Library 2.1 or newer""... $ac_c" 1>&6 -echo "configure:2067: checking whether we are using the GNU C Library 2.1 or newer" >&5 --if eval "test \"`echo '$''{'ac_cv_gnu_library_2_1'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- cat > conftest.$ac_ext <<EOF ++echo "configure:2054: checking whether we are using the GNU C Library 2.1 or newer" >&5 + if eval "test \"`echo '$''{'ac_cv_gnu_library_2_1'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF -#line 2072 "configure" --#include "confdefs.h" -- --#include <features.h> --#ifdef __GNU_LIBRARY__ -- #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) -- Lucky GNU user -- #endif --#endif -- --EOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- egrep "Lucky GNU user" >/dev/null 2>&1; then -- rm -rf conftest* -- ac_cv_gnu_library_2_1=yes --else -- rm -rf conftest* -- ac_cv_gnu_library_2_1=no --fi --rm -f conftest* -- -- -- --fi -- --echo "$ac_t""$ac_cv_gnu_library_2_1" 1>&6 -- -- GLIBC21="$ac_cv_gnu_library_2_1" -- -- -- -- for ac_hdr in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ --stdlib.h string.h unistd.h sys/param.h -+ -+ for ac_hdr in argz.h limits.h locale.h nl_types.h malloc.h string.h \ -+unistd.h sys/param.h ++#line 2059 "configure" + #include "confdefs.h" + + #include <features.h> + #ifdef __GNU_LIBRARY__ +@@ -2103,19 +2090,19 @@ + stdlib.h string.h unistd.h sys/param.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2108: checking for $ac_hdr" >&5 -+echo "configure:2009: checking for $ac_hdr" >&5 ++echo "configure:2095: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2113 "configure" -+#line 2014 "configure" ++#line 2100 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2118: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2019: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:2105: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* -@@ -2140,17 +2041,16 @@ - fi - done - -- for ac_func in feof_unlocked fgets_unlocked getcwd getegid geteuid \ --getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \ --strdup strtoul tsearch __argz_count __argz_stringify __argz_next -+ for ac_func in getcwd munmap putenv setenv setlocale strchr strcasecmp \ -+strdup __argz_count __argz_stringify __argz_next + eval "ac_cv_header_$ac_safe=yes" +@@ -2144,14 +2131,14 @@ + getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \ + strdup strtoul tsearch __argz_count __argz_stringify __argz_next do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2149: checking for $ac_func" >&5 -+echo "configure:2049: checking for $ac_func" >&5 ++echo "configure:2136: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2154 "configure" -+#line 2054 "configure" ++#line 2141 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ -@@ -2173,7 +2073,7 @@ + #include <assert.h> +@@ -2172,9 +2159,9 @@ + #endif ; return 0; } EOF -if { (eval echo configure:2177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else -@@ -2198,184 +2098,85 @@ - done + echo "configure: failed program was:" >&5 +@@ -2212,17 +2199,17 @@ + fi -- -- -- # Check whether --with-libiconv-prefix or --without-libiconv-prefix was given. --if test "${with_libiconv_prefix+set}" = set; then -- withval="$with_libiconv_prefix" -- -- for dir in `echo "$withval" | tr : ' '`; do -- if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi -- if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi -- done -- --fi -- -- -- echo $ac_n "checking for iconv""... $ac_c" 1>&6 + echo $ac_n "checking for iconv""... $ac_c" 1>&6 -echo "configure:2217: checking for iconv" >&5 --if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then -+ if test "${ac_cv_func_stpcpy+set}" != "set"; then -+ for ac_func in stpcpy -+do -+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -+echo "configure:2106: checking for $ac_func" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then ++echo "configure:2204: checking for iconv" >&5 + if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -- -- am_cv_func_iconv="no, consider installing GNU libiconv" -- am_cv_lib_iconv=no -- cat > conftest.$ac_ext <<EOF + + am_cv_func_iconv="no, consider installing GNU libiconv" + am_cv_lib_iconv=no + cat > conftest.$ac_ext <<EOF -#line 2225 "configure" --#include "confdefs.h" --#include <stdlib.h> --#include <iconv.h> --int main() { --iconv_t cd = iconv_open("",""); -- iconv(cd,NULL,NULL,NULL,NULL); -- iconv_close(cd); --; return 0; } --EOF ++#line 2212 "configure" + #include "confdefs.h" + #include <stdlib.h> + #include <iconv.h> + int main() { +@@ -2230,9 +2217,9 @@ + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd); + ; return 0; } + EOF -if { (eval echo configure:2235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- am_cv_func_iconv=yes --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 --fi --rm -f conftest* -- if test "$am_cv_func_iconv" != yes; then -- am_save_LIBS="$LIBS" -- LIBS="$LIBS -liconv" -- cat > conftest.$ac_ext <<EOF ++if { (eval echo configure:2222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + am_cv_func_iconv=yes + else + echo "configure: failed program was:" >&5 +@@ -2242,9 +2229,9 @@ + if test "$am_cv_func_iconv" != yes; then + am_save_LIBS="$LIBS" + LIBS="$LIBS -liconv" + cat > conftest.$ac_ext <<EOF -#line 2247 "configure" -+ cat > conftest.$ac_ext <<EOF -+#line 2111 "configure" ++#line 2234 "configure" #include "confdefs.h" --#include <stdlib.h> --#include <iconv.h> --int main() { --iconv_t cd = iconv_open("",""); -- iconv(cd,NULL,NULL,NULL,NULL); -- iconv_close(cd); --; return 0; } --EOF + #include <stdlib.h> + #include <iconv.h> + int main() { +@@ -2252,9 +2239,9 @@ + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd); + ; return 0; } + EOF -if { (eval echo configure:2257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- am_cv_lib_iconv=yes -- am_cv_func_iconv=yes --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 --fi --rm -f conftest* -- LIBS="$am_save_LIBS" -- fi -- --fi -- --echo "$ac_t""$am_cv_func_iconv" 1>&6 -- if test "$am_cv_func_iconv" = yes; then -- cat >> confdefs.h <<\EOF --#define HAVE_ICONV 1 --EOF -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char $ac_func(); below. */ -+#include <assert.h> -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char $ac_func(); - -- echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6 ++if { (eval echo configure:2244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + am_cv_lib_iconv=yes + am_cv_func_iconv=yes + else +@@ -2273,15 +2260,15 @@ + #define HAVE_ICONV 1 + EOF + + echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6 -echo "configure:2278: checking for iconv declaration" >&5 -- if eval "test \"`echo '$''{'am_cv_proto_iconv'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- -- cat > conftest.$ac_ext <<EOF ++echo "configure:2265: checking for iconv declaration" >&5 + if eval "test \"`echo '$''{'am_cv_proto_iconv'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + + cat > conftest.$ac_ext <<EOF -#line 2284 "configure" --#include "confdefs.h" -+int main() { - --#include <stdlib.h> --#include <iconv.h> --extern --#ifdef __cplusplus --"C" --#endif --#if defined(__STDC__) || defined(__cplusplus) --size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+choke me - #else --size_t iconv(); -+$ac_func(); - #endif ++#line 2271 "configure" + #include "confdefs.h" + + #include <stdlib.h> + #include <iconv.h> +@@ -2298,9 +2285,9 @@ + int main() { --int main() { -- ; return 0; } EOF -if { (eval echo configure:2303: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2290: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* -- am_cv_proto_iconv_arg1="" -+ eval "ac_cv_func_$ac_func=yes" + am_cv_proto_iconv_arg1="" else echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* -- am_cv_proto_iconv_arg1="const" -+ eval "ac_cv_func_$ac_func=no" - fi - rm -f conftest* -- am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);" - fi +@@ -2327,21 +2314,21 @@ + -- am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` -- echo "$ac_t""${ac_t:- -- }$am_cv_proto_iconv" 1>&6 -- cat >> confdefs.h <<EOF --#define ICONV_CONST $am_cv_proto_iconv_arg1 --EOF -- -- fi -- LIBICONV= -- if test "$am_cv_lib_iconv" = yes; then -- LIBICONV="-liconv" -- fi -- -- -- -- echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 + + echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 -echo "configure:2332: checking for nl_langinfo and CODESET" >&5 --if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- cat > conftest.$ac_ext <<EOF ++echo "configure:2319: checking for nl_langinfo and CODESET" >&5 + if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF -#line 2337 "configure" --#include "confdefs.h" --#include <langinfo.h> --int main() { --char* cs = nl_langinfo(CODESET); --; return 0; } -+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -+ cat >> confdefs.h <<EOF -+#define $ac_tr_func 1 ++#line 2324 "configure" + #include "confdefs.h" + #include <langinfo.h> + int main() { + char* cs = nl_langinfo(CODESET); + ; return 0; } EOF -if { (eval echo configure:2344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- am_cv_langinfo_codeset=yes -+ - else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- am_cv_langinfo_codeset=no --fi --rm -f conftest* -- -+ echo "$ac_t""no" 1>&6 - fi -+done - --echo "$ac_t""$am_cv_langinfo_codeset" 1>&6 -- if test $am_cv_langinfo_codeset = yes; then -- cat >> confdefs.h <<\EOF --#define HAVE_LANGINFO_CODESET 1 -+ fi -+ if test "${ac_cv_func_stpcpy}" = "yes"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_STPCPY 1 - EOF - -- fi -+ fi ++if { (eval echo configure:2331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + am_cv_langinfo_codeset=yes + else + echo "configure: failed program was:" >&5 +@@ -2362,21 +2349,21 @@ + fi if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:2367: checking for LC_MESSAGES" >&5 -+echo "configure:2168: checking for LC_MESSAGES" >&5 ++echo "configure:2354: checking for LC_MESSAGES" >&5 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2372 "configure" -+#line 2173 "configure" ++#line 2359 "configure" #include "confdefs.h" #include <locale.h> int main() { @@ -782,2260 +260,1525 @@ $NetBSD: patch-ab,v 1.5 2002/04/09 09:14:58 tron Exp $ ; return 0; } EOF -if { (eval echo configure:2379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_val_LC_MESSAGES=yes else -@@ -2396,7 +2197,7 @@ + echo "configure: failed program was:" >&5 +@@ -2395,9 +2382,9 @@ + fi fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:2400: checking whether NLS is requested" >&5 -+echo "configure:2201: checking whether NLS is requested" >&5 ++echo "configure:2387: checking whether NLS is requested" >&5 # Check whether --enable-nls or --disable-nls was given. if test "${enable_nls+set}" = set; then enableval="$enable_nls" -@@ -2408,9 +2209,7 @@ - echo "$ac_t""$USE_NLS" 1>&6 - - -- BUILD_INCLUDED_LIBINTL=no - USE_INCLUDED_LIBINTL=no -- INTLLIBS= - - if test "$USE_NLS" = "yes"; then - cat >> confdefs.h <<\EOF -@@ -2418,7 +2217,7 @@ + USE_NLS=$enableval +@@ -2417,9 +2404,9 @@ + #define ENABLE_NLS 1 EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:2422: checking whether included gettext is requested" >&5 -+echo "configure:2221: checking whether included gettext is requested" >&5 ++echo "configure:2409: checking whether included gettext is requested" >&5 # Check whether --with-included-gettext or --without-included-gettext was given. if test "${with_included_gettext+set}" = set; then withval="$with_included_gettext" -@@ -2431,24 +2230,23 @@ - - nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" - if test "$nls_cv_force_use_gnu_gettext" != "yes"; then -- CATOBJEXT=NONE -- -- -- -+ nls_cv_header_intl= -+ nls_cv_header_libgt= -+ CATOBJEXT=NONE + nls_cv_force_use_gnu_gettext=$withval +@@ -2437,19 +2424,19 @@ + ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:2442: checking for libintl.h" >&5 -+echo "configure:2240: checking for libintl.h" >&5 ++echo "configure:2429: checking for libintl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2447 "configure" -+#line 2245 "configure" ++#line 2434 "configure" #include "confdefs.h" #include <libintl.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2452: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2250: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:2439: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* -@@ -2464,178 +2262,464 @@ + eval "ac_cv_header_$ac_safe=yes" +@@ -2464,23 +2451,23 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 -- echo $ac_n "checking for GNU gettext in libc""... $ac_c" 1>&6 + echo $ac_n "checking for GNU gettext in libc""... $ac_c" 1>&6 -echo "configure:2469: checking for GNU gettext in libc" >&5 --if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libc'+set}'`\" = set"; then -+ echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6 -+echo "configure:2267: checking for gettext in libc" >&5 -+if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext <<EOF -+#line 2272 "configure" -+#include "confdefs.h" -+#include <libintl.h> -+int main() { -+return (int) gettext ("") -+; return 0; } -+EOF -+if { (eval echo configure:2279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ gt_cv_func_gettext_libc=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ gt_cv_func_gettext_libc=no -+fi -+rm -f conftest* -+fi -+ -+echo "$ac_t""$gt_cv_func_gettext_libc" 1>&6 -+ -+ if test "$gt_cv_func_gettext_libc" != "yes"; then -+ echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6 -+echo "configure:2295: checking for bindtextdomain in -lintl" >&5 -+ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lintl $LIBS" -+cat > conftest.$ac_ext <<EOF -+#line 2303 "configure" -+#include "confdefs.h" -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char bindtextdomain(); -+ -+int main() { -+bindtextdomain() -+; return 0; } -+EOF -+if { (eval echo configure:2314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6 -+echo "configure:2330: checking for gettext in libintl" >&5 -+if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6 -+echo "configure:2335: checking for gettext in -lintl" >&5 -+ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lintl $LIBS" -+cat > conftest.$ac_ext <<EOF -+#line 2343 "configure" -+#include "confdefs.h" -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char gettext(); -+ -+int main() { -+gettext() -+; return 0; } -+EOF -+if { (eval echo configure:2354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ gt_cv_func_gettext_libintl=yes -+else -+ echo "$ac_t""no" 1>&6 -+gt_cv_func_gettext_libintl=no -+fi -+ -+fi -+ -+echo "$ac_t""$gt_cv_func_gettext_libintl" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ fi -+ -+ if test "$gt_cv_func_gettext_libc" = "yes" \ -+ || test "$gt_cv_func_gettext_libintl" = "yes"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_GETTEXT 1 -+EOF -+ -+ # Extract the first word of "msgfmt", so it can be a program name with args. -+set dummy msgfmt; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:2393: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ case "$MSGFMT" in -+ /*) -+ ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. -+ ;; -+ *) -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" -+ for ac_dir in $PATH; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then -+ ac_cv_path_MSGFMT="$ac_dir/$ac_word" -+ break -+ fi -+ fi -+ done -+ IFS="$ac_save_ifs" -+ test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no" -+ ;; -+esac -+fi -+MSGFMT="$ac_cv_path_MSGFMT" -+if test -n "$MSGFMT"; then -+ echo "$ac_t""$MSGFMT" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ if test "$MSGFMT" != "no"; then -+ for ac_func in dcgettext -+do -+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -+echo "configure:2427: checking for $ac_func" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then ++echo "configure:2456: checking for GNU gettext in libc" >&5 + if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2474 "configure" -+#line 2432 "configure" -+#include "confdefs.h" -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char $ac_func(); below. */ -+#include <assert.h> -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char $ac_func(); -+ -+int main() { -+ -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+choke me -+#else -+$ac_func(); -+#endif -+ -+; return 0; } -+EOF -+if { (eval echo configure:2455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_func_$ac_func=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_$ac_func=no" -+fi -+rm -f conftest* -+fi -+ -+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -+ cat >> confdefs.h <<EOF -+#define $ac_tr_func 1 -+EOF -+ -+else -+ echo "$ac_t""no" 1>&6 -+fi -+done -+ -+ # Extract the first word of "gmsgfmt", so it can be a program name with args. -+set dummy gmsgfmt; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:2482: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ case "$GMSGFMT" in -+ /*) -+ ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. -+ ;; -+ ?:/*) -+ ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path. -+ ;; -+ *) -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_path_GMSGFMT="$ac_dir/$ac_word" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+ test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" -+ ;; -+esac -+fi -+GMSGFMT="$ac_cv_path_GMSGFMT" -+if test -n "$GMSGFMT"; then -+ echo "$ac_t""$GMSGFMT" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ # Extract the first word of "xgettext", so it can be a program name with args. -+set dummy xgettext; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:2518: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ case "$XGETTEXT" in -+ /*) -+ ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. -+ ;; -+ *) -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" -+ for ac_dir in $PATH; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then -+ ac_cv_path_XGETTEXT="$ac_dir/$ac_word" -+ break -+ fi -+ fi -+ done -+ IFS="$ac_save_ifs" -+ test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" -+ ;; -+esac -+fi -+XGETTEXT="$ac_cv_path_XGETTEXT" -+if test -n "$XGETTEXT"; then -+ echo "$ac_t""$XGETTEXT" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ cat > conftest.$ac_ext <<EOF -+#line 2550 "configure" ++#line 2461 "configure" #include "confdefs.h" --#include <libintl.h> --extern int _nl_msg_cat_cntr; -+ + #include <libintl.h> + extern int _nl_msg_cat_cntr; int main() { --bindtextdomain ("", ""); --return (int) gettext ("") + _nl_msg_cat_cntr -+extern int _nl_msg_cat_cntr; -+ return _nl_msg_cat_cntr + bindtextdomain ("", ""); + return (int) gettext ("") + _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:2483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* -- gt_cv_func_gnugettext1_libc=yes -+ CATOBJEXT=.gmo -+ DATADIRNAME=share + gt_cv_func_gnugettext1_libc=yes else echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* -- gt_cv_func_gnugettext1_libc=no -+ CATOBJEXT=.mo -+ DATADIRNAME=lib - fi - rm -f conftest* -+ INSTOBJEXT=.mo -+ fi -+ fi -+ -+else -+ echo "$ac_t""no" 1>&6 - fi +@@ -2494,25 +2481,25 @@ + echo "$ac_t""$gt_cv_func_gnugettext1_libc" 1>&6 --echo "$ac_t""$gt_cv_func_gnugettext1_libc" 1>&6 - -- if test "$gt_cv_func_gnugettext1_libc" != "yes"; then -- echo $ac_n "checking for GNU gettext in libintl""... $ac_c" 1>&6 + if test "$gt_cv_func_gnugettext1_libc" != "yes"; then + echo $ac_n "checking for GNU gettext in libintl""... $ac_c" 1>&6 -echo "configure:2499: checking for GNU gettext in libintl" >&5 --if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libintl'+set}'`\" = set"; then -+ if test "$CATOBJEXT" = "NONE"; then -+ echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6 -+echo "configure:2581: checking whether catgets can be used" >&5 -+ # Check whether --with-catgets or --without-catgets was given. -+if test "${with_catgets+set}" = set; then -+ withval="$with_catgets" -+ nls_cv_use_catgets=$withval -+else -+ nls_cv_use_catgets=no -+fi -+ -+ echo "$ac_t""$nls_cv_use_catgets" 1>&6 -+ -+ if test "$nls_cv_use_catgets" = "yes"; then -+ echo $ac_n "checking for main in -li""... $ac_c" 1>&6 -+echo "configure:2594: checking for main in -li" >&5 -+ac_lib_var=`echo i'_'main | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++echo "configure:2486: checking for GNU gettext in libintl" >&5 + if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libintl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -- gt_save_LIBS="$LIBS" -- LIBS="$LIBS -lintl $LIBICONV" -- cat > conftest.$ac_ext <<EOF + gt_save_LIBS="$LIBS" + LIBS="$LIBS -lintl $LIBICONV" + cat > conftest.$ac_ext <<EOF -#line 2506 "configure" -+ ac_save_LIBS="$LIBS" -+LIBS="-li $LIBS" -+cat > conftest.$ac_ext <<EOF -+#line 2602 "configure" ++#line 2493 "configure" #include "confdefs.h" --#include <libintl.h> --extern int _nl_msg_cat_cntr; -+ + #include <libintl.h> + extern int _nl_msg_cat_cntr; int main() { --bindtextdomain ("", ""); --return (int) gettext ("") + _nl_msg_cat_cntr -+main() + bindtextdomain ("", ""); + return (int) gettext ("") + _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:2515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* -- gt_cv_func_gnugettext1_libintl=yes -+ eval "ac_cv_lib_$ac_lib_var=yes" + gt_cv_func_gnugettext1_libintl=yes else echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* -- gt_cv_func_gnugettext1_libintl=no -+ eval "ac_cv_lib_$ac_lib_var=no" - fi - rm -f conftest* -- LIBS="$gt_save_LIBS" --fi -- --echo "$ac_t""$gt_cv_func_gnugettext1_libintl" 1>&6 -- fi -+LIBS="$ac_save_LIBS" - -- if test "$gt_cv_func_gnugettext1_libc" = "yes" \ -- || { test "$gt_cv_func_gnugettext1_libintl" = "yes" \ -- && test "$PACKAGE" != gettext; }; then -- cat >> confdefs.h <<\EOF --#define HAVE_GETTEXT 1 -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_lib=HAVE_LIB`echo i | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` -+ cat >> confdefs.h <<EOF -+#define $ac_tr_lib 1 - EOF - -+ LIBS="-li $LIBS" - -- if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then -- INTLLIBS="-lintl $LIBICONV" -- fi -- -- gt_save_LIBS="$LIBS" -- LIBS="$LIBS $INTLLIBS" -- for ac_func in dcgettext --do --echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +@@ -2543,14 +2530,14 @@ + LIBS="$LIBS $INTLLIBS" + for ac_func in dcgettext + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2548: checking for $ac_func" >&5 --if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ echo $ac_n "checking for catgets""... $ac_c" 1>&6 -+echo "configure:2637: checking for catgets" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then ++echo "configure:2535: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2553 "configure" -+#line 2642 "configure" ++#line 2540 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char $ac_func(); below. */ -+ which can conflict with char catgets(); below. */ + which can conflict with char $ac_func(); below. */ #include <assert.h> - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ --char $ac_func(); -+char catgets(); - - int main() { - - /* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ --#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+#if defined (__stub_catgets) || defined (__stub___catgets) - choke me - #else --$ac_func(); -+catgets(); +@@ -2571,9 +2558,9 @@ #endif ; return 0; } EOF -if { (eval echo configure:2576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* -- eval "ac_cv_func_$ac_func=yes" -+ eval "ac_cv_func_catgets=yes" + eval "ac_cv_func_$ac_func=yes" else echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* -- eval "ac_cv_func_$ac_func=no" -+ eval "ac_cv_func_catgets=no" - fi - rm -f conftest* - fi - --if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then -+if eval "test \"`echo '$ac_cv_func_'catgets`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -- cat >> confdefs.h <<EOF --#define $ac_tr_func 1 -+ cat >> confdefs.h <<\EOF -+#define HAVE_CATGETS 1 - EOF -- --else -- echo "$ac_t""no" 1>&6 --fi --done -- -- LIBS="$gt_save_LIBS" +@@ -2600,9 +2587,9 @@ -- # Extract the first word of "msgfmt", so it can be a program name with args. --set dummy msgfmt; ac_word=$2 -+ INTLOBJS="\$(CATOBJS)" -+ # Extract the first word of "gencat", so it can be a program name with args. -+set dummy gencat; ac_word=$2 + # Extract the first word of "msgfmt", so it can be a program name with args. + set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2605: checking for $ac_word" >&5 --if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then -+echo "configure:2687: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_path_GENCAT'+set}'`\" = set"; then ++echo "configure:2592: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -- case "$MSGFMT" in -+ case "$GENCAT" in - /*) -- ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. -+ ac_cv_path_GENCAT="$GENCAT" # Let the user override the test with a path. -+ ;; -+ ?:/*) -+ ac_cv_path_GENCAT="$GENCAT" # Let the user override the test with a dos path. - ;; - *) -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" -- for ac_dir in $PATH; do -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then -- if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then -- ac_cv_path_MSGFMT="$ac_dir/$ac_word" -- break -- fi -+ ac_cv_path_GENCAT="$ac_dir/$ac_word" -+ break - fi - done - IFS="$ac_save_ifs" -- test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no" -+ test -z "$ac_cv_path_GENCAT" && ac_cv_path_GENCAT="no" - ;; - esac - fi --MSGFMT="$ac_cv_path_MSGFMT" --if test -n "$MSGFMT"; then -- echo "$ac_t""$MSGFMT" 1>&6 -+GENCAT="$ac_cv_path_GENCAT" -+if test -n "$GENCAT"; then -+ echo "$ac_t""$GENCAT" 1>&6 - else - echo "$ac_t""no" 1>&6 - fi -- if test "$MSGFMT" != "no"; then -- # Extract the first word of "gmsgfmt", so it can be a program name with args. -+ if test "$GENCAT" != "no"; then -+ # Extract the first word of "gmsgfmt", so it can be a program name with args. + case "$MSGFMT" in +@@ -2634,9 +2621,9 @@ + if test "$MSGFMT" != "no"; then + # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2639: checking for $ac_word" >&5 -+echo "configure:2723: checking for $ac_word" >&5 ++echo "configure:2626: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2657,7 +2741,7 @@ - fi - done - IFS="$ac_save_ifs" -- test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" -+ test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="no" - ;; - esac - fi -@@ -2668,12 +2752,46 @@ - echo "$ac_t""no" 1>&6 - fi + case "$GMSGFMT" in +@@ -2672,9 +2659,9 @@ -- fi -+ if test "$GMSGFMT" = "no"; then -+ # Extract the first word of "msgfmt", so it can be a program name with args. -+set dummy msgfmt; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:2760: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ case "$GMSGFMT" in -+ /*) -+ ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. -+ ;; -+ *) -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" -+ for ac_dir in $PATH; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then -+ ac_cv_path_GMSGFMT="$ac_dir/$ac_word" -+ break -+ fi -+ fi -+ done -+ IFS="$ac_save_ifs" -+ test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="no" -+ ;; -+esac -+fi -+GMSGFMT="$ac_cv_path_GMSGFMT" -+if test -n "$GMSGFMT"; then -+ echo "$ac_t""$GMSGFMT" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi - -- # Extract the first word of "xgettext", so it can be a program name with args. -+ fi -+ # Extract the first word of "xgettext", so it can be a program name with args. + # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2677: checking for $ac_word" >&5 -+echo "configure:2795: checking for $ac_word" >&5 ++echo "configure:2664: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2704,14 +2822,22 @@ - echo "$ac_t""no" 1>&6 - fi - -- -- CATOBJEXT=.gmo -- fi -- -+ USE_INCLUDED_LIBINTL=yes -+ CATOBJEXT=.cat -+ INSTOBJEXT=.cat -+ DATADIRNAME=lib -+ INTLDEPS='$(top_builddir)/intl/libintl.a' -+ INTLLIBS=$INTLDEPS -+ LIBS=`echo $LIBS | sed -e 's/-lintl//'` -+ nls_cv_header_intl=intl/libintl.h -+ nls_cv_header_libgt=intl/libgettext.h -+ fi - else - echo "$ac_t""no" 1>&6 - fi - -+ fi -+ fi - - if test "$CATOBJEXT" = "NONE"; then - nls_cv_use_gnu_gettext=yes -@@ -2723,7 +2849,7 @@ + case "$XGETTEXT" in +@@ -2722,9 +2709,9 @@ + INTLOBJS="\$(GETTOBJS)" # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2727: checking for $ac_word" >&5 -+echo "configure:2853: checking for $ac_word" >&5 ++echo "configure:2714: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2757,7 +2883,7 @@ + case "$MSGFMT" in +@@ -2756,9 +2743,9 @@ + # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2761: checking for $ac_word" >&5 -+echo "configure:2887: checking for $ac_word" >&5 ++echo "configure:2748: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2793,7 +2919,7 @@ + case "$GMSGFMT" in +@@ -2792,9 +2779,9 @@ + # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2797: checking for $ac_word" >&5 -+echo "configure:2923: checking for $ac_word" >&5 ++echo "configure:2784: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2825,11 +2951,15 @@ - fi - - -- BUILD_INCLUDED_LIBINTL=yes - USE_INCLUDED_LIBINTL=yes - CATOBJEXT=.gmo -- INTLLIBS="\$(top_builddir)/intl/libintl.a $LIBICONV" -- LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` -+ INSTOBJEXT=.mo -+ DATADIRNAME=share -+ INTLDEPS='$(top_builddir)/intl/libintl.a' -+ INTLLIBS=$INTLDEPS -+ LIBS=`echo $LIBS | sed -e 's/-lintl//'` -+ nls_cv_header_intl=intl/libintl.h -+ nls_cv_header_libgt=intl/libgettext.h - fi - - if test "$XGETTEXT" != ":"; then -@@ -2841,65 +2971,22 @@ - fi - fi - -- POSUB=po -+ # We need to process the po/ directory. -+ POSUB=po -+ else -+ DATADIRNAME=share -+ nls_cv_header_intl=intl/libintl.h -+ nls_cv_header_libgt=intl/libgettext.h - fi - -+ - - -- if test "$PACKAGE" = gettext; then -- BUILD_INCLUDED_LIBINTL=yes -- fi -- -- for ac_prog in bison --do --# Extract the first word of "$ac_prog", so it can be a program name with args. --set dummy $ac_prog; ac_word=$2 --echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 + case "$XGETTEXT" in +@@ -2854,9 +2841,9 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2859: checking for $ac_word" >&5 --if eval "test \"`echo '$''{'ac_cv_prog_INTLBISON'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- if test -n "$INTLBISON"; then -- ac_cv_prog_INTLBISON="$INTLBISON" # Let the user override the test. --else -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -- ac_dummy="$PATH" -- for ac_dir in $ac_dummy; do -- test -z "$ac_dir" && ac_dir=. -- if test -f $ac_dir/$ac_word; then -- ac_cv_prog_INTLBISON="$ac_prog" -- break -- fi -- done -- IFS="$ac_save_ifs" --fi --fi --INTLBISON="$ac_cv_prog_INTLBISON" --if test -n "$INTLBISON"; then -- echo "$ac_t""$INTLBISON" 1>&6 --else -- echo "$ac_t""no" 1>&6 --fi -- --test -n "$INTLBISON" && break --done -- -- if test -z "$INTLBISON"; then -- ac_verc_fail=yes -- else -- echo $ac_n "checking version of bison""... $ac_c" 1>&6 ++echo "configure:2846: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_INTLBISON'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + if test -n "$INTLBISON"; then +@@ -2887,9 +2874,9 @@ + if test -z "$INTLBISON"; then + ac_verc_fail=yes + else + echo $ac_n "checking version of bison""... $ac_c" 1>&6 -echo "configure:2892: checking version of bison" >&5 -- ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison .* \([0-9]*\.[0-9.]*\).*$/\1/p'` -- case $ac_prog_version in -- '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; -- 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) -- ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; -- *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; -- esac -- echo "$ac_t""$ac_prog_version" 1>&6 -- fi -- if test $ac_verc_fail = yes; then -- INTLBISON=: -+ # If this is used in GNU gettext we have to set USE_NLS to `yes' -+ # because some of the sources are only built for this goal. -+ if test "$PACKAGE" = gettext; then -+ USE_NLS=yes -+ USE_INCLUDED_LIBINTL=yes - fi - - for lang in $ALL_LINGUAS; do -@@ -2916,17 +3003,7 @@ - - - -- -- nls_cv_header_intl= -- nls_cv_header_libgt= -- -- DATADIRNAME=share -- -- -- INSTOBJEXT=.mo - -- -- GENCAT=gencat - - - -@@ -2935,23 +3012,12 @@ ++echo "configure:2879: checking version of bison" >&5 + ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison .* \([0-9]*\.[0-9.]*\).*$/\1/p'` + case $ac_prog_version in + '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; + 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) +@@ -2934,9 +2921,9 @@ + if test "x$ALL_LINGUAS" = "x"; then LINGUAS= else echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:2939: checking for catalogs to be installed" >&5 -+echo "configure:3016: checking for catalogs to be installed" >&5 ++echo "configure:2926: checking for catalogs to be installed" >&5 NEW_LINGUAS= -- for presentlang in $ALL_LINGUAS; do -- useit=no -- for desiredlang in ${LINGUAS-$ALL_LINGUAS}; do -- # Use the presentlang catalog if desiredlang is -- # a. equal to presentlang, or -- # b. a variant of presentlang (because in this case, -- # presentlang can be used as a fallback for messages -- # which are not translated in the desiredlang catalog). -- case "$desiredlang" in -- "$presentlang"*) useit=yes;; -- esac -- done -- if test $useit = yes; then -- NEW_LINGUAS="$NEW_LINGUAS $presentlang" -- fi -+ for lang in ${LINGUAS=$ALL_LINGUAS}; do -+ case "$ALL_LINGUAS" in -+ *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;; -+ esac - done - LINGUAS=$NEW_LINGUAS - echo "$ac_t""$LINGUAS" 1>&6 -@@ -2962,6 +3028,66 @@ - fi - fi - -+ if test $ac_cv_header_locale_h = yes; then -+ INCLUDE_LOCALE_H="#include <locale.h>" -+ else -+ INCLUDE_LOCALE_H="\ -+/* The system does not provide the header <locale.h>. Take care yourself. */" -+ fi -+ -+ -+ test -d intl || mkdir intl -+ if test "$CATOBJEXT" = ".cat"; then -+ ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6 -+echo "configure:3044: checking for linux/version.h" >&5 -+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext <<EOF -+#line 3049 "configure" -+#include "confdefs.h" -+#include <linux/version.h> -+EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:3054: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -+if test -z "$ac_err"; then -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=yes" -+else -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=no" -+fi -+rm -f conftest* -+fi -+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ msgformat=linux -+else -+ echo "$ac_t""no" 1>&6 -+msgformat=xopen -+fi -+ -+ -+ sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed -+ fi -+ sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \ -+ $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed -+ -+ if test "$PACKAGE" = "gettext"; then -+ GT_NO="#NO#" -+ GT_YES= -+ else -+ GT_NO= -+ GT_YES="#YES#" -+ fi -+ -+ -+ - MKINSTALLDIRS= - if test -n "$ac_aux_dir"; then - MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" -@@ -2971,14 +3097,28 @@ - fi - - -- INTL_LIBTOOL_SUFFIX_PREFIX= -+ l= - -+ -+ test -d po || mkdir po -+ if test "x$srcdir" != "x."; then -+ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then -+ posrcprefix="$srcdir/" -+ else -+ posrcprefix="../$srcdir/" -+ fi -+ else -+ posrcprefix="../" -+ fi -+ rm -f po/POTFILES -+ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ -+ < $srcdir/po/POTFILES.in > po/POTFILES - + for presentlang in $ALL_LINGUAS; do + useit=no + for desiredlang in ${LINGUAS-$ALL_LINGUAS}; do +@@ -2977,9 +2964,9 @@ # Extract the first word of "sed", so it can be a program name with args. set dummy sed; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2982: checking for $ac_word" >&5 -+echo "configure:3122: checking for $ac_word" >&5 ++echo "configure:2969: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_sedpath'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -3017,7 +3157,7 @@ + case "$sedpath" in +@@ -3016,9 +3003,9 @@ + # Extract the first word of "uname", so it can be a program name with args. set dummy uname; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3021: checking for $ac_word" >&5 -+echo "configure:3161: checking for $ac_word" >&5 ++echo "configure:3008: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_unamepath'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -3053,7 +3193,7 @@ + case "$unamepath" in +@@ -3052,9 +3039,9 @@ + if test "_$unamepath" = _; then system="unknown" else echo $ac_n "checking system type""... $ac_c" 1>&6 -echo "configure:3057: checking system type" >&5 -+echo "configure:3197: checking system type" >&5 ++echo "configure:3044: checking system type" >&5 system=`$unamepath -s` echo "$ac_t""$system" 1>&6 if test "$system" = "Linux"; then -@@ -3263,7 +3403,7 @@ + cat >> confdefs.h <<\EOF +@@ -3262,17 +3249,17 @@ + if test "$glib" = no; then glibreplace=yes gtkfe=no echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:3267: checking for dlopen in -ldl" >&5 -+echo "configure:3407: checking for dlopen in -ldl" >&5 ++echo "configure:3254: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -3271,7 +3411,7 @@ + else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF -#line 3275 "configure" -+#line 3415 "configure" ++#line 3262 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 -@@ -3282,7 +3422,7 @@ + builtin and then its argument prototype would still apply. */ +@@ -3281,9 +3268,9 @@ + int main() { dlopen() ; return 0; } EOF -if { (eval echo configure:3286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:3273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -3368,7 +3508,7 @@ + echo "configure: failed program was:" >&5 +@@ -3367,9 +3354,9 @@ + # Extract the first word of "glib-config", so it can be a program name with args. set dummy glib-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3372: checking for $ac_word" >&5 -+echo "configure:3512: checking for $ac_word" >&5 ++echo "configure:3359: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -3403,7 +3543,7 @@ + case "$GLIB_CONFIG" in +@@ -3402,9 +3389,9 @@ + fi min_glib_version=1.2.0 echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 -echo "configure:3407: checking for GLIB - version >= $min_glib_version" >&5 -+echo "configure:3547: checking for GLIB - version >= $min_glib_version" >&5 ++echo "configure:3394: checking for GLIB - version >= $min_glib_version" >&5 no_glib="" if test "$GLIB_CONFIG" = "no" ; then no_glib=yes -@@ -3426,7 +3566,7 @@ + else +@@ -3425,9 +3412,9 @@ + if test "$cross_compiling" = yes; then echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext <<EOF -#line 3430 "configure" -+#line 3570 "configure" ++#line 3417 "configure" #include "confdefs.h" #include <glib.h> -@@ -3502,7 +3642,7 @@ + #include <stdio.h> +@@ -3501,9 +3488,9 @@ + return 1; } EOF -if { (eval echo configure:3506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:3646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:3493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else -@@ -3522,7 +3662,7 @@ + echo "configure: failed program was:" >&5 +@@ -3521,17 +3508,17 @@ + if test "x$no_glib" = x ; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for Glib compile flags""... $ac_c" 1>&6 -echo "configure:3526: checking for Glib compile flags" >&5 -+echo "configure:3666: checking for Glib compile flags" >&5 ++echo "configure:3513: checking for Glib compile flags" >&5 GLIB_CFLAGS=`$GLIB_CONFIG --cflags` GLIB_LIBS=`$GLIB_CONFIG gmodule --libs` CFLAGS="$CFLAGS $GLIB_CFLAGS" -@@ -3530,7 +3670,7 @@ + LIBS="$LIBS $GLIB_LIBS" echo "$ac_t""ok" 1>&6 if test "$prefix" = "NONE"; then echo $ac_n "checking glib-config for prefix""... $ac_c" 1>&6 -echo "configure:3534: checking glib-config for prefix" >&5 -+echo "configure:3674: checking glib-config for prefix" >&5 ++echo "configure:3521: checking glib-config for prefix" >&5 prefix=`$GLIB_CONFIG --prefix` echo "$ac_t""$prefix" 1>&6 fi -@@ -3553,7 +3693,7 @@ + cat >> confdefs.h <<EOF +@@ -3552,9 +3539,9 @@ + echo "*** Could not run GLIB test program, checking why..." CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS $GLIB_LIBS" cat > conftest.$ac_ext <<EOF -#line 3557 "configure" -+#line 3697 "configure" ++#line 3544 "configure" #include "confdefs.h" #include <glib.h> -@@ -3563,7 +3703,7 @@ + #include <stdio.h> +@@ -3562,9 +3549,9 @@ + int main() { return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ; return 0; } EOF -if { (eval echo configure:3567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:3554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GLIB or finding the wrong" -@@ -3603,7 +3743,7 @@ + echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" +@@ -3602,17 +3589,17 @@ + echo "configure: warning: Cannot find GLIB! Not building GTK frontend" 1>&2 fi echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:3607: checking for dlopen in -ldl" >&5 -+echo "configure:3747: checking for dlopen in -ldl" >&5 ++echo "configure:3594: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -3611,7 +3751,7 @@ + else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF -#line 3615 "configure" -+#line 3755 "configure" ++#line 3602 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 -@@ -3622,7 +3762,7 @@ + builtin and then its argument prototype would still apply. */ +@@ -3621,9 +3608,9 @@ + int main() { dlopen() ; return 0; } EOF -if { (eval echo configure:3626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:3613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -3711,7 +3851,7 @@ + echo "configure: failed program was:" >&5 +@@ -3710,9 +3697,9 @@ + # Extract the first word of "gtk-config", so it can be a program name with args. set dummy gtk-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3715: checking for $ac_word" >&5 -+echo "configure:3855: checking for $ac_word" >&5 ++echo "configure:3702: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -3746,7 +3886,7 @@ + case "$GTK_CONFIG" in +@@ -3745,9 +3732,9 @@ + fi min_gtk_version=1.2.0 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:3750: checking for GTK - version >= $min_gtk_version" >&5 -+echo "configure:3890: checking for GTK - version >= $min_gtk_version" >&5 ++echo "configure:3737: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" = "no" ; then no_gtk=yes -@@ -3769,7 +3909,7 @@ + else +@@ -3768,9 +3755,9 @@ + if test "$cross_compiling" = yes; then echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext <<EOF -#line 3773 "configure" -+#line 3913 "configure" ++#line 3760 "configure" #include "confdefs.h" #include <gtk/gtk.h> -@@ -3847,7 +3987,7 @@ + #include <stdio.h> +@@ -3846,9 +3833,9 @@ + return 1; } EOF -if { (eval echo configure:3851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:3991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:3838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else -@@ -3881,7 +4021,7 @@ + echo "configure: failed program was:" >&5 +@@ -3880,9 +3867,9 @@ + echo "*** Could not run GTK test program, checking why..." CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext <<EOF -#line 3885 "configure" -+#line 4025 "configure" ++#line 3872 "configure" #include "confdefs.h" #include <gtk/gtk.h> -@@ -3891,7 +4031,7 @@ + #include <stdio.h> +@@ -3890,9 +3877,9 @@ + int main() { return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ; return 0; } EOF -if { (eval echo configure:3895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:3882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GTK or finding the wrong" -@@ -3951,7 +4091,7 @@ + echo "*** version of GTK. If it is not finding GTK, you'll need to set your" +@@ -3950,9 +3937,9 @@ + if test "$gnome" = yes; then # Extract the first word of "gnome-config", so it can be a program name with args. set dummy gnome-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3955: checking for $ac_word" >&5 -+echo "configure:4095: checking for $ac_word" >&5 ++echo "configure:3942: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_gnomepath'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -3984,7 +4124,7 @@ + case "$gnomepath" in +@@ -3983,9 +3970,9 @@ + echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for Gnome compile flags""... $ac_c" 1>&6 -echo "configure:3988: checking for Gnome compile flags" >&5 -+echo "configure:4128: checking for Gnome compile flags" >&5 ++echo "configure:3975: checking for Gnome compile flags" >&5 GNOME_CFLAGS=`$gnomepath gnomeui --cflags 2>/dev/null` if test "_$GNOME_CFLAGS" = _ ; then gnome=no -@@ -4012,7 +4152,7 @@ + echo "$ac_t""Gnome not found, building without it." 1>&6 +@@ -4011,9 +3998,9 @@ + if test "$gnome" = no; then # Extract the first word of "gnome-config", so it can be a program name with args. set dummy gnome-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4016: checking for $ac_word" >&5 -+echo "configure:4156: checking for $ac_word" >&5 ++echo "configure:4003: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_gnomepath'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -4046,7 +4186,7 @@ + case "$gnomepath" in +@@ -4045,9 +4032,9 @@ + fi fi echo $ac_n "checking for zvt""... $ac_c" 1>&6 -echo "configure:4050: checking for zvt" >&5 -+echo "configure:4190: checking for zvt" >&5 ++echo "configure:4037: checking for zvt" >&5 if test "_$gnomepath" = "_"; then echo "$ac_t""No gnome-config, can't do it." 1>&6 zvt=no -@@ -4068,7 +4208,7 @@ + else +@@ -4067,9 +4054,9 @@ + if test "$gdk_pixbuf" = yes ; then # Extract the first word of "gdk-pixbuf-config", so it can be a program name with args. set dummy gdk-pixbuf-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4072: checking for $ac_word" >&5 -+echo "configure:4212: checking for $ac_word" >&5 ++echo "configure:4059: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_gdkpixbufpath'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -4104,7 +4244,7 @@ + case "$gdkpixbufpath" in +@@ -4103,9 +4090,9 @@ + if test "$gnome" = no; then # Extract the first word of "gnome-config", so it can be a program name with args. set dummy gnome-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4108: checking for $ac_word" >&5 -+echo "configure:4248: checking for $ac_word" >&5 ++echo "configure:4095: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_gnomepath'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -4138,7 +4278,7 @@ + case "$gnomepath" in +@@ -4137,9 +4124,9 @@ + fi fi echo $ac_n "checking for gdk-pixbuf >= 0.8""... $ac_c" 1>&6 -echo "configure:4142: checking for gdk-pixbuf >= 0.8" >&5 -+echo "configure:4282: checking for gdk-pixbuf >= 0.8" >&5 ++echo "configure:4129: checking for gdk-pixbuf >= 0.8" >&5 GDK_PIXBUF_CFLAGS=`$gdkpixbufpath --cflags 2>/dev/null` GDK_PIXBUF_LIBS=`$gdkpixbufpath --libs 2>/dev/null` if test "_$GDK_PIXBUF_CFLAGS" = _; then -@@ -4172,7 +4312,7 @@ + echo "$ac_t""not found, building without gdk-pixbuf." 1>&6 +@@ -4171,9 +4158,9 @@ + if test "$perl" = yes; then # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4176: checking for $ac_word" >&5 -+echo "configure:4316: checking for $ac_word" >&5 ++echo "configure:4163: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_perlpath'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -4205,7 +4345,7 @@ + case "$perlpath" in +@@ -4204,9 +4191,9 @@ + echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for Perl compile flags""... $ac_c" 1>&6 -echo "configure:4209: checking for Perl compile flags" >&5 -+echo "configure:4349: checking for Perl compile flags" >&5 ++echo "configure:4196: checking for Perl compile flags" >&5 PERL_CFLAGS=`$perlpath -MExtUtils::Embed -e ccopts 2>/dev/null` if test "_$PERL_CFLAGS" = _ ; then echo "$ac_t""not found, building without perl." 1>&6 -@@ -4229,12 +4369,12 @@ + perl=no +@@ -4228,14 +4215,14 @@ + for ac_func in eval_pv do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4233: checking for $ac_func" >&5 -+echo "configure:4373: checking for $ac_func" >&5 ++echo "configure:4220: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4238 "configure" -+#line 4378 "configure" ++#line 4225 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ -@@ -4257,7 +4397,7 @@ + #include <assert.h> +@@ -4256,9 +4243,9 @@ + #endif ; return 0; } EOF -if { (eval echo configure:4261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else -@@ -4283,7 +4423,7 @@ + echo "configure: failed program was:" >&5 +@@ -4282,9 +4269,9 @@ + done echo $ac_n "checking for old perl""... $ac_c" 1>&6 -echo "configure:4287: checking for old perl" >&5 -+echo "configure:4427: checking for old perl" >&5 ++echo "configure:4274: checking for old perl" >&5 PERL_OLD=`$perlpath -e 'if($]<5.006){printf"yes\n";}else{printf"no\n";}'` if test "$PERL_OLD" = "yes"; then cat >> confdefs.h <<\EOF -@@ -4303,7 +4443,7 @@ + #define OLD_PERL 1 +@@ -4302,9 +4289,9 @@ + if test "$python" = yes; then # Extract the first word of "python", so it can be a program name with args. set dummy python; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4307: checking for $ac_word" >&5 -+echo "configure:4447: checking for $ac_word" >&5 ++echo "configure:4294: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_pythonpath'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -4339,12 +4479,52 @@ + case "$pythonpath" in +@@ -4338,9 +4325,9 @@ + if test "_$pythonpath" = _ ; then python=no else echo $ac_n "checking for Python compile flags""... $ac_c" 1>&6 -echo "configure:4343: checking for Python compile flags" >&5 -+echo "configure:4483: checking for Python compile flags" >&5 ++echo "configure:4330: checking for Python compile flags" >&5 PY_PREFIX=`$pythonpath -c 'import sys ; print sys.prefix'` PY_EXEC_PREFIX=`$pythonpath -c 'import sys ; print sys.exec_prefix'` PY_VERSION=`$pythonpath -c 'import sys ; print sys.version[0:3]'` PY_MAJOR=`$pythonpath -c 'import sys ; print sys.version[0:2]'` -- if test -f $PY_PREFIX/include/python$PY_VERSION/Python.h; then -+ echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6 -+echo "configure:4489: checking for openpty in -lutil" >&5 -+ac_lib_var=`echo util'_'openpty | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lutil $LIBS" -+cat > conftest.$ac_ext <<EOF -+#line 4497 "configure" -+#include "confdefs.h" -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char openpty(); -+ -+int main() { -+openpty() -+; return 0; } -+EOF -+if { (eval echo configure:4508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ LIBS="$LIBS -lutil" -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ if test -f $PY_PREFIX/include/python$PY_VERSION/Python.h; then - PY_LIBS="-lpython$PY_VERSION" - PY_LIB_LOC="-L$PY_EXEC_PREFIX/lib/python$PY_VERSION/config" - PY_CFLAGS="-I$PY_PREFIX/include/python$PY_VERSION" -@@ -4354,7 +4534,7 @@ +@@ -4353,17 +4340,17 @@ + EOF echo "$ac_t""ok" 1>&6 echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:4358: checking for pthread_create in -lpthread" >&5 -+echo "configure:4538: checking for pthread_create in -lpthread" >&5 ++echo "configure:4345: checking for pthread_create in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4362,7 +4542,7 @@ + else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <<EOF -#line 4366 "configure" -+#line 4546 "configure" ++#line 4353 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 -@@ -4373,7 +4553,7 @@ + builtin and then its argument prototype would still apply. */ +@@ -4372,9 +4359,9 @@ + int main() { pthread_create() ; return 0; } EOF -if { (eval echo configure:4377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -4402,7 +4582,7 @@ + echo "configure: failed program was:" >&5 +@@ -4401,17 +4388,17 @@ + fi if test "$PY_MAJOR" = "2."; then echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6 -echo "configure:4406: checking for openpty in -lutil" >&5 -+echo "configure:4586: checking for openpty in -lutil" >&5 ++echo "configure:4393: checking for openpty in -lutil" >&5 ac_lib_var=`echo util'_'openpty | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4410,7 +4590,7 @@ + else ac_save_LIBS="$LIBS" LIBS="-lutil $LIBS" cat > conftest.$ac_ext <<EOF -#line 4414 "configure" -+#line 4594 "configure" ++#line 4401 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 -@@ -4421,7 +4601,7 @@ + builtin and then its argument prototype would still apply. */ +@@ -4420,9 +4407,9 @@ + int main() { openpty() ; return 0; } EOF -if { (eval echo configure:4425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -4449,7 +4629,7 @@ + echo "configure: failed program was:" >&5 +@@ -4448,17 +4435,17 @@ + echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for dbopen in -ldb""... $ac_c" 1>&6 -echo "configure:4453: checking for dbopen in -ldb" >&5 -+echo "configure:4633: checking for dbopen in -ldb" >&5 ++echo "configure:4440: checking for dbopen in -ldb" >&5 ac_lib_var=`echo db'_'dbopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4457,7 +4637,7 @@ + else ac_save_LIBS="$LIBS" LIBS="-ldb $LIBS" cat > conftest.$ac_ext <<EOF -#line 4461 "configure" -+#line 4641 "configure" ++#line 4448 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 -@@ -4468,7 +4648,7 @@ + builtin and then its argument prototype would still apply. */ +@@ -4467,9 +4454,9 @@ + int main() { dbopen() ; return 0; } EOF -if { (eval echo configure:4472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -4514,7 +4694,7 @@ + echo "configure: failed program was:" >&5 +@@ -4513,17 +4500,17 @@ + if test "$gnome" = yes; then oldLIBS=$LIBS LIBS="$LIBS `$gnomepath applets --libs`" echo $ac_n "checking for applet_widget_init in -lpanel_applet""... $ac_c" 1>&6 -echo "configure:4518: checking for applet_widget_init in -lpanel_applet" >&5 -+echo "configure:4698: checking for applet_widget_init in -lpanel_applet" >&5 ++echo "configure:4505: checking for applet_widget_init in -lpanel_applet" >&5 ac_lib_var=`echo panel_applet'_'applet_widget_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4522,7 +4702,7 @@ + else ac_save_LIBS="$LIBS" LIBS="-lpanel_applet $LIBS" cat > conftest.$ac_ext <<EOF -#line 4526 "configure" -+#line 4706 "configure" ++#line 4513 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 -@@ -4533,7 +4713,7 @@ + builtin and then its argument prototype would still apply. */ +@@ -4532,9 +4519,9 @@ + int main() { applet_widget_init() ; return 0; } EOF -if { (eval echo configure:4537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -4574,12 +4754,12 @@ + echo "configure: failed program was:" >&5 +@@ -4573,14 +4560,14 @@ + if test "$ipv6" = yes; then for ac_func in getaddrinfo do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4578: checking for $ac_func" >&5 -+echo "configure:4758: checking for $ac_func" >&5 ++echo "configure:4565: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4583 "configure" -+#line 4763 "configure" ++#line 4570 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ -@@ -4602,7 +4782,7 @@ + #include <assert.h> +@@ -4601,9 +4588,9 @@ + #endif ; return 0; } EOF -if { (eval echo configure:4606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else -@@ -4627,7 +4807,7 @@ + echo "configure: failed program was:" >&5 +@@ -4626,9 +4613,9 @@ + fi done echo $ac_n "checking whether to enable IPv6 support""... $ac_c" 1>&6 -echo "configure:4631: checking whether to enable IPv6 support" >&5 -+echo "configure:4811: checking whether to enable IPv6 support" >&5 ++echo "configure:4618: checking whether to enable IPv6 support" >&5 if test "$have_getaddrinfo" = yes; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF -@@ -4653,7 +4833,7 @@ + #define USE_IPV6 1 +@@ -4652,17 +4639,17 @@ + if test -n "$openssl_path"; then LIBS="-L$openssl_path/lib $LIBS" fi echo $ac_n "checking for SSL_new in -lssl""... $ac_c" 1>&6 -echo "configure:4657: checking for SSL_new in -lssl" >&5 -+echo "configure:4837: checking for SSL_new in -lssl" >&5 ++echo "configure:4644: checking for SSL_new in -lssl" >&5 ac_lib_var=`echo ssl'_'SSL_new | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4661,7 +4841,7 @@ + else ac_save_LIBS="$LIBS" LIBS="-lssl $LIBS" cat > conftest.$ac_ext <<EOF -#line 4665 "configure" -+#line 4845 "configure" ++#line 4652 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 -@@ -4672,7 +4852,7 @@ + builtin and then its argument prototype would still apply. */ +@@ -4671,9 +4658,9 @@ + int main() { SSL_new() ; return 0; } EOF -if { (eval echo configure:4676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -4702,17 +4882,17 @@ + echo "configure: failed program was:" >&5 +@@ -4701,19 +4688,19 @@ + for ac_hdr in openssl/ssl.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4706: checking for $ac_hdr" >&5 -+echo "configure:4886: checking for $ac_hdr" >&5 ++echo "configure:4693: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4711 "configure" -+#line 4891 "configure" ++#line 4698 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4716: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:4896: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:4703: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* -@@ -4759,12 +4939,12 @@ + eval "ac_cv_header_$ac_safe=yes" +@@ -4758,14 +4745,14 @@ + if test "$plugin" = yes; then for ac_func in dlopen do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4763: checking for $ac_func" >&5 -+echo "configure:4943: checking for $ac_func" >&5 ++echo "configure:4750: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4768 "configure" -+#line 4948 "configure" ++#line 4755 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ -@@ -4787,7 +4967,7 @@ + #include <assert.h> +@@ -4786,9 +4773,9 @@ + #endif ; return 0; } EOF -if { (eval echo configure:4791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else -@@ -4815,12 +4995,12 @@ + echo "configure: failed program was:" >&5 +@@ -4814,14 +4801,14 @@ + if test "$have_dl" = yes; then for ac_func in dlerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4819: checking for $ac_func" >&5 -+echo "configure:4999: checking for $ac_func" >&5 ++echo "configure:4806: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4824 "configure" -+#line 5004 "configure" ++#line 4811 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ -@@ -4843,7 +5023,7 @@ + #include <assert.h> +@@ -4842,9 +4829,9 @@ + #endif ; return 0; } EOF -if { (eval echo configure:4847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else -@@ -4963,7 +5143,7 @@ + echo "configure: failed program was:" >&5 +@@ -4953,17 +4940,17 @@ + if test "$socks" = yes; then socks=no echo $ac_n "checking for SOCKSconnect in -lsocks5""... $ac_c" 1>&6 --echo "configure:4967: checking for SOCKSconnect in -lsocks5" >&5 -+echo "configure:5147: checking for SOCKSconnect in -lsocks5" >&5 +-echo "configure:4958: checking for SOCKSconnect in -lsocks5" >&5 ++echo "configure:4945: checking for SOCKSconnect in -lsocks5" >&5 ac_lib_var=`echo socks5'_'SOCKSconnect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4971,7 +5151,7 @@ + else ac_save_LIBS="$LIBS" LIBS="-lsocks5 $LIBS" cat > conftest.$ac_ext <<EOF --#line 4975 "configure" -+#line 5155 "configure" +-#line 4966 "configure" ++#line 4953 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 -@@ -4982,7 +5162,7 @@ + builtin and then its argument prototype would still apply. */ +@@ -4972,9 +4959,9 @@ + int main() { SOCKSconnect() ; return 0; } EOF --if { (eval echo configure:4986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:4977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -5007,17 +5187,17 @@ + echo "configure: failed program was:" >&5 +@@ -4997,19 +4984,19 @@ + for ac_hdr in socks.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:5011: checking for $ac_hdr" >&5 -+echo "configure:5191: checking for $ac_hdr" >&5 +-echo "configure:5002: checking for $ac_hdr" >&5 ++echo "configure:4989: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF --#line 5016 "configure" -+#line 5196 "configure" +-#line 5007 "configure" ++#line 4994 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:5021: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:5201: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:5012: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:4999: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* -@@ -5074,17 +5254,17 @@ + eval "ac_cv_header_$ac_safe=yes" +@@ -5064,19 +5051,19 @@ + if test "$WITH_JAPANESE" = "yes"; then ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for iconv.h""... $ac_c" 1>&6 --echo "configure:5078: checking for iconv.h" >&5 -+echo "configure:5258: checking for iconv.h" >&5 +-echo "configure:5069: checking for iconv.h" >&5 ++echo "configure:5056: checking for iconv.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF --#line 5083 "configure" -+#line 5263 "configure" +-#line 5074 "configure" ++#line 5061 "configure" #include "confdefs.h" #include <iconv.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:5088: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:5268: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:5079: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:5066: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* -@@ -5121,7 +5301,7 @@ + eval "ac_cv_header_$ac_safe=yes" +@@ -5111,9 +5098,9 @@ + fi echo $ac_n "checking for i386/MMX support""... $ac_c" 1>&6 --echo "configure:5125: checking for i386/MMX support" >&5 -+echo "configure:5305: checking for i386/MMX support" >&5 +-echo "configure:5116: checking for i386/MMX support" >&5 ++echo "configure:5103: checking for i386/MMX support" >&5 if test "$mmx" = "yes"; then machine=`uname -m` case $machine in -@@ -5174,12 +5354,12 @@ + i386|i486|i586|i686|i786) +@@ -5164,14 +5151,14 @@ + for ac_func in snprintf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:5178: checking for $ac_func" >&5 -+echo "configure:5358: checking for $ac_func" >&5 +-echo "configure:5169: checking for $ac_func" >&5 ++echo "configure:5156: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF --#line 5183 "configure" -+#line 5363 "configure" +-#line 5174 "configure" ++#line 5161 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ -@@ -5202,7 +5382,7 @@ + #include <assert.h> +@@ -5192,9 +5179,9 @@ + #endif ; return 0; } EOF --if { (eval echo configure:5206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:5197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else -@@ -5230,12 +5410,12 @@ + echo "configure: failed program was:" >&5 +@@ -5220,14 +5207,14 @@ + for ac_func in vsnprintf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:5234: checking for $ac_func" >&5 -+echo "configure:5414: checking for $ac_func" >&5 +-echo "configure:5225: checking for $ac_func" >&5 ++echo "configure:5212: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF --#line 5239 "configure" -+#line 5419 "configure" +-#line 5230 "configure" ++#line 5217 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ -@@ -5258,7 +5438,7 @@ + #include <assert.h> +@@ -5248,9 +5235,9 @@ + #endif ; return 0; } EOF --if { (eval echo configure:5262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:5253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else -@@ -5286,12 +5466,12 @@ + echo "configure: failed program was:" >&5 +@@ -5276,14 +5263,14 @@ + for ac_func in setenv do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:5290: checking for $ac_func" >&5 -+echo "configure:5470: checking for $ac_func" >&5 +-echo "configure:5281: checking for $ac_func" >&5 ++echo "configure:5268: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF --#line 5295 "configure" -+#line 5475 "configure" +-#line 5286 "configure" ++#line 5273 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ -@@ -5314,7 +5494,7 @@ + #include <assert.h> +@@ -5304,9 +5291,9 @@ + #endif ; return 0; } EOF --if { (eval echo configure:5318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:5309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else -@@ -5340,12 +5520,12 @@ + echo "configure: failed program was:" >&5 +@@ -5330,14 +5317,14 @@ + done echo $ac_n "checking for select""... $ac_c" 1>&6 --echo "configure:5344: checking for select" >&5 -+echo "configure:5524: checking for select" >&5 +-echo "configure:5335: checking for select" >&5 ++echo "configure:5322: checking for select" >&5 if eval "test \"`echo '$''{'ac_cv_func_select'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF --#line 5349 "configure" -+#line 5529 "configure" +-#line 5340 "configure" ++#line 5327 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char select(); below. */ -@@ -5368,7 +5548,7 @@ + #include <assert.h> +@@ -5358,9 +5345,9 @@ + #endif ; return 0; } EOF --if { (eval echo configure:5372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:5363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_select=yes" else -@@ -5386,7 +5566,7 @@ + echo "configure: failed program was:" >&5 +@@ -5376,17 +5363,17 @@ + : else echo "$ac_t""no" 1>&6 echo $ac_n "checking for select in -lsocket""... $ac_c" 1>&6 --echo "configure:5390: checking for select in -lsocket" >&5 -+echo "configure:5570: checking for select in -lsocket" >&5 +-echo "configure:5381: checking for select in -lsocket" >&5 ++echo "configure:5368: checking for select in -lsocket" >&5 ac_lib_var=`echo socket'_'select | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -5394,7 +5574,7 @@ + else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF --#line 5398 "configure" -+#line 5578 "configure" +-#line 5389 "configure" ++#line 5376 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 -@@ -5405,7 +5585,7 @@ + builtin and then its argument prototype would still apply. */ +@@ -5395,9 +5382,9 @@ + int main() { select() ; return 0; } EOF --if { (eval echo configure:5409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:5400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -5431,7 +5611,7 @@ + echo "configure: failed program was:" >&5 +@@ -5421,17 +5408,17 @@ + else echo "$ac_t""no" 1>&6 echo $ac_n "checking for select in -lnsl""... $ac_c" 1>&6 --echo "configure:5435: checking for select in -lnsl" >&5 -+echo "configure:5615: checking for select in -lnsl" >&5 +-echo "configure:5426: checking for select in -lnsl" >&5 ++echo "configure:5413: checking for select in -lnsl" >&5 ac_lib_var=`echo nsl'_'select | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -5439,7 +5619,7 @@ + else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF --#line 5443 "configure" -+#line 5623 "configure" +-#line 5434 "configure" ++#line 5421 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 -@@ -5450,7 +5630,7 @@ + builtin and then its argument prototype would still apply. */ +@@ -5440,9 +5427,9 @@ + int main() { select() ; return 0; } EOF --if { (eval echo configure:5454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:5445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -5476,7 +5656,7 @@ + echo "configure: failed program was:" >&5 +@@ -5466,17 +5453,17 @@ + else echo "$ac_t""no" 1>&6 echo $ac_n "checking for select in -linet""... $ac_c" 1>&6 --echo "configure:5480: checking for select in -linet" >&5 -+echo "configure:5660: checking for select in -linet" >&5 +-echo "configure:5471: checking for select in -linet" >&5 ++echo "configure:5458: checking for select in -linet" >&5 ac_lib_var=`echo inet'_'select | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -5484,7 +5664,7 @@ + else ac_save_LIBS="$LIBS" LIBS="-linet $LIBS" cat > conftest.$ac_ext <<EOF --#line 5488 "configure" -+#line 5668 "configure" +-#line 5479 "configure" ++#line 5466 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 -@@ -5495,7 +5675,7 @@ + builtin and then its argument prototype would still apply. */ +@@ -5485,9 +5472,9 @@ + int main() { select() ; return 0; } EOF --if { (eval echo configure:5499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:5490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -5521,7 +5701,7 @@ + echo "configure: failed program was:" >&5 +@@ -5511,17 +5498,17 @@ + else echo "$ac_t""no" 1>&6 echo $ac_n "checking for select in -lcposix""... $ac_c" 1>&6 --echo "configure:5525: checking for select in -lcposix" >&5 -+echo "configure:5705: checking for select in -lcposix" >&5 +-echo "configure:5516: checking for select in -lcposix" >&5 ++echo "configure:5503: checking for select in -lcposix" >&5 ac_lib_var=`echo cposix'_'select | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -5529,7 +5709,7 @@ + else ac_save_LIBS="$LIBS" LIBS="-lcposix $LIBS" cat > conftest.$ac_ext <<EOF --#line 5533 "configure" -+#line 5713 "configure" +-#line 5524 "configure" ++#line 5511 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 -@@ -5540,7 +5720,7 @@ + builtin and then its argument prototype would still apply. */ +@@ -5530,9 +5517,9 @@ + int main() { select() ; return 0; } EOF --if { (eval echo configure:5544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:5535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -5566,7 +5746,7 @@ + echo "configure: failed program was:" >&5 +@@ -5556,17 +5543,17 @@ + else echo "$ac_t""no" 1>&6 echo $ac_n "checking for select in -lnet""... $ac_c" 1>&6 --echo "configure:5570: checking for select in -lnet" >&5 -+echo "configure:5750: checking for select in -lnet" >&5 +-echo "configure:5561: checking for select in -lnet" >&5 ++echo "configure:5548: checking for select in -lnet" >&5 ac_lib_var=`echo net'_'select | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -5574,7 +5754,7 @@ + else ac_save_LIBS="$LIBS" LIBS="-lnet $LIBS" cat > conftest.$ac_ext <<EOF --#line 5578 "configure" -+#line 5758 "configure" +-#line 5569 "configure" ++#line 5556 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 -@@ -5585,7 +5765,7 @@ + builtin and then its argument prototype would still apply. */ +@@ -5575,9 +5562,9 @@ + int main() { select() ; return 0; } EOF --if { (eval echo configure:5589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:5580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -5625,7 +5805,7 @@ + echo "configure: failed program was:" >&5 +@@ -5615,17 +5602,17 @@ + fi echo $ac_n "checking for select in -lsocket""... $ac_c" 1>&6 --echo "configure:5629: checking for select in -lsocket" >&5 -+echo "configure:5809: checking for select in -lsocket" >&5 +-echo "configure:5620: checking for select in -lsocket" >&5 ++echo "configure:5607: checking for select in -lsocket" >&5 ac_lib_var=`echo socket'_'select | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -5633,7 +5813,7 @@ + else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF --#line 5637 "configure" -+#line 5817 "configure" +-#line 5628 "configure" ++#line 5615 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 -@@ -5644,7 +5824,7 @@ + builtin and then its argument prototype would still apply. */ +@@ -5634,9 +5621,9 @@ + int main() { select() ; return 0; } EOF --if { (eval echo configure:5648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:5639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -5673,12 +5853,12 @@ + echo "configure: failed program was:" >&5 +@@ -5663,14 +5650,14 @@ + fi echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 --echo "configure:5677: checking for gethostbyname" >&5 -+echo "configure:5857: checking for gethostbyname" >&5 +-echo "configure:5668: checking for gethostbyname" >&5 ++echo "configure:5655: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF --#line 5682 "configure" -+#line 5862 "configure" +-#line 5673 "configure" ++#line 5660 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname(); below. */ -@@ -5701,7 +5881,7 @@ + #include <assert.h> +@@ -5691,9 +5678,9 @@ + #endif ; return 0; } EOF --if { (eval echo configure:5705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:5696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else -@@ -5719,7 +5899,7 @@ + echo "configure: failed program was:" >&5 +@@ -5709,17 +5696,17 @@ + : else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lresolv""... $ac_c" 1>&6 --echo "configure:5723: checking for gethostbyname in -lresolv" >&5 -+echo "configure:5903: checking for gethostbyname in -lresolv" >&5 +-echo "configure:5714: checking for gethostbyname in -lresolv" >&5 ++echo "configure:5701: checking for gethostbyname in -lresolv" >&5 ac_lib_var=`echo resolv'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -5727,7 +5907,7 @@ + else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <<EOF --#line 5731 "configure" -+#line 5911 "configure" +-#line 5722 "configure" ++#line 5709 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 -@@ -5738,7 +5918,7 @@ + builtin and then its argument prototype would still apply. */ +@@ -5728,9 +5715,9 @@ + int main() { gethostbyname() ; return 0; } EOF --if { (eval echo configure:5742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:5733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -5764,7 +5944,7 @@ + echo "configure: failed program was:" >&5 +@@ -5754,17 +5741,17 @@ + else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 --echo "configure:5768: checking for gethostbyname in -lnsl" >&5 -+echo "configure:5948: checking for gethostbyname in -lnsl" >&5 +-echo "configure:5759: checking for gethostbyname in -lnsl" >&5 ++echo "configure:5746: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -5772,7 +5952,7 @@ + else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF --#line 5776 "configure" -+#line 5956 "configure" +-#line 5767 "configure" ++#line 5754 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 -@@ -5783,7 +5963,7 @@ + builtin and then its argument prototype would still apply. */ +@@ -5773,9 +5760,9 @@ + int main() { gethostbyname() ; return 0; } EOF --if { (eval echo configure:5787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:5778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -5816,12 +5996,12 @@ + echo "configure: failed program was:" >&5 +@@ -5806,14 +5793,14 @@ + fi echo $ac_n "checking for gethostname""... $ac_c" 1>&6 --echo "configure:5820: checking for gethostname" >&5 -+echo "configure:6000: checking for gethostname" >&5 +-echo "configure:5811: checking for gethostname" >&5 ++echo "configure:5798: checking for gethostname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF --#line 5825 "configure" -+#line 6005 "configure" +-#line 5816 "configure" ++#line 5803 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostname(); below. */ -@@ -5844,7 +6024,7 @@ + #include <assert.h> +@@ -5834,9 +5821,9 @@ + #endif ; return 0; } EOF --if { (eval echo configure:5848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:5839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostname=yes" else -@@ -5862,7 +6042,7 @@ + echo "configure: failed program was:" >&5 +@@ -5852,17 +5839,17 @@ + : else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6 --echo "configure:5866: checking for gethostname in -lnsl" >&5 -+echo "configure:6046: checking for gethostname in -lnsl" >&5 +-echo "configure:5857: checking for gethostname in -lnsl" >&5 ++echo "configure:5844: checking for gethostname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -5870,7 +6050,7 @@ + else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF --#line 5874 "configure" -+#line 6054 "configure" +-#line 5865 "configure" ++#line 5852 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 -@@ -5881,7 +6061,7 @@ + builtin and then its argument prototype would still apply. */ +@@ -5871,9 +5858,9 @@ + int main() { gethostname() ; return 0; } EOF --if { (eval echo configure:5885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:5876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -5923,17 +6103,17 @@ + echo "configure: failed program was:" >&5 +@@ -5913,19 +5900,19 @@ + for ac_hdr in strings.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:5927: checking for $ac_hdr" >&5 -+echo "configure:6107: checking for $ac_hdr" >&5 +-echo "configure:5918: checking for $ac_hdr" >&5 ++echo "configure:5905: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF --#line 5932 "configure" -+#line 6112 "configure" +-#line 5923 "configure" ++#line 5910 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:5937: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:6117: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:5928: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:5915: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* -@@ -5961,13 +6141,13 @@ + eval "ac_cv_header_$ac_safe=yes" +@@ -5951,15 +5938,15 @@ + done echo $ac_n "checking for socklen_t""... $ac_c" 1>&6 --echo "configure:5965: checking for socklen_t" >&5 -+echo "configure:6145: checking for socklen_t" >&5 +-echo "configure:5956: checking for socklen_t" >&5 ++echo "configure:5943: checking for socklen_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_socklen_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF --#line 5971 "configure" -+#line 6151 "configure" +-#line 5962 "configure" ++#line 5949 "configure" #include "confdefs.h" #include <sys/types.h> -@@ -6002,7 +6182,7 @@ + #include <sys/socket.h> +@@ -5992,9 +5979,9 @@ + # Extract the first word of "tr", so it can be a program name with args. set dummy tr; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:6006: checking for $ac_word" >&5 -+echo "configure:6186: checking for $ac_word" >&5 +-echo "configure:5997: checking for $ac_word" >&5 ++echo "configure:5984: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_trpath'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -6037,7 +6217,7 @@ + case "$trpath" in +@@ -6027,9 +6014,9 @@ + # Extract the first word of "sort", so it can be a program name with args. set dummy sort; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:6041: checking for $ac_word" >&5 -+echo "configure:6221: checking for $ac_word" >&5 +-echo "configure:6032: checking for $ac_word" >&5 ++echo "configure:6019: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_sortpath'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -6072,7 +6252,7 @@ + case "$sortpath" in +@@ -6062,9 +6049,9 @@ + # Extract the first word of "uniq", so it can be a program name with args. set dummy uniq; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:6076: checking for $ac_word" >&5 -+echo "configure:6256: checking for $ac_word" >&5 +-echo "configure:6067: checking for $ac_word" >&5 ++echo "configure:6054: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_uniqpath'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -6105,6 +6285,7 @@ - fi - - -+if false; then - if test "_$trpath" != _; then - if test "_$sortpath" != _; then - if test "_$uniqpath" != _; then -@@ -6120,6 +6301,7 @@ - fi - fi - fi -+fi - - - -@@ -6282,33 +6464,28 @@ - s%@CC@%$CC%g - s%@RANLIB@%$RANLIB%g - s%@CPP@%$CPP%g --s%@host@%$host%g --s%@host_alias@%$host_alias%g --s%@host_cpu@%$host_cpu%g --s%@host_vendor@%$host_vendor%g --s%@host_os@%$host_os%g - s%@ALLOCA@%$ALLOCA%g --s%@GLIBC21@%$GLIBC21%g --s%@LIBICONV@%$LIBICONV%g - s%@USE_NLS@%$USE_NLS%g - s%@MSGFMT@%$MSGFMT%g - s%@GMSGFMT@%$GMSGFMT%g - s%@XGETTEXT@%$XGETTEXT%g --s%@INTLBISON@%$INTLBISON%g --s%@BUILD_INCLUDED_LIBINTL@%$BUILD_INCLUDED_LIBINTL%g -+s%@GENCAT@%$GENCAT%g - s%@USE_INCLUDED_LIBINTL@%$USE_INCLUDED_LIBINTL%g - s%@CATALOGS@%$CATALOGS%g - s%@CATOBJEXT@%$CATOBJEXT%g -+s%@DATADIRNAME@%$DATADIRNAME%g - s%@GMOFILES@%$GMOFILES%g -+s%@INSTOBJEXT@%$INSTOBJEXT%g -+s%@INTLDEPS@%$INTLDEPS%g - s%@INTLLIBS@%$INTLLIBS%g - s%@INTLOBJS@%$INTLOBJS%g - s%@POFILES@%$POFILES%g - s%@POSUB@%$POSUB%g --s%@DATADIRNAME@%$DATADIRNAME%g --s%@INSTOBJEXT@%$INSTOBJEXT%g --s%@GENCAT@%$GENCAT%g -+s%@INCLUDE_LOCALE_H@%$INCLUDE_LOCALE_H%g -+s%@GT_NO@%$GT_NO%g -+s%@GT_YES@%$GT_YES%g - s%@MKINSTALLDIRS@%$MKINSTALLDIRS%g --s%@INTL_LIBTOOL_SUFFIX_PREFIX@%$INTL_LIBTOOL_SUFFIX_PREFIX%g -+s%@l@%$l%g - s%@sedpath@%$sedpath%g - s%@unamepath@%$unamepath%g - s%@GLIB_CONFIG@%$GLIB_CONFIG%g -@@ -6563,6 +6740,51 @@ - fi; done - - EOF -+ -+cat >> $CONFIG_STATUS <<EOF -+ac_sources="$nls_cv_header_libgt" -+ac_dests="$nls_cv_header_intl" -+EOF -+ -+cat >> $CONFIG_STATUS <<\EOF -+srcdir=$ac_given_srcdir -+while test -n "$ac_sources"; do -+ set $ac_dests; ac_dest=$1; shift; ac_dests=$* -+ set $ac_sources; ac_source=$1; shift; ac_sources=$* -+ -+ echo "linking $srcdir/$ac_source to $ac_dest" -+ -+ if test ! -r $srcdir/$ac_source; then -+ { echo "configure: error: $srcdir/$ac_source: File not found" 1>&2; exit 1; } -+ fi -+ rm -f $ac_dest -+ -+ # Make relative symlinks. -+ # Remove last slash and all that follows it. Not all systems have dirname. -+ ac_dest_dir=`echo $ac_dest|sed 's%/[^/][^/]*$%%'` -+ if test "$ac_dest_dir" != "$ac_dest" && test "$ac_dest_dir" != .; then -+ # The dest file is in a subdirectory. -+ test ! -d "$ac_dest_dir" && mkdir "$ac_dest_dir" -+ ac_dest_dir_suffix="/`echo $ac_dest_dir|sed 's%^\./%%'`" -+ # A "../" for each directory in $ac_dest_dir_suffix. -+ ac_dots=`echo $ac_dest_dir_suffix|sed 's%/[^/]*%../%g'` -+ else -+ ac_dest_dir_suffix= ac_dots= -+ fi -+ -+ case "$srcdir" in -+ [/$]*) ac_rel_source="$srcdir/$ac_source" ;; -+ *) ac_rel_source="$ac_dots$srcdir/$ac_source" ;; -+ esac -+ -+ # Make a symlink if possible; otherwise try a hard link. -+ if ln -s $ac_rel_source $ac_dest 2>/dev/null || -+ ln $srcdir/$ac_source $ac_dest; then : -+ else -+ { echo "configure: error: can not link $ac_dest to $srcdir/$ac_source" 1>&2; exit 1; } -+ fi -+done -+EOF - cat >> $CONFIG_STATUS <<EOF - - -@@ -6570,32 +6792,9 @@ - EOF - cat >> $CONFIG_STATUS <<\EOF - test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h --for ac_file in $CONFIG_FILES; do -- # Support "outfile[:infile[:infile...]]" -- case "$ac_file" in -- *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; -- esac -- # PO directories have a Makefile.in generated from Makefile.in.in. -- case "$ac_file" in */Makefile.in) -- # Adjust a relative srcdir. -- ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` -- ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" -- ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` -- case "$ac_given_srcdir" in -- .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; -- /*) top_srcdir="$ac_given_srcdir" ;; -- *) top_srcdir="$ac_dots$ac_given_srcdir" ;; -- esac -- if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then -- rm -f "$ac_dir/POTFILES" -- echo creating "$ac_dir/POTFILES" -- sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," -e "\$s/\(.*\) \\\\/\1/" < "$ac_given_srcdir/$ac_dir/POTFILES.in" > "$ac_dir/POTFILES" -- echo creating "$ac_dir/Makefile" -- sed -e "/POTFILES =/r $ac_dir/POTFILES" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" -- fi -- ;; -- esac -- done -+case "$CONFIG_FILES" in *po/Makefile.in*) -+ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile -+ esac - - exit 0 - EOF + case "$uniqpath" in diff --git a/chat/xchat/patches/patch-ad b/chat/xchat/patches/patch-ad new file mode 100644 index 00000000000..c5ab4f25358 --- /dev/null +++ b/chat/xchat/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.5.2.2 2002/06/23 18:41:20 jlam Exp $ + +--- Makefile.in.orig Thu Jun 6 14:10:54 2002 ++++ Makefile.in Thu Jun 6 14:17:49 2002 +@@ -114,7 +114,7 @@ + icondir = $(datadir)/pixmaps + + util_DATA = xchat.desktop +-utildir = $(sysconfdir)/X11/applnk/Internet ++utildir = $(datadir)/gnome/apps/Internet + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = config.h diff --git a/chat/ysm/Makefile b/chat/ysm/Makefile index 597ac4bc1ae..75df40b8941 100644 --- a/chat/ysm/Makefile +++ b/chat/ysm/Makefile @@ -1,16 +1,20 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/03/11 21:32:22 zuntum Exp $ +# $NetBSD: Makefile,v 1.1.1.1.2.1 2002/06/23 18:41:21 jlam Exp $ # -DISTNAME= ysmv7_2_4_2 -PKGNAME= ysm-2.4.2 +DISTNAME= ysmv7_2_7_1 +PKGNAME= ysm-2.7.1 CATEGORIES= chat -MASTER_SITES= http://prdownloads.sourceforge.net/ysmv7/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ysmv7/} EXTRACT_SUFX= .tgz -MAINTAINER= packages@netbsd.org +MAINTAINER= dawszy@arhea.net HOMEPAGE= http://ysmv7.sourceforge.net/ COMMENT= The 'You Sick Me' terminal based ICQ client MAKEFILE= BSDmakefile +do-install: + ${CP} ${WRKSRC}/ysm ${PREFIX}/bin/ysm + ${CP} ${WRKSRC}/docs/ysm.1 ${PREFIX}/man/man1/ + .include "../../mk/bsd.pkg.mk" diff --git a/chat/ysm/PLIST b/chat/ysm/PLIST index 47fc083cd92..1d09944df2a 100644 --- a/chat/ysm/PLIST +++ b/chat/ysm/PLIST @@ -1,2 +1,3 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/03/11 21:32:22 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.1.1.1.2.1 2002/06/23 18:41:22 jlam Exp $ bin/ysm +man/man1/ysm.1 diff --git a/chat/ysm/distinfo b/chat/ysm/distinfo index 47354e9c604..3500d6c8e60 100644 --- a/chat/ysm/distinfo +++ b/chat/ysm/distinfo @@ -1,5 +1,4 @@ -$NetBSD: distinfo,v 1.2 2002/03/31 14:25:51 dmcmahill Exp $ +$NetBSD: distinfo,v 1.2.2.1 2002/06/23 18:41:22 jlam Exp $ -SHA1 (ysmv7_2_4_2.tgz) = ffe57566e001ed669ffb00d495b30851d459b774 -Size (ysmv7_2_4_2.tgz) = 46793 bytes -SHA1 (patch-aa) = a8a392fd8096d3ce3c1710e5b5d2c2ea50ee69f9 +SHA1 (ysmv7_2_7_1.tgz) = 7e06aceed66ce0432fab277e61bf02d55197780d +Size (ysmv7_2_7_1.tgz) = 85896 bytes diff --git a/chat/ysm/patches/patch-aa b/chat/ysm/patches/patch-aa deleted file mode 100644 index 0798f26a5ea..00000000000 --- a/chat/ysm/patches/patch-aa +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2002/03/31 14:25:51 dmcmahill Exp $ - -LP64 fix. This const gets used as an int not long. - ---- YSM.h.orig Tue Feb 19 21:14:27 2002 -+++ YSM.h -@@ -135,7 +135,7 @@ - /* Definition of YSM Status */ - - #define YSM_ONLINE 0x0000 --#define YSM_OFFLINE (-1L) -+#define YSM_OFFLINE (-1) - #define YSM_INVISIBLE 0x0100 - #define YSM_NA 0x0005 - #define YSM_DND 0x0013 diff --git a/comms/Makefile b/comms/Makefile index 79e77f8fe7f..162ebd1402a 100644 --- a/comms/Makefile +++ b/comms/Makefile @@ -1,16 +1,19 @@ -# $NetBSD: Makefile,v 1.41 2002/05/04 02:04:16 jtb Exp $ +# $NetBSD: Makefile,v 1.41.2.1 2002/06/23 18:41:24 jlam Exp $ # COMMENT= Communication utilities SUBDIR+= binkd SUBDIR+= birda +SUBDIR+= conserver SUBDIR+= dl-ezkit SUBDIR+= efax SUBDIR+= efax-gtk +SUBDIR+= esms SUBDIR+= estic SUBDIR+= fidogate SUBDIR+= gkermit +SUBDIR+= gsmlib SUBDIR+= hylafax SUBDIR+= ifcico-cm SUBDIR+= jpilot diff --git a/comms/conserver/DEINSTALL b/comms/conserver/DEINSTALL new file mode 100644 index 00000000000..f27e6ed3138 --- /dev/null +++ b/comms/conserver/DEINSTALL @@ -0,0 +1,30 @@ +#!/bin/sh +# +# $NetBSD: DEINSTALL,v 1.1.1.1.2.2 2002/06/23 18:41:25 jlam Exp $ + +PKGNAME=$1 +STAGE=$2 + +CAT="@CAT@" + +case ${STAGE} in +DEINSTALL) + ;; + +POST-DEINSTALL) + ${CAT} << EOF +=========================================================================== +If you won't be using ${PKGNAME} any longer, you may want +to remove the following directories: + + /var/console +=========================================================================== +EOF + ;; + +*) + echo "Unexpected argument: ${STAGE}" + exit 1 + ;; +esac +exit 0 diff --git a/comms/conserver/DESCR b/comms/conserver/DESCR new file mode 100644 index 00000000000..ebd02d116a3 --- /dev/null +++ b/comms/conserver/DESCR @@ -0,0 +1,16 @@ +Conserver is an application that allows multiple users to watch a +serial console at the same time. It can log the data, allows users +to take write-access of a console (one at a time), and has a variety +of bells and whistles to accentuate that basic functionality. + +The idea is that conserver will log all your serial traffic so you +can go back and review why something crashed, look at changes (if +done on the console), or tie the console logs into a monitoring +system (just watch the logfiles it creates). + +With multi-user capabilities you can work on equipment with others, +mentor, train, etc. + +It also does all that client-server stuff so that, assuming you +have a network connection, you can interact with any of the equipment +from home or wherever. diff --git a/comms/conserver/Makefile b/comms/conserver/Makefile new file mode 100644 index 00000000000..f0d4e4fdeb1 --- /dev/null +++ b/comms/conserver/Makefile @@ -0,0 +1,46 @@ +# $NetBSD: Makefile,v 1.2.2.2 2002/06/23 18:41:26 jlam Exp $ +# FreeBSD Id: ports/comms/conserver-com/Makefile,v 1.1 2001/12/09 14:40:12 kur iyama Exp + +DISTNAME= conserver-7.2.1 +CATEGORIES= comms +MASTER_SITES= ftp://ftp.conserver.com/conserver/ + +MAINTAINER= packages@netbsd.org +HOMEPAGE= http://www.conserver.com/ +COMMENT= Application that allows multiple users to watch serial consoles + +USE_BUILDLINK_ONLY= YES + +GNU_CONFIGURE= YES +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --with-master=${DEFAULTHOST} +CONFIGURE_ARGS+= --with-port=${DEFAULTPORT} +CONFIGURE_ARGS+= --with-regex +CONFIGURE_ARGS+= --with-libwrap + +DEFAULTPORT?= 782 +DEFAULTHOST?= localhost +RCD_SCRIPTS= conserver + +EGDIR= ${PREFIX}/share/examples/conserver +CONF_FILES= ${EGDIR}/conserver.cf.example ${PKG_SYSCONFDIR}/conserver.cf +CONF_FILES+= ${EGDIR}/conserver.passwd.example ${PKG_SYSCONFDIR}/conserver.passwd +OWN_DIRS= /var/consoles + +pre-install: + @for script in ${RCD_SCRIPTS}; do \ + ${SED} ${FILES_SUBST_SED} ${FILESDIR}/$${script}.sh \ + > ${WRKDIR}/$${script}; \ + done + ${INSTALL_DATA_DIR} ${EGDIR} + +post-install: + for script in ${RCD_SCRIPTS}; do \ + ${INSTALL_SCRIPT} ${WRKDIR}/$${script} \ + ${PREFIX}/etc/rc.d/$${script}; \ + done + +.include "../../security/tcp_wrappers/buildlink.mk" + +.include "../../mk/bsd.pkg.install.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/comms/conserver/PLIST b/comms/conserver/PLIST new file mode 100644 index 00000000000..8886a0d1a1c --- /dev/null +++ b/comms/conserver/PLIST @@ -0,0 +1,10 @@ +@comment $NetBSD: PLIST,v 1.2.2.2 2002/06/23 18:41:27 jlam Exp $ +bin/console +etc/rc.d/conserver +man/man1/console.1 +man/man5/conserver.cf.5 +man/man5/conserver.passwd.5 +man/man8/conserver.8 +sbin/conserver +share/examples/conserver/conserver.cf +share/examples/conserver/conserver.passwd diff --git a/comms/conserver/distinfo b/comms/conserver/distinfo new file mode 100644 index 00000000000..dd7a39b98da --- /dev/null +++ b/comms/conserver/distinfo @@ -0,0 +1,6 @@ +$NetBSD: distinfo,v 1.2.2.2 2002/06/23 18:41:29 jlam Exp $ + +SHA1 (conserver-7.2.1.tar.gz) = a517c7ba8f1ee770bdb435921f959632408b6812 +Size (conserver-7.2.1.tar.gz) = 150276 bytes +SHA1 (patch-aa) = 01ab5e3430137e72b786164026785f91295232d4 +SHA1 (patch-ab) = e4fb98f61d6b6937e8989c9a15c2e7fbd26d8e05 diff --git a/comms/conserver/files/conserver.sh b/comms/conserver/files/conserver.sh new file mode 100644 index 00000000000..df37c03b50b --- /dev/null +++ b/comms/conserver/files/conserver.sh @@ -0,0 +1,28 @@ +#!/bin/sh +# +# $NetBSD: conserver.sh,v 1.2.2.2 2002/06/23 18:41:30 jlam Exp $ +# +# PROVIDE: conserver +# REQUIRE: DAEMON + +if [ -e /etc/rc.subr ] +then + . /etc/rc.subr +fi + +name="conserver" +rcvar=$name +command="@PREFIX@/sbin/${name}" +required_files="@PKG_SYSCONFDIR@/conserver.cf" +pidfile="/var/run/conserver.pid" +command_args="-d" # _must_ start as daemon from rc.d; + # add more flags through ${${name}_flags} + +if [ -e /etc/rc.subr ] +then + load_rc_config $name + run_rc_command "$1" +else + @ECHO@ -n ' ${name}' + ${command} ${conserver_flags} ${command_args} +fi diff --git a/comms/conserver/patches/patch-aa b/comms/conserver/patches/patch-aa new file mode 100644 index 00000000000..d461f237554 --- /dev/null +++ b/comms/conserver/patches/patch-aa @@ -0,0 +1,12 @@ +$NetBSD: patch-aa,v 1.1.1.1.50.2 2002/06/23 18:41:32 jlam Exp $ + +--- conserver/Makefile.in.orig Wed May 8 14:04:24 2002 ++++ conserver/Makefile.in +@@ -53,7 +53,5 @@ + $(INSTALL_PROGRAM) conserver $(DESTDIR)$(sbindir) + $(MKDIR) $(DESTDIR)$(mandir)/man8 + $(INSTALL) conserver.man $(DESTDIR)$(mandir)/man8/conserver.8 +- $(MKDIR) $(DESTDIR)$(sysconfdir) +- [ -f $(DESTDIR)$(sysconfdir)/conserver.rc ] || $(INSTALL) conserver.rc $(DESTDIR)$(sysconfdir) + + .PHONY: clean distclean install diff --git a/comms/conserver/patches/patch-ab b/comms/conserver/patches/patch-ab new file mode 100644 index 00000000000..7731878e19f --- /dev/null +++ b/comms/conserver/patches/patch-ab @@ -0,0 +1,20 @@ +$NetBSD: patch-ab,v 1.2.2.2 2002/06/23 18:41:33 jlam Exp $ + +--- conserver.cf/Makefile.in.orig Thu Jul 26 15:05:03 2001 ++++ conserver.cf/Makefile.in +@@ -3,6 +3,7 @@ + prefix = @prefix@ + mandir = @mandir@ + sysconfdir = @sysconfdir@ ++exampledir = $(prefix)/share/examples/conserver + + ### Installation programs and flags + INSTALL = @INSTALL@ +@@ -24,5 +25,7 @@ + $(MKDIR) $(DESTDIR)$(mandir)/man5 + $(INSTALL) conserver.cf.man $(DESTDIR)$(mandir)/man5/conserver.cf.5 + $(INSTALL) conserver.passwd.man $(DESTDIR)$(mandir)/man5/conserver.passwd.5 ++ $(INSTALL) conserver.cf $(DESTDIR)$(exampledir)/conserver.cf ++ $(INSTALL) conserver.passwd $(DESTDIR)$(exampledir)/conserver.passwd + + .PHONY: clean distclean install diff --git a/comms/esms/DESCR b/comms/esms/DESCR new file mode 100644 index 00000000000..635ca5ca55d --- /dev/null +++ b/comms/esms/DESCR @@ -0,0 +1,4 @@ +esms is a simple program which sends SMS (short messages) to cellular +phones. It splits big messages into many fragments, which are later +sent with error control. Only works for cellular phones in Spain, but +support for other countries is planned. diff --git a/comms/esms/Makefile b/comms/esms/Makefile new file mode 100644 index 00000000000..65440d381c6 --- /dev/null +++ b/comms/esms/Makefile @@ -0,0 +1,20 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:41:35 jlam Exp $ + +DISTNAME= esms-0.9.5 +CATEGORIES= comms +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=esms/} + +MAINTAINER= jmmv@hispabsd.org +HOMEPAGE= http://esms.sourceforge.net/ +COMMENT= Command line SMS send tool + +DEPENDS+= perl>=5.6.1:../../lang/perl5 +DEPENDS+= p5-libwww>=5.64:../../www/p5-libwww +DEPENDS+= p5-HTML-Parser>=3.25:../../www/p5-HTML-Parser +DEPENDS+= p5-HTML-Tree>=3.11:../../www/p5-HTML-Tree + +GNU_CONFIGURE= YES + +REPLACE_PERL= esms + +.include "../../mk/bsd.pkg.mk" diff --git a/comms/esms/PLIST b/comms/esms/PLIST new file mode 100644 index 00000000000..48e24dbcefe --- /dev/null +++ b/comms/esms/PLIST @@ -0,0 +1,3 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.46.2 2002/06/23 18:41:35 jlam Exp $ +bin/esms +man/man1/esms.1 diff --git a/comms/esms/distinfo b/comms/esms/distinfo new file mode 100644 index 00000000000..6e1a3fa21f5 --- /dev/null +++ b/comms/esms/distinfo @@ -0,0 +1,4 @@ +$NetBSD: distinfo,v 1.1.1.1.12.2 2002/06/23 18:41:36 jlam Exp $ + +SHA1 (esms-0.9.5.tar.gz) = 742bb0a9e168716c468f81ae20a932f59d29d7d9 +Size (esms-0.9.5.tar.gz) = 33282 bytes diff --git a/comms/gsmlib/DESCR b/comms/gsmlib/DESCR new file mode 100644 index 00000000000..2c3b8b6571c --- /dev/null +++ b/comms/gsmlib/DESCR @@ -0,0 +1,5 @@ +A library to access GSM mobile phones through GSM modems. Features include: + + * modification of phonebooks stored in the mobile phone or on the SIM card + * reading and writing of SMS messages stored in the mobile phone + * sending and reception of SMS messages diff --git a/comms/gsmlib/Makefile b/comms/gsmlib/Makefile new file mode 100644 index 00000000000..3872777f135 --- /dev/null +++ b/comms/gsmlib/Makefile @@ -0,0 +1,24 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:41:39 jlam Exp $ +# + +DISTNAME= gsmlib-1.9 +CATEGORIES= comms devel +MASTER_SITES= http://www.pxh.de/fs/gsmlib/download/ + +MAINTAINER= packages@netbsd.org +HOMEPAGE= http://www.pxh.de/fs/gsmlib/ +COMMENT= Library to access GSM mobile phones through GSM modems or IrDA devices + +ONLY_FOR_PLATFORM= NetBSD-1.[6-9]* + +BUILD_USES_MSGFMT= yes + +USE_GMAKE= YES +USE_BUILDLINK_ONLY= YES +GNU_CONFIGURE= YES +CONFIGURE_ARGS+= --without-included-gettext +CONFIGURE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}" + +.include "../../devel/gettext-lib/buildlink.mk" +.include "../../devel/pth/buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/comms/gsmlib/PLIST b/comms/gsmlib/PLIST new file mode 100644 index 00000000000..be79ceae5e5 --- /dev/null +++ b/comms/gsmlib/PLIST @@ -0,0 +1,40 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.4.2 2002/06/23 18:41:40 jlam Exp $ +bin/gsmctl +bin/gsmpb +bin/gsmsendsms +bin/gsmsiectl +bin/gsmsiexfer +bin/gsmsmsd +bin/gsmsmsstore +include/gsmlib/gsm_at.h +include/gsmlib/gsm_cb.h +include/gsmlib/gsm_error.h +include/gsmlib/gsm_event.h +include/gsmlib/gsm_map_key.h +include/gsmlib/gsm_me_ta.h +include/gsmlib/gsm_parser.h +include/gsmlib/gsm_phonebook.h +include/gsmlib/gsm_port.h +include/gsmlib/gsm_sie_me.h +include/gsmlib/gsm_sms.h +include/gsmlib/gsm_sms_codec.h +include/gsmlib/gsm_sms_store.h +include/gsmlib/gsm_sorted_phonebook.h +include/gsmlib/gsm_sorted_phonebook_base.h +include/gsmlib/gsm_sorted_sms_store.h +include/gsmlib/gsm_unix_serial.h +include/gsmlib/gsm_util.h +lib/libgsmext.a +lib/libgsmext.la +lib/libgsmext.so.1.3 +lib/libgsmme.a +lib/libgsmme.la +lib/libgsmme.so.1.3 +man/man1/gsmctl.1 +man/man1/gsmpb.1 +man/man1/gsmsendsms.1 +man/man1/gsmsmsstore.1 +man/man7/gsminfo.7 +man/man8/gsmsmsd.8 +${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gsmlib.mo +@dirrm include/gsmlib diff --git a/comms/gsmlib/distinfo b/comms/gsmlib/distinfo new file mode 100644 index 00000000000..fb5a128f4a9 --- /dev/null +++ b/comms/gsmlib/distinfo @@ -0,0 +1,5 @@ +$NetBSD: distinfo,v 1.1.1.1.4.2 2002/06/23 18:41:42 jlam Exp $ + +SHA1 (gsmlib-1.9.tar.gz) = 6432e94a8829bf8a58872de9eced9e1a27f47dfe +Size (gsmlib-1.9.tar.gz) = 335658 bytes +SHA1 (patch-aa) = 5eef6faf04fcb1c12a507299ca1b4fd0e784cdfc diff --git a/comms/gsmlib/patches/patch-aa b/comms/gsmlib/patches/patch-aa new file mode 100644 index 00000000000..575c6e3648b --- /dev/null +++ b/comms/gsmlib/patches/patch-aa @@ -0,0 +1,13 @@ +$NetBSD: patch-aa,v 1.1.1.1.4.2 2002/06/23 18:41:43 jlam Exp $ + +--- gsmlib/gsm_unix_serial.cc.orig Tue Jan 9 02:57:20 2001 ++++ gsmlib/gsm_unix_serial.cc Tue Jul 3 22:35:08 2001 +@@ -37,6 +37,8 @@ + // timer indepently of each other + + static pthread_mutex_t timerMtx = PTHREAD_MUTEX_INITIALIZER; ++#define pthread_mutex_lock(x) ++#define pthread_mutex_unlock(x) + + // for non-GNU systems, define alarm() + #ifndef HAVE_ALARM diff --git a/comms/kermit/Makefile b/comms/kermit/Makefile index e47f8c19943..a072233a31b 100644 --- a/comms/kermit/Makefile +++ b/comms/kermit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2002/01/28 12:06:55 agc Exp $ +# $NetBSD: Makefile,v 1.36.2.1 2002/06/23 18:41:44 jlam Exp $ # $FreeBSD Id: Makefile,v 1.17 1997/11/26 23:16:51 jseger Exp # @@ -68,11 +68,11 @@ LIBS+= -ltermcap .if ${USE_SOCKS} == 4 DEPENDS+= socks4-2.2:../../net/socks4 KFLAGS+= -DSOCKS -LIBS+= -L${PREFIX}/lib -Wl,-R${PREFIX}/lib -lsocks +LIBS+= -L${PREFIX}/lib -lsocks4 .elif ${USE_SOCKS} == 5 DEPENDS+= socks5-1.0.2:../../net/socks5 KFLAGS+= -DSOCKS -DCK_SOCKS5 -LIBS+= -L${PREFIX}/lib -Wl,-R${PREFIX}/lib -lsocks5 +LIBS+= -L${PREFIX}/lib -lsocks5 .endif .endif diff --git a/comms/scmxx/Makefile b/comms/scmxx/Makefile index 01dbebea52e..fde81c60180 100644 --- a/comms/scmxx/Makefile +++ b/comms/scmxx/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.12 2002/04/15 17:40:02 kleink Exp $ +# $NetBSD: Makefile,v 1.12.2.1 2002/06/23 18:41:45 jlam Exp $ # -DISTNAME= scmxx-0.6.0 +DISTNAME= scmxx-0.6.1.1 CATEGORIES= comms -MASTER_SITES= http://www.hendrik-sattler.de/scmxx/download/ \ - http://ma2geo.mathematik.uni-karlsruhe.de/~hendrik/scmxx/download/ +MASTER_SITES= http://ma2geo.mathematik.uni-karlsruhe.de/~hendrik/scmxx/download/ EXTRACT_SUFX= .tar.bz2 MAINTAINER= kleink@netbsd.org @@ -16,7 +15,7 @@ USE_GMAKE= yes post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/scmxx - ${INSTALL_DATA} ${WRKSRC}/docs/README \ + ${INSTALL_DATA} ${WRKSRC}/docs/doc_sources.txt \ ${PREFIX}/share/doc/scmxx ${INSTALL_DATA} ${WRKSRC}/docs/greekchars.txt \ ${PREFIX}/share/doc/scmxx diff --git a/comms/scmxx/PLIST b/comms/scmxx/PLIST index b162e160966..d5a14f7d11c 100644 --- a/comms/scmxx/PLIST +++ b/comms/scmxx/PLIST @@ -1,7 +1,7 @@ -@comment $NetBSD: PLIST,v 1.3 2002/03/10 08:29:50 kleink Exp $ +@comment $NetBSD: PLIST,v 1.3.2.1 2002/06/23 18:41:46 jlam Exp $ bin/scmxx man/man1/scmxx.1 -share/doc/scmxx/README +share/doc/scmxx/doc_sources.txt share/doc/scmxx/greekchars.txt share/doc/scmxx/gsmcharset.txt share/doc/scmxx/specialchars.txt diff --git a/comms/scmxx/distinfo b/comms/scmxx/distinfo index 53fdddf83c3..73b09f37853 100644 --- a/comms/scmxx/distinfo +++ b/comms/scmxx/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2002/04/15 17:40:02 kleink Exp $ +$NetBSD: distinfo,v 1.9.2.1 2002/06/23 18:41:47 jlam Exp $ -SHA1 (scmxx-0.6.0.tar.bz2) = cdedb4baf11bfad8c9bb04bdb3b75df9e8f2b419 -Size (scmxx-0.6.0.tar.bz2) = 47269 bytes +SHA1 (scmxx-0.6.1.1.tar.bz2) = 5414fe51c0a70dc82515b03993831d0476d07f29 +Size (scmxx-0.6.1.1.tar.bz2) = 51331 bytes diff --git a/converters/2vcard/DESCR b/converters/2vcard/DESCR new file mode 100644 index 00000000000..c66ace4f066 --- /dev/null +++ b/converters/2vcard/DESCR @@ -0,0 +1,6 @@ +2vcard is a little perl script to convert an addressbook to the popular +VCARD file format. Currently, 2vcard can convert mutt's and mh's alias as +well as pine's and abook's addressbook format. + +The VCARD format is used by gnomecard, for example, which in turn is used +by the balsa email client. diff --git a/converters/2vcard/Makefile b/converters/2vcard/Makefile new file mode 100644 index 00000000000..f24f25db8a7 --- /dev/null +++ b/converters/2vcard/Makefile @@ -0,0 +1,28 @@ +# $NetBSD: Makefile,v 1.1.2.2 2002/06/23 18:41:50 jlam Exp $ +# + +DISTNAME= 2vcard-0.3 +CATEGORIES= converters +MASTER_SITES= http://www.netmeister.org/apps/ +EXTRACT_SUFX= .tar.bz2 + +MAINTAINER= jschauma@netbsd.org +HOMEPAGE= http://www.netmeister.org/apps/2vcard/ +COMMENT= Convert an addressbook to the popular VCARD file format + +USE_PERL5= # defined +REPLACE_PERL= src/2vcard + +NO_BUILD= yes + +do-install: + ${INSTALL_SCRIPT} ${WRKSRC}/src/2vcard ${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/doc/2vcard.1 ${PREFIX}/man/man1/ + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/2vcard + ${INSTALL_DATA} ${WRKSRC}/CHANGES ${PREFIX}/share/doc/2vcard + ${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/doc/2vcard + ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/2vcard + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/2vcard + ${INSTALL_DATA} ${WRKSRC}/doc/html/* ${PREFIX}/share/doc/html/2vcard + +.include "../../mk/bsd.pkg.mk" diff --git a/converters/2vcard/PLIST b/converters/2vcard/PLIST new file mode 100644 index 00000000000..ee0770dbaa7 --- /dev/null +++ b/converters/2vcard/PLIST @@ -0,0 +1,14 @@ +@comment $NetBSD: PLIST,v 1.1.2.2 2002/06/23 18:41:51 jlam Exp $ +bin/2vcard +man/man1/2vcard.1 +share/doc/2vcard/CHANGES +share/doc/2vcard/COPYING +share/doc/2vcard/README +share/doc/html/2vcard/index-1.html +share/doc/html/2vcard/index-2.html +share/doc/html/2vcard/index-3.html +share/doc/html/2vcard/index-4.html +share/doc/html/2vcard/index-5.html +share/doc/html/2vcard/index.html +@dirrm share/doc/html/2vcard +@dirrm share/doc/2vcard diff --git a/converters/2vcard/distinfo b/converters/2vcard/distinfo new file mode 100644 index 00000000000..1a4e2c5415d --- /dev/null +++ b/converters/2vcard/distinfo @@ -0,0 +1,4 @@ +$NetBSD: distinfo,v 1.1.2.2 2002/06/23 18:41:53 jlam Exp $ + +SHA1 (2vcard-0.3.tar.bz2) = c05aa85d4d96c555e01edda024d81d6dcf3880b3 +Size (2vcard-0.3.tar.bz2) = 16474 bytes diff --git a/converters/Makefile b/converters/Makefile index 16b65c1e8ba..7bafad7009a 100644 --- a/converters/Makefile +++ b/converters/Makefile @@ -1,29 +1,43 @@ -# $NetBSD: Makefile,v 1.40 2002/03/30 06:07:02 uebayasi Exp $ +# $NetBSD: Makefile,v 1.40.2.1 2002/06/23 18:41:47 jlam Exp $ # -COMMENT= Character code converters +COMMENT= document format and character code converters +SUBDIR+= 2vcard +SUBDIR+= ack +SUBDIR+= autoconvert SUBDIR+= base64 SUBDIR+= bbcim SUBDIR+= cbmconvert SUBDIR+= cn2jp SUBDIR+= doc2html SUBDIR+= dvi2tty +SUBDIR+= hztty SUBDIR+= ish SUBDIR+= kdesupport SUBDIR+= latex2rtf SUBDIR+= libiconv SUBDIR+= macfork SUBDIR+= mpack +SUBDIR+= nkf SUBDIR+= p5-Convert-TNEF SUBDIR+= p5-Convert-UUlib +SUBDIR+= p5-Jcode SUBDIR+= p5-MIME-Base64 SUBDIR+= p5-Text-Iconv +SUBDIR+= p5-jcode +SUBDIR+= p5-nkf SUBDIR+= psiconv +SUBDIR+= py-koCodecs +SUBDIR+= py-zhCodecs +SUBDIR+= qkc SUBDIR+= recode SUBDIR+= rpm2cpio SUBDIR+= rtf2html SUBDIR+= ruby-iconv +SUBDIR+= ruby-romkan +SUBDIR+= ruby-uconv +SUBDIR+= tex2rtf SUBDIR+= ttf2pt1 SUBDIR+= txt2html SUBDIR+= txt2man diff --git a/converters/ack/DESCR b/converters/ack/DESCR new file mode 100644 index 00000000000..0ded66d4636 --- /dev/null +++ b/converters/ack/DESCR @@ -0,0 +1,3 @@ +ack is an Japanese code converter for EUC-JP, MS-Kanji code and ISO-2022-JP. +It is compatible with JIS X 0201 katakana. It recognizes input code +automatically, doesn't confuse for the katakana. diff --git a/converters/ack/Makefile b/converters/ack/Makefile new file mode 100644 index 00000000000..5b04b3ac48d --- /dev/null +++ b/converters/ack/Makefile @@ -0,0 +1,14 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:41:54 jlam Exp $ +# FreeBSD Id: Makefile,v 1.1.1.1 1998/09/15 22:05:58 kuriyama Exp + +DISTNAME= ack139 +PKGNAME= ack-1.39 +CATEGORIES= japanese converters +MASTER_SITES= ftp://ftp.tohoku.ac.jp/pub/unix/ack/ + +MAINTAINER= kei_sun@ba2.so-net.ne.jp +COMMENT= Japanese code converter + +ALL_TARGET= ack + +.include "../../mk/bsd.pkg.mk" diff --git a/converters/ack/PLIST b/converters/ack/PLIST new file mode 100644 index 00000000000..a121fb13b9c --- /dev/null +++ b/converters/ack/PLIST @@ -0,0 +1,3 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.50.2 2002/06/23 18:41:55 jlam Exp $ +bin/ack +man/ja_JP.EUC/man1/ack.1 diff --git a/converters/ack/distinfo b/converters/ack/distinfo new file mode 100644 index 00000000000..99436180875 --- /dev/null +++ b/converters/ack/distinfo @@ -0,0 +1,5 @@ +$NetBSD: distinfo,v 1.1.1.1.12.2 2002/06/23 18:41:56 jlam Exp $ + +SHA1 (ack139.tar.gz) = d9ae53238176d46c303a48e736c5bafa9743250c +Size (ack139.tar.gz) = 16292 bytes +SHA1 (patch-aa) = 4840bef577a42cd4cd1a387f7261f42f9887055f diff --git a/converters/ack/patches/patch-aa b/converters/ack/patches/patch-aa new file mode 100644 index 00000000000..24cafeff212 --- /dev/null +++ b/converters/ack/patches/patch-aa @@ -0,0 +1,23 @@ +$NetBSD: patch-aa,v 1.1.1.1.50.2 2002/06/23 18:41:57 jlam Exp $ + +--- Makefile.orig Tue Jul 26 09:29:53 1994 ++++ Makefile Fri Jan 1 21:08:42 1999 +@@ -1,14 +1,15 @@ + #### ack 1993,94 H.Ogasawara (COR.) + #### + #### -- install directory +-BINARY = /usr/local/bin +-MANUAL = /usr/local/man/man1 ++BINARY = ${PREFIX}/bin ++MANUAL = ${PREFIX}/man/ja_JP.EUC/man1 + + #### + #### -- UNIX + CC = cc +-CFLAGS = -O -DDEFCODE=2 -DDEFJIS=2 -DENVACK=1 ++#CFLAGS = -O -DDEFCODE=2 -DDEFJIS=2 -DENVACK=1 + #CFLAGS = -O -DDEFCODE=1 -DDEFJIS=2 -DENVACK=1 -DLANGCHK=1 -DJCONVSW=1 ++CFLAGS = -O -DDEFCODE=0 -DDEFJIS=2 -DENVACK=1 -DLANGCHK=1 -DJCONVSW=1 + #### + #### -- Human68k + #CC = gcc diff --git a/converters/autoconvert/DESCR b/converters/autoconvert/DESCR new file mode 100644 index 00000000000..61c2332672e --- /dev/null +++ b/converters/autoconvert/DESCR @@ -0,0 +1,6 @@ +AutoConvert is an intelligent Chinese Encoding converter. +It uses built-in functions to judge the type of the input file's Chinese +Encoding (such as GB/Big5/HZ), then converts the input file to any +type of Chinese Encoding you want. You can use autoconvert to +automatically convert incoming e-mail messages. It can also optionally +handle the UNI/UTF7/UTF8 encoding. diff --git a/converters/autoconvert/Makefile b/converters/autoconvert/Makefile new file mode 100644 index 00000000000..e941a8571ab --- /dev/null +++ b/converters/autoconvert/Makefile @@ -0,0 +1,20 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:41:59 jlam Exp $ + +DISTNAME= autoconvert-0.3.13 +CATEGORIES= converters +MASTER_SITES= http://people.debian.org/~ygh/ + +MAINTAINER= rxg@netbsd.org +HOMEPAGE= http://banyan.dlut.edu.cn/~ygh/ +COMMENT= Intelligent Chinese encoding converter + +USE_LIBTOOL= yes +USE_GMAKE= yes + +post-install: + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/autoconvert + ${INSTALL_DATA} ${WRKSRC}/procmailrc.example ${WRKSRC}/shed.* \ + ${PREFIX}/share/examples/autoconvert + +.include "../../devel/libgetopt/buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/converters/autoconvert/PLIST b/converters/autoconvert/PLIST new file mode 100644 index 00000000000..19e6d6de1d9 --- /dev/null +++ b/converters/autoconvert/PLIST @@ -0,0 +1,17 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.10.2 2002/06/23 18:42:00 jlam Exp $ +bin/autob5 +bin/autogb +include/hz.h +include/zhstatis.h +lib/libhz.a +lib/libhz.la +lib/libhz.so +lib/libhz.so.0 +lib/libhz.so.0.0 +share/examples/autoconvert/procmailrc.example +share/examples/autoconvert/shed.big5 +share/examples/autoconvert/shed.gb +share/examples/autoconvert/shed.uni +share/examples/autoconvert/shed.utf7 +share/examples/autoconvert/shed.utf8 +@dirrm share/examples/autoconvert diff --git a/converters/autoconvert/distinfo b/converters/autoconvert/distinfo new file mode 100644 index 00000000000..6b9ca8bf839 --- /dev/null +++ b/converters/autoconvert/distinfo @@ -0,0 +1,6 @@ +$NetBSD: distinfo,v 1.1.1.1.4.2 2002/06/23 18:42:01 jlam Exp $ + +SHA1 (autoconvert-0.3.13.tar.gz) = cc59899e46ccfaacdb39f7a73767780b721ab75d +Size (autoconvert-0.3.13.tar.gz) = 464081 bytes +SHA1 (patch-aa) = 803666f4de76422dec546dc56c643abeda43edb1 +SHA1 (patch-ab) = f2dc6af133d620e67e414b7f0f1543e47ef794db diff --git a/converters/autoconvert/patches/patch-aa b/converters/autoconvert/patches/patch-aa new file mode 100644 index 00000000000..552abc83319 --- /dev/null +++ b/converters/autoconvert/patches/patch-aa @@ -0,0 +1,49 @@ +$NetBSD: patch-aa,v 1.1.1.1.38.2 2002/06/23 18:42:02 jlam Exp $ + +--- Makefile.orig Sat Apr 28 09:45:46 2001 ++++ Makefile +@@ -1,22 +1,20 @@ + +-CC=gcc +-CFLAG=-O2 -g -Wall -Iinclude +-LIBS= -Llib -lhz ++CFLAG+=-Wall -Iinclude + + .PHONY: all hzlib clean install-home install + +-all: autob5 autogb hzlib xchat-plugins ++all: autob5 autogb hzlib + + autob5: autogb + rm -f autob5;ln -s autogb autob5 + autogb:autogb.c hzlib +- $(CC) $(CFLAG) $(LIBS) autogb.c -lhz -o autogb ++ $(LIBTOOL) --mode=link $(CC) $(CFLAG) autogb.c -o autogb hzconvert/libhz.la $(LIBGETOPT) + autogb-static:autogb.c hzlib + $(CC) $(CFLAG) autogb.c lib/libhz.a -o autogb + hzlib: +- cd hzconvert;make ++ cd hzconvert;$(MAKE) + xchat-plugins: +- cd contrib/xchat-plugins;make ++ cd contrib/xchat-plugins;$(MAKE) + clean: + rm -f autob5 autogb *.o *~ + rm -f include/*~ +@@ -30,12 +28,7 @@ + ln -s $(HOME)/bin/autogb $(HOME)/bin/autob5 + chmod 755 $(HOME)/bin/autogb + install: +- install -m 755 autogb $(DESTDIR)/usr/bin +- install -m 755 lib/libhz.so.0.0 $(DESTDIR)/usr/lib +- cd $(DESTDIR)/usr/lib;ln -s libhz.so.0.0 libhz.so.0 +- cd $(DESTDIR)/usr/lib;ln -s libhz.so.0 libhz.so +- install -m 755 lib/libhz.a $(DESTDIR)/usr/lib +- install -m 755 contrib/xchat-plugins/xchat-autogb.so $(DESTDIR)/usr/share/zh-autoconvert +- install -m 755 contrib/xchat-plugins/xchat-autob5.so $(DESTDIR)/usr/share/zh-autoconvert +- install -m 644 include/*.h $(DESTDIR)/usr/include +- ln -s autogb $(DESTDIR)/usr/bin/autob5 ++ cd hzconvert;$(MAKE) install ++ $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) autogb $(PREFIX)/bin ++ $(BSD_INSTALL_DATA) include/*.h $(PREFIX)/include ++ ln -fs $(PREFIX)/bin/autogb $(PREFIX)/bin/autob5 diff --git a/converters/autoconvert/patches/patch-ab b/converters/autoconvert/patches/patch-ab new file mode 100644 index 00000000000..4aa260bbe9c --- /dev/null +++ b/converters/autoconvert/patches/patch-ab @@ -0,0 +1,36 @@ +$NetBSD: patch-ab,v 1.1.1.1.38.2 2002/06/23 18:42:02 jlam Exp $ + +--- hzconvert/Makefile.orig Mon Jan 8 18:03:21 2001 ++++ hzconvert/Makefile +@@ -1,22 +1,17 @@ +-CC=gcc -I../include +-CFLAGS=-O2 -Wall -g +-SHARED_LIB=libhz.so +-SHARED_LIB_MAJOR=$(SHARED_LIB).0 +-SHARED_LIB_MINOR=$(SHARED_LIB_MAJOR).0 ++CFLAGS+=-Wall -I../include ++LIB=libhz.a + OBJS=b2g.o b2u.o g2u.o hz2gb.o b2g_tables.o b2u_tables.o g2u_tables.o io.o unicode.o judge.o judge3.o gbpercent.o b5percent.o search.o + + %.o: %.c +- $(CC) -fPIC $(CFLAGS) -c $< ++ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $< + +-all: libhzconvert ++all: $(LIB) + +-libhzconvert: $(OBJS) +- ar rs ../lib/libhz.a $(OBJS) +- gcc -fPIC -shared -Wl,-soname,$(SHARED_LIB_MAJOR) -o ../lib/$(SHARED_LIB_MINOR) $(OBJS) -ldl +- rm -f ../lib/$(SHARED_LIB_MAJOR) +- rm -f ../lib/$(SHARED_LIB) +- cd ../lib;ln -s $(SHARED_LIB_MINOR) $(SHARED_LIB_MAJOR) +- cd ../lib;ln -s $(SHARED_LIB_MAJOR) $(SHARED_LIB) ++$(LIB): $(OBJS) ++ $(LIBTOOL) --mode=link $(CC) -o $(LIB:.a=.la) $(OBJS:.o=.lo) -rpath $(PREFIX)/lib ++ ++install: all ++ $(LIBTOOL) --mode=install $(BSD_INSTALL_DATA) $(LIB:.a=.la) $(PREFIX)/lib + + clean: + rm -f *.o *~ ../lib/lib* diff --git a/converters/hztty/DESCR b/converters/hztty/DESCR new file mode 100644 index 00000000000..e5180d4c3d6 --- /dev/null +++ b/converters/hztty/DESCR @@ -0,0 +1,7 @@ +This program turns a tty session from one encoding to another. +For example, running hztty on cxterm can allow you to read/write +Chinese in HZ format, which was not supported by cxterm. +If you have many applications in different encodings but your +favor terminal program only supports one, hztty can make life easy. +For example, hztty can convert your GB cxterm into a HZ terminal, a +Unicode (16bit, or UTF8, or UTF7) terminal, or a Big5 terminal. diff --git a/converters/hztty/Makefile b/converters/hztty/Makefile new file mode 100644 index 00000000000..0bbc114c85d --- /dev/null +++ b/converters/hztty/Makefile @@ -0,0 +1,20 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:42:04 jlam Exp $ + +DISTNAME= hztty-2.0 +CATEGORIES= converters +MASTER_SITES= ftp://ftp.ifcss.org/pub/software/unix/convert/ \ + ftp://ftp.cuhk.hk/pub/chinese/ifcss/software/unix/convert/ \ + ftp://ftp.edu.tw/Chinese/ifcss/software/unix/convert/ \ + ftp://ftp.mpi-sb.mpg.de/pub/chinese/mirror/ftp.ifcss.org/software/unix/convert/ + +MAINTAINER= rxg@netbsd.org +#HOMEPAGE= +COMMENT= turns a tty session between Big5/GB/HZ/Unicode + +ALL_TARGET= bsd + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/hztty ${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/hztty.1 ${PREFIX}/man/man1 + +.include "../../mk/bsd.pkg.mk" diff --git a/converters/hztty/PLIST b/converters/hztty/PLIST new file mode 100644 index 00000000000..0e8e1e558a3 --- /dev/null +++ b/converters/hztty/PLIST @@ -0,0 +1,3 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.50.2 2002/06/23 18:42:05 jlam Exp $ +bin/hztty +man/man1/hztty.1 diff --git a/converters/hztty/distinfo b/converters/hztty/distinfo new file mode 100644 index 00000000000..76e794f5867 --- /dev/null +++ b/converters/hztty/distinfo @@ -0,0 +1,6 @@ +$NetBSD: distinfo,v 1.1.1.1.12.2 2002/06/23 18:42:06 jlam Exp $ + +SHA1 (hztty-2.0.tar.gz) = db2d13f4f9d3918c1feef3ac8fb4bb24326a28ef +Size (hztty-2.0.tar.gz) = 229189 bytes +SHA1 (patch-aa) = 6479d6b1d359f90e7ad6808bdb9c24c8fe10e9d6 +SHA1 (patch-ab) = fc050ecb9b5df0403b3f0307ccd741c60c693f5f diff --git a/converters/hztty/patches/patch-aa b/converters/hztty/patches/patch-aa new file mode 100644 index 00000000000..212dfb67850 --- /dev/null +++ b/converters/hztty/patches/patch-aa @@ -0,0 +1,22 @@ +$NetBSD: patch-aa,v 1.1.1.1.12.2 2002/06/23 18:42:07 jlam Exp $ + +--- Makefile.orig Sun Jan 29 16:39:19 1995 ++++ Makefile Sun Apr 2 11:16:03 2000 +@@ -31,7 +30,7 @@ + ${OBJ_GB_BIG5} ${OBJ_UNICODE_GB} ${OBJ_UNICODE_BIG5} + + DEFINES= +-CFLAGS=${CDEBUGFLAGS} ${DEFINES} ${MODULES_DEF} -I. ++CFLAGS+=${DEFINES} ${MODULES_DEF} -I. + + PROG = hztty + LIBS= +@@ -132,7 +131,7 @@ + + + bsd: +- miniconf.sh $(CPP) ++ ./miniconf.sh $(CPP) + ${MAKE} ${MFLAGS} DEFINES='-DBSD' ${PROG} + + posix: diff --git a/converters/hztty/patches/patch-ab b/converters/hztty/patches/patch-ab new file mode 100644 index 00000000000..8585f17c765 --- /dev/null +++ b/converters/hztty/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1.1.1.12.2 2002/06/23 18:42:08 jlam Exp $ + +--- tty.c.orig Sun Jan 29 12:24:55 1995 ++++ tty.c Mon Oct 6 23:56:32 1997 +@@ -26,7 +26,7 @@ + # define TTYDEV "/dev/pty/ttyxx" + #else /* !hpux */ + # define PTYCHAR1 "pqrstuvwxyzPQRSTUVWXYZ" +-# define PTYCHAR2 "0123456789abcdef" ++# define PTYCHAR2 "0123456789abcdefghijklmnopqrstuv" + # define PTYDEV "/dev/ptyxx" + # define TTYDEV "/dev/ttyxx" + #endif /* !hpux */ diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile index df9636e9f7b..679974affa0 100644 --- a/converters/libiconv/Makefile +++ b/converters/libiconv/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.7.2.2 2002/06/21 23:05:01 jlam Exp $ +# $NetBSD: Makefile,v 1.7.2.3 2002/06/23 18:42:09 jlam Exp $ # DISTNAME= libiconv-1.7 +PKGREVISION= 2 CATEGORIES= converters MASTER_SITES= ftp://ftp.ilog.fr/pub/Users/haible/gnu/ @@ -22,6 +23,13 @@ LIBTOOL_OVERRIDE+= ${WRKSRC}/libcharset/libtool PLIST_SRC= ${PKGDIR}/PLIST.${OPSYS} .endif +# remove any existing charset.alias; if it already exists, libiconv does +# not overwrite it, and older versions of libiconv wrote incorrect +# charset.alias files, which were not removed during deinstall since +# other packages touched them. +pre-install: + ${RM} -f ${PREFIX}/lib/charset.alias + test: build cd ${WRKSRC} && ${MAKE_ENV} ${MAKE_PROGRAM} check |& tee ${WRKDIR}/check.log diff --git a/converters/libiconv/buildlink.mk b/converters/libiconv/buildlink.mk index c75e24373c5..e9d98f4f715 100644 --- a/converters/libiconv/buildlink.mk +++ b/converters/libiconv/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.8 2001/07/27 13:33:21 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.8.2.1 2002/06/23 18:42:10 jlam Exp $ # # This Makefile fragment is included by packages that use libiconv. # @@ -17,7 +17,7 @@ ICONV_BUILDLINK_MK= # defined .include "../../mk/bsd.buildlink.mk" -BUILDLINK_DEPENDS.iconv?= libiconv>=1.5 +BUILDLINK_DEPENDS.iconv?= libiconv>=1.7nb2 DEPENDS+= ${BUILDLINK_DEPENDS.iconv}:../../converters/libiconv EVAL_PREFIX+= BUILDLINK_PREFIX.iconv=libiconv diff --git a/converters/libiconv/distinfo b/converters/libiconv/distinfo index b179ac8305a..3f6798747b9 100644 --- a/converters/libiconv/distinfo +++ b/converters/libiconv/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.4 2001/10/30 17:41:20 drochner Exp $ +$NetBSD: distinfo,v 1.4.2.1 2002/06/23 18:42:10 jlam Exp $ SHA1 (libiconv-1.7.tar.gz) = 14232820739d778e0cdbe3aa647aa7ce6ff4d101 Size (libiconv-1.7.tar.gz) = 2941046 bytes -SHA1 (patch-aa) = b170180c457a14276ebc96f73ef9573fb7944e6f +SHA1 (patch-aa) = 9990fa9faecb6e332a67d7af58cc2c98139a8e0c SHA1 (patch-ab) = 4859358c291ee59c85fc9e9090e7c6505817bcb4 SHA1 (patch-ac) = 6896d58b242f4c08887061ddf3217bd9b291c895 diff --git a/converters/libiconv/patches/patch-aa b/converters/libiconv/patches/patch-aa index 7d381d50761..bb528f8efc5 100644 --- a/converters/libiconv/patches/patch-aa +++ b/converters/libiconv/patches/patch-aa @@ -1,13 +1,23 @@ -$NetBSD: patch-aa,v 1.2 2001/05/14 12:14:47 rh Exp $ +$NetBSD: patch-aa,v 1.2.2.1 2002/06/23 18:42:11 jlam Exp $ ---- libcharset/lib/config.charset.orig Sun Mar 11 15:37:53 2001 +--- libcharset/lib/config.charset.orig Mon Jun 25 14:01:22 2001 +++ libcharset/lib/config.charset -@@ -235,7 +235,7 @@ - #echo "sun_eu_greek ?" # what is this? - echo "UTF-8 UTF-8" +@@ -435,4 +435,18 @@ + echo "eo CP850" + echo "eo_EO CP850" ;; -- freebsd*) -+ *bsd*) - # FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore - # localcharset.c falls back to using the full locale name - # from the environment variables. ++ netbsd*) ++ echo "646 ASCII" ++ echo "ISO8859-1 ISO-8859-1" ++ echo "ISO8859-2 ISO-8859-2" ++ echo "ISO8859-4 ISO-8859-4" ++ echo "ISO8859-5 ISO-8859-5" ++ echo "ISO8859-15 ISO-8859-15" ++ echo "eucCN GB2312" ++ echo "eucJP EUC-JP" ++ echo "eucKR EUC-KR" ++ echo "eucTW EUC-TW" ++ echo "BIG5 BIG5" ++ echo "SJIS SHIFT_JIS" ++ ;; + esac diff --git a/converters/nkf/DESCR b/converters/nkf/DESCR new file mode 100644 index 00000000000..3eb4a732c22 --- /dev/null +++ b/converters/nkf/DESCR @@ -0,0 +1,8 @@ +Nkf is a yet another kanji code converter between the different types +of kanji codes out there. It can convert between 7-bit JIS, MS-kanji +(shifted-JIS) or EUC. + +One of the most unique facilities of nkf is that it guesses the input +kanji code. It currently recognizes 7-bit JIS, MS-kanji (shifted-JIS) +and EUC. So users don't need to specify (or even know) the input +kanji code type. diff --git a/converters/nkf/Makefile b/converters/nkf/Makefile new file mode 100644 index 00000000000..ed30f5d7c87 --- /dev/null +++ b/converters/nkf/Makefile @@ -0,0 +1,24 @@ +# $NetBSD: Makefile,v 1.1.1.1.4.2 2002/06/23 18:42:12 jlam Exp $ + +DISTNAME= nkf-1.7 +CATEGORIES= japanese converters +MASTER_SITES= ftp://ftp.sra.co.jp/pub/cmd/nkf/ + +PATCH_SITES= http://www.rs.civil.tohoku.ac.jp/~ito/ws/ +PATCHFILES= nkf.patch.txt + +MAINTAINER= kay@kaynet.or.jp +COMMENT= Network Kanji code conversion Filter + +ALL_TARGET= nkf +PATCH_DIST_ARGS+= -R -d ${WRKSRC} + +post-extract: + @cd ${WRKSRC} && ${PATCH} ${PATCH_ARGS} < ${FILESDIR}/nkf.post-extract + @${RM} -rf ${WRKSRC}/NKF + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/nkf ${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/nkf.1 ${PREFIX}/man/man1 + +.include "../../mk/bsd.pkg.mk" diff --git a/converters/nkf/PLIST b/converters/nkf/PLIST new file mode 100644 index 00000000000..62644f73a64 --- /dev/null +++ b/converters/nkf/PLIST @@ -0,0 +1,3 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.50.2 2002/06/23 18:42:13 jlam Exp $ +bin/nkf +man/man1/nkf.1 diff --git a/converters/nkf/distinfo b/converters/nkf/distinfo new file mode 100644 index 00000000000..542860998db --- /dev/null +++ b/converters/nkf/distinfo @@ -0,0 +1,6 @@ +$NetBSD: distinfo,v 1.1.1.1.4.2 2002/06/23 18:42:14 jlam Exp $ + +SHA1 (nkf-1.7.tar.gz) = 2116864c1acc8e6f80d4c59dc63c73eb37c9e80c +Size (nkf-1.7.tar.gz) = 28222 bytes +SHA1 (nkf.patch.txt) = f7b0a640be331a707584ba34d083f5e2361c3969 +Size (nkf.patch.txt) = 3558 bytes diff --git a/converters/nkf/files/nkf.post-extract b/converters/nkf/files/nkf.post-extract new file mode 100644 index 00000000000..61df30147cb --- /dev/null +++ b/converters/nkf/files/nkf.post-extract @@ -0,0 +1,19 @@ +*** nkf.c.bak Sun May 9 17:20:37 1999 +--- nkf.c Sun May 9 17:21:32 1999 +*************** +*** 1483,1489 **** + + + #ifdef STRICT_MIME +! /* This converts ^\^\*/ + + unsigned char *mime_pattern[] = { + (unsigned char *)"\075?ISO-8859-1?Q?", +--- 1483,1489 ---- + + + #ifdef STRICT_MIME +! /* This converts */ + + unsigned char *mime_pattern[] = { + (unsigned char *)"\075?ISO-8859-1?Q?", diff --git a/converters/p5-Jcode/DESCR b/converters/p5-Jcode/DESCR new file mode 100644 index 00000000000..e4cf1cc3ccc --- /dev/null +++ b/converters/p5-Jcode/DESCR @@ -0,0 +1,8 @@ +Jcode.pm is a Perl module that handles various Japanese charsets. +It has all features available on jcode.pl-2.10 PLUS + + *Object-oriented approach on Japanese text handling + *mime header handling + *Unicode feature (UCS2 and UTF8) + +Detail: http://openlab.ring.gr.jp/Jcode/Jcode.html diff --git a/converters/p5-Jcode/Makefile b/converters/p5-Jcode/Makefile new file mode 100644 index 00000000000..9e13e696bb2 --- /dev/null +++ b/converters/p5-Jcode/Makefile @@ -0,0 +1,29 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:42:17 jlam Exp $ +# + +DISTNAME= Jcode-0.80 +PKGNAME= p5-${DISTNAME} +SVR4_PKGNAME= p5jco +CATEGORIES= converters japanese +MASTER_SITES= http://openlab.ring.gr.jp/Jcode/ + +MAINTAINER= tech-pkg-ja@jp.netbsd.org +HOMEPAGE= http://openlab.ring.gr.jp/Jcode/index.html +COMMENT= perl5 module for handling various Japanese charsets + +DEPENDS+= p5-MIME-Base64>=2.1:../../converters/p5-MIME-Base64 + +USE_BUILDLINK_ONLY= YES +PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Jcode/.packlist + +pre-configure: + @cd ${WRKSRC}; ${RM} -f mac_install.pl win_install.pl + +do-configure: + @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL + +test: + @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} test + +.include "../../lang/perl5/buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/converters/p5-Jcode/PLIST b/converters/p5-Jcode/PLIST new file mode 100644 index 00000000000..dfb31d76bb9 --- /dev/null +++ b/converters/p5-Jcode/PLIST @@ -0,0 +1 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.34.2 2002/06/23 18:42:18 jlam Exp $ diff --git a/converters/p5-Jcode/distinfo b/converters/p5-Jcode/distinfo new file mode 100644 index 00000000000..d845bb81dae --- /dev/null +++ b/converters/p5-Jcode/distinfo @@ -0,0 +1,5 @@ +$NetBSD: distinfo,v 1.1.1.1.2.2 2002/06/23 18:42:19 jlam Exp $ + +SHA1 (Jcode-0.80.tar.gz) = 9f7bb8c007e1cb64c77d9c85e9f6e893089e98cf +Size (Jcode-0.80.tar.gz) = 187438 bytes +SHA1 (patch-aa) = 27a8d2a53abdf6ca77444a671e8ad319a2e973d1 diff --git a/converters/p5-Jcode/patches/patch-aa b/converters/p5-Jcode/patches/patch-aa new file mode 100644 index 00000000000..285218d58fc --- /dev/null +++ b/converters/p5-Jcode/patches/patch-aa @@ -0,0 +1,17 @@ +$NetBSD: patch-aa,v 1.1.1.1.8.2 2002/06/23 18:42:21 jlam Exp $ + +--- MANIFEST.orig Fri May 3 09:01:24 2002 ++++ MANIFEST +@@ -15,7 +15,6 @@ + Unicode/_test.pl + Unicode/table.h + Unicode/uni.c +-mac_install.pl + t/ambiguous.pl + t/benchmark.pl + t/convert.t +@@ -32,4 +31,3 @@ + t/unibench.pl + t/x0212.euc + t/zenkaku.euc +-win_install.pl diff --git a/converters/p5-jcode/DESCR b/converters/p5-jcode/DESCR new file mode 100644 index 00000000000..8e9cd129287 --- /dev/null +++ b/converters/p5-jcode/DESCR @@ -0,0 +1,8 @@ +jcode.pl is Perl library for Japanese character code conversion. +It supports translation of each JIS, EUC, Shift JIS texts, and +automatically recognizes the encode-method of the target text files. + +Document is in jcode.pl itself as comment. +And jcode.pl-history file (in Japanese) might help you: + ftp://ftp.iij.ad.jp/pub/IIJ/dist/utashiro/perl/jcode.pl-history + ftp://ftp.sra.co.jp/pub/lang/perl/sra-scripts/jcode.pl-history diff --git a/converters/p5-jcode/Makefile b/converters/p5-jcode/Makefile new file mode 100644 index 00000000000..b26bd767beb --- /dev/null +++ b/converters/p5-jcode/Makefile @@ -0,0 +1,27 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:42:23 jlam Exp $ +# FreeBSD Id: Makefile,v 1.2 1999/01/17 10:56:40 vanilla Exp $ + +DISTNAME= jcode.pl-2.13 +PKGNAME= p5-jcode-2.13 +SVR4_PKGNAME= p5jc2 +CATEGORIES= japanese converters +MASTER_SITES= ftp://ftp.iij.ad.jp/pub/IIJ/dist/utashiro/perl/ \ + ftp://ftp.sra.co.jp/pub/lang/perl/sra-scripts/ +EXTRACT_SUFX= + +MAINTAINER= tech-pkg-ja@jp.netbsd.org +HOMEPAGE= # not available +COMMENT= Perl library for Japanese character code conversion + +USE_BUILDLINK_ONLY= YES + +WRKSRC= ${WRKDIR} +NO_BUILD= # defined +EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} . + +do-install: + ${INSTALL_DATA_DIR} ${PERL5_SITELIB} + ${INSTALL_DATA} ${WRKDIR}/${DISTNAME} ${PERL5_SITELIB}/jcode.pl + +.include "../../lang/perl5/buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/converters/p5-jcode/PLIST b/converters/p5-jcode/PLIST new file mode 100644 index 00000000000..d9ee8b4e1ec --- /dev/null +++ b/converters/p5-jcode/PLIST @@ -0,0 +1,2 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.16.2 2002/06/23 18:42:24 jlam Exp $ +${PERL5_SITELIB}/jcode.pl diff --git a/converters/p5-jcode/distinfo b/converters/p5-jcode/distinfo new file mode 100644 index 00000000000..675763104b6 --- /dev/null +++ b/converters/p5-jcode/distinfo @@ -0,0 +1,4 @@ +$NetBSD: distinfo,v 1.1.1.1.12.2 2002/06/23 18:42:25 jlam Exp $ + +SHA1 (jcode.pl-2.13) = a123c07e86addb950cb3d9b7128cff03aba12c60 +Size (jcode.pl-2.13) = 21093 bytes diff --git a/converters/p5-nkf/DESCR b/converters/p5-nkf/DESCR new file mode 100644 index 00000000000..ffd81368e75 --- /dev/null +++ b/converters/p5-nkf/DESCR @@ -0,0 +1,7 @@ +Nkf is a yet another kanji code converter among networks, hosts and terminals. +It converts input kanji code to desig- nated kanji code such as 7-bit +JIS, MS-kanji (shifted-JIS) or EUC. + +One of the most unique facicility of nkf is the guess of the input kanji +code. It currently recognizes 7-bit JIS, MS- kanji (shifted-JIS) and EUC. +So users needn't the input kanji code specification. diff --git a/converters/p5-nkf/Makefile b/converters/p5-nkf/Makefile new file mode 100644 index 00000000000..b381fa36101 --- /dev/null +++ b/converters/p5-nkf/Makefile @@ -0,0 +1,22 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:42:26 jlam Exp $ +# + +DISTNAME= nkf-1.7 +PKGNAME= p5-nkf-1.7 +SVR4_PKGNAME= p5nkf +CATEGORIES= japanese converters +MASTER_SITES= ftp://ftp.sra.co.jp/pub/cmd/nkf/ + +MAINTAINER= tech-pkg-ja@jp.netbsd.org +COMMENT= Perl library for Network Kanji code conversion Filter + +USE_BUILDLINK_ONLY= YES +PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/NKF/.packlist + +WRKSRC= ${WRKDIR}/${DISTNAME}/NKF + +do-configure: + @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL + +.include "../../lang/perl5/buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/converters/p5-nkf/PLIST b/converters/p5-nkf/PLIST new file mode 100644 index 00000000000..c2911f0050a --- /dev/null +++ b/converters/p5-nkf/PLIST @@ -0,0 +1 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.34.2 2002/06/23 18:42:27 jlam Exp $ diff --git a/converters/p5-nkf/distinfo b/converters/p5-nkf/distinfo new file mode 100644 index 00000000000..35a286893ae --- /dev/null +++ b/converters/p5-nkf/distinfo @@ -0,0 +1,4 @@ +$NetBSD: distinfo,v 1.1.1.1.6.2 2002/06/23 18:42:27 jlam Exp $ + +SHA1 (nkf-1.7.tar.gz) = 2116864c1acc8e6f80d4c59dc63c73eb37c9e80c +Size (nkf-1.7.tar.gz) = 28222 bytes diff --git a/converters/py-koCodecs/DESCR b/converters/py-koCodecs/DESCR new file mode 100644 index 00000000000..242990aa08b --- /dev/null +++ b/converters/py-koCodecs/DESCR @@ -0,0 +1,4 @@ +This package provides Unicode codecs that make Python aware of +Korean character encoding 'EUC-KR'. By using this package, Korean +characters can be treated as a character string instead of a byte +sequence. diff --git a/converters/py-koCodecs/Makefile b/converters/py-koCodecs/Makefile new file mode 100644 index 00000000000..9d9aa1e83a0 --- /dev/null +++ b/converters/py-koCodecs/Makefile @@ -0,0 +1,16 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:42:29 jlam Exp $ + +DISTNAME= KoreanCodecs-2.0.2 +PKGNAME= ${PYPKGPREFIX}-koCodecs-2.0.2 +CATEGORIES= converters +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=koco/} + +MAINTAINER= perky@fallin.lv +HOMEPAGE= http://sourceforge.net/projects/koco +COMMENT= Python Unicode codecs for Korean charsets + +PYDISTUTILSPKG= yes +PYBINMODULE= yes + +.include "../../lang/python/extension.buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/converters/py-koCodecs/PLIST b/converters/py-koCodecs/PLIST new file mode 100644 index 00000000000..647d77b56ee --- /dev/null +++ b/converters/py-koCodecs/PLIST @@ -0,0 +1,55 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.2.2 2002/06/23 18:42:30 jlam Exp $ +${PYSITELIB}/KoreanCodecs.pth +${PYSITELIB}/korean/__init__.py +${PYSITELIB}/korean/__init__.pyc +${PYSITELIB}/korean/c/__init__.py +${PYSITELIB}/korean/c/__init__.pyc +${PYSITELIB}/korean/c/_koco.so +${PYSITELIB}/korean/c/cp949.py +${PYSITELIB}/korean/c/cp949.pyc +${PYSITELIB}/korean/c/euc_kr.py +${PYSITELIB}/korean/c/euc_kr.pyc +${PYSITELIB}/korean/cp949.py +${PYSITELIB}/korean/cp949.pyc +${PYSITELIB}/korean/euc_kr.py +${PYSITELIB}/korean/euc_kr.pyc +${PYSITELIB}/korean/hangul.py +${PYSITELIB}/korean/hangul.pyc +${PYSITELIB}/korean/iso_2022_kr.py +${PYSITELIB}/korean/iso_2022_kr.pyc +${PYSITELIB}/korean/johab.py +${PYSITELIB}/korean/johab.pyc +${PYSITELIB}/korean/mappings/__init__.py +${PYSITELIB}/korean/mappings/__init__.pyc +${PYSITELIB}/korean/mappings/johab_ideograph.py +${PYSITELIB}/korean/mappings/johab_ideograph.pyc +${PYSITELIB}/korean/mappings/ksc5601_hangul.py +${PYSITELIB}/korean/mappings/ksc5601_hangul.pyc +${PYSITELIB}/korean/mappings/ksc5601_ideograph.py +${PYSITELIB}/korean/mappings/ksc5601_ideograph.pyc +${PYSITELIB}/korean/mappings/ksc5601_misc.py +${PYSITELIB}/korean/mappings/ksc5601_misc.pyc +${PYSITELIB}/korean/mappings/uhc.py +${PYSITELIB}/korean/mappings/uhc.pyc +${PYSITELIB}/korean/python/__init__.py +${PYSITELIB}/korean/python/__init__.pyc +${PYSITELIB}/korean/python/cp949.py +${PYSITELIB}/korean/python/cp949.pyc +${PYSITELIB}/korean/python/euc_kr.py +${PYSITELIB}/korean/python/euc_kr.pyc +${PYSITELIB}/korean/python/iso_2022_kr.py +${PYSITELIB}/korean/python/iso_2022_kr.pyc +${PYSITELIB}/korean/python/johab.py +${PYSITELIB}/korean/python/johab.pyc +${PYSITELIB}/korean/python/qwerty2bul.py +${PYSITELIB}/korean/python/qwerty2bul.pyc +${PYSITELIB}/korean/python/unijohab.py +${PYSITELIB}/korean/python/unijohab.pyc +${PYSITELIB}/korean/qwerty2bul.py +${PYSITELIB}/korean/qwerty2bul.pyc +${PYSITELIB}/korean/unijohab.py +${PYSITELIB}/korean/unijohab.pyc +@dirrm ${PYSITELIB}/korean/python +@dirrm ${PYSITELIB}/korean/mappings +@dirrm ${PYSITELIB}/korean/c +@dirrm ${PYSITELIB}/korean diff --git a/converters/py-koCodecs/distinfo b/converters/py-koCodecs/distinfo new file mode 100644 index 00000000000..39cc6e82ca4 --- /dev/null +++ b/converters/py-koCodecs/distinfo @@ -0,0 +1,4 @@ +$NetBSD: distinfo,v 1.1.1.1.2.2 2002/06/23 18:42:31 jlam Exp $ + +SHA1 (KoreanCodecs-2.0.2.tar.gz) = 958c9b3ad6dcbde98e49899ed8ea17e827b52dca +Size (KoreanCodecs-2.0.2.tar.gz) = 236218 bytes diff --git a/converters/py-zhCodecs/DESCR b/converters/py-zhCodecs/DESCR new file mode 100644 index 00000000000..122fea0e754 --- /dev/null +++ b/converters/py-zhCodecs/DESCR @@ -0,0 +1,2 @@ +This package supports Python interfaces for conversions between +Chinese and Unicode. diff --git a/converters/py-zhCodecs/Makefile b/converters/py-zhCodecs/Makefile new file mode 100644 index 00000000000..9048f73b7ba --- /dev/null +++ b/converters/py-zhCodecs/Makefile @@ -0,0 +1,22 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:42:33 jlam Exp $ + +DISTNAME= ChineseCodecs1.2.0 +PKGNAME= ${PYPKGPREFIX}-zhCodecs-1.2.0 +CATEGORIES= converters devel +MASTER_SITES= ftp://ftp.shellhung.org/pub/OpenBSD/packages/chinese/ \ + ftp://ftp2.python.or.kr/pub/FreeBSD/ports/distfiles/ + +MAINTAINER= shell@netbsd.org +HOMEPAGE= http://www.sourceforge.net/python-codecs/ +COMMENT= python Unicode codecs for Chinese charsets + +PYDISTUTILSPKG= # defined +PYBINMODULE= # defined + +WRKSRC= ${WRKDIR}/${DISTNAME}/Python + +post-extract: + @${CHMOD} 711 ${WRKSRC}/chinesetw + +.include "../../lang/python/extension.buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/converters/py-zhCodecs/PLIST b/converters/py-zhCodecs/PLIST new file mode 100644 index 00000000000..104c557585d --- /dev/null +++ b/converters/py-zhCodecs/PLIST @@ -0,0 +1,23 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.2.2 2002/06/23 18:42:34 jlam Exp $ +${PYSITELIB}/big5_tw.py +${PYSITELIB}/big5_tw.pyc +${PYSITELIB}/chinesecn/__init__.py +${PYSITELIB}/chinesecn/__init__.pyc +${PYSITELIB}/chinesecn/euc_gb23122utf.py +${PYSITELIB}/chinesecn/euc_gb23122utf.pyc +${PYSITELIB}/chinesecn/utf2euc_gb2312.py +${PYSITELIB}/chinesecn/utf2euc_gb2312.pyc +${PYSITELIB}/chinesetw/__init__.py +${PYSITELIB}/chinesetw/__init__.pyc +${PYSITELIB}/chinesetw/big52utf1.py +${PYSITELIB}/chinesetw/big52utf1.pyc +${PYSITELIB}/chinesetw/big52utf2.py +${PYSITELIB}/chinesetw/big52utf2.pyc +${PYSITELIB}/chinesetw/utf2big51.py +${PYSITELIB}/chinesetw/utf2big51.pyc +${PYSITELIB}/chinesetw/utf2big52.py +${PYSITELIB}/chinesetw/utf2big52.pyc +${PYSITELIB}/eucgb2312_cn.py +${PYSITELIB}/eucgb2312_cn.pyc +@dirrm ${PYSITELIB}/chinesetw +@dirrm ${PYSITELIB}/chinesecn diff --git a/converters/py-zhCodecs/distinfo b/converters/py-zhCodecs/distinfo new file mode 100644 index 00000000000..cc60a92e75b --- /dev/null +++ b/converters/py-zhCodecs/distinfo @@ -0,0 +1,4 @@ +$NetBSD: distinfo,v 1.1.1.1.12.2 2002/06/23 18:42:36 jlam Exp $ + +SHA1 (ChineseCodecs1.2.0.tar.gz) = 25f20cfdd19f7ea43684960344c3555696e75d4c +Size (ChineseCodecs1.2.0.tar.gz) = 519525 bytes diff --git a/converters/qkc/DESCR b/converters/qkc/DESCR new file mode 100644 index 00000000000..a193df653ad --- /dev/null +++ b/converters/qkc/DESCR @@ -0,0 +1,4 @@ +Qkc is a kanji code converter capable of SHIFT-JIS, EUC and JIS. +Unlike nkf, qkc can handle multiple files at a time. Qkc also has +functionality to change end-of-line characters, ie, from CR+LF to LF, +or to CR, and vice versa. diff --git a/converters/qkc/Makefile b/converters/qkc/Makefile new file mode 100644 index 00000000000..6953480fdcc --- /dev/null +++ b/converters/qkc/Makefile @@ -0,0 +1,21 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:42:38 jlam Exp $ +# FreeBSD: ports/japanese/qkc/Makefile,v 1.15 2001/05/10 11:42:23 max Exp + +DISTNAME= qkcc100 +PKGNAME= qkc-1.0 +CATEGORIES= japanese converters +MASTER_SITES= http://hp.vector.co.jp/authors/VA000501/ +EXTRACT_SUFX= .zip + +MAINTAINER= hiramatu@boreas.dti.ne.jp +HOMEPAGE= http://hp.vector.co.jp/authors/VA000501/ +COMMENT= Quick Kanji code Converter + +WRKSRC= ${WRKDIR} +ALL_TARGET= qkc + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/qkc ${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/qkc.1 ${PREFIX}/man/ja_JP.EUC/man1 + +.include "../../mk/bsd.pkg.mk" diff --git a/converters/qkc/PLIST b/converters/qkc/PLIST new file mode 100644 index 00000000000..138842fe02a --- /dev/null +++ b/converters/qkc/PLIST @@ -0,0 +1,3 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.50.2 2002/06/23 18:42:40 jlam Exp $ +bin/qkc +man/ja_JP.EUC/man1/qkc.1 diff --git a/converters/qkc/distinfo b/converters/qkc/distinfo new file mode 100644 index 00000000000..9f9443689c1 --- /dev/null +++ b/converters/qkc/distinfo @@ -0,0 +1,4 @@ +$NetBSD: distinfo,v 1.1.1.1.2.2 2002/06/23 18:42:41 jlam Exp $ + +SHA1 (qkcc100.zip) = 25b5ecc5d34c76d6e784686621e5679aeb0ded66 +Size (qkcc100.zip) = 36308 bytes diff --git a/converters/ruby-romkan/DESCR b/converters/ruby-romkan/DESCR new file mode 100644 index 00000000000..3c19f0c0694 --- /dev/null +++ b/converters/ruby-romkan/DESCR @@ -0,0 +1,2 @@ +Ruby/Romkan is a Romaji <-> Kana conversion library for Ruby. It can +convert a Japanese Romaji string to a Japanese Kana string or vice versa. diff --git a/converters/ruby-romkan/Makefile b/converters/ruby-romkan/Makefile new file mode 100644 index 00000000000..330b60fd232 --- /dev/null +++ b/converters/ruby-romkan/Makefile @@ -0,0 +1,29 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:42:44 jlam Exp $ + +DISTNAME= ruby-romkan-0.4 +CATEGORIES= japanese converters +MASTER_SITES= http://namazu.org/~satoru/ruby-romkan/ + +MAINTAINER= packages@netbsd.org +HOMEPAGE= http://namazu.org/~satoru/ruby-romkan/ +COMMENT= Romaji <-> Kana conversion library for Ruby + +DIST_SUBDIR= ruby +USE_RUBY_RD= # defined +NO_CONFIGURE= # defined + +do-build: + cd ${WRKSRC}; ${RUBY_RD} romkan.en.rd > romkan.html + cd ${WRKSRC}; ${RUBY_RD} romkan.ja.rd > romkan.html.ja + +do-install: + ${INSTALL_DATA} ${WRKSRC}/romkan.rb ${RUBY_SITELIBDIR} + ${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/romkan + ${INSTALL_DATA} ${WRKSRC}/romkan.html ${RUBY_DOCDIR}/romkan + ${INSTALL_DATA} ${WRKSRC}/romkan.html.ja ${RUBY_DOCDIR}/romkan + ${INSTALL_DATA} ${WRKSRC}/romkan.en.rd ${RUBY_DOCDIR}/romkan/romkan.rd + ${INSTALL_DATA} ${WRKSRC}/romkan.ja.rd ${RUBY_DOCDIR}/romkan + +.include "../../textproc/ruby-rdtool/Makefile.common" +.include "../../lang/ruby-base/Makefile.common" +.include "../../mk/bsd.pkg.mk" diff --git a/converters/ruby-romkan/PLIST b/converters/ruby-romkan/PLIST new file mode 100644 index 00000000000..02eaa9f23c0 --- /dev/null +++ b/converters/ruby-romkan/PLIST @@ -0,0 +1,7 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.38.2 2002/06/23 18:42:46 jlam Exp $ +${RUBY_SITELIBDIR}/romkan.rb +${RUBY_DOCDIR}/romkan/romkan.html +${RUBY_DOCDIR}/romkan/romkan.html.ja +${RUBY_DOCDIR}/romkan/romkan.ja.rd +${RUBY_DOCDIR}/romkan/romkan.rd +@dirrm ${RUBY_DOCDIR}/romkan diff --git a/converters/ruby-romkan/distinfo b/converters/ruby-romkan/distinfo new file mode 100644 index 00000000000..ef371541e6c --- /dev/null +++ b/converters/ruby-romkan/distinfo @@ -0,0 +1,4 @@ +$NetBSD: distinfo,v 1.1.1.1.12.2 2002/06/23 18:42:47 jlam Exp $ + +SHA1 (ruby/ruby-romkan-0.4.tar.gz) = 316b95ac4c8914fd1020d9b0893c870ace68a144 +Size (ruby/ruby-romkan-0.4.tar.gz) = 4653 bytes diff --git a/converters/ruby-uconv/DESCR b/converters/ruby-uconv/DESCR new file mode 100644 index 00000000000..b7d28c5cc57 --- /dev/null +++ b/converters/ruby-uconv/DESCR @@ -0,0 +1,7 @@ +This is an Unicode conversion library with Japanese codesets support +for Ruby. + +Supported character encoding schemes are UCS-4, UTF-16, UTF-8, EUC-JP, +CP932 (a variant of Shift_JIS for Japanese Windows). + +WWW: http://www.yoshidam.net/Ruby.html#uconv diff --git a/converters/ruby-uconv/Makefile b/converters/ruby-uconv/Makefile new file mode 100644 index 00000000000..e3860565f31 --- /dev/null +++ b/converters/ruby-uconv/Makefile @@ -0,0 +1,35 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:42:48 jlam Exp $ +# FreeBSD: ports/japanese/ruby-uconv/Makefile,v 1.8 2001/01/30 19:26:22 knu Exp + +DISTNAME= uconv-0.4.9 +PKGNAME= ${RUBY_PKGNAMEPREFIX}${DISTNAME} +CATEGORIES= japanese converters +MASTER_SITES= http://www.yoshidam.net/ + +MAINTAINER= taca@netbsd.org +HOMEPAGE= http://www.yoshidam.net/Ruby.html#uconv +COMMENT= Unicode conversion library with Japanese codesets support + +DIST_SUBDIR= ruby +USE_RUBY= yes +USE_RUBY_EXTCONF= yes + +WRKSRC= ${WRKDIR}/uconv +INSTALL_TARGET= site-install + +REPLACE_RUBY= samples/euc2unicode.rb samples/unicode2euc.rb \ + samples/xmlconv.rb +EXAMPLES= euc2unicode.rb test_euc.txt test_euc.xml trilang.xml \ + unicode2euc.rb xmlconv.rb + +post-install: + ${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/uconv +.for f in ${EXAMPLES} + ${INSTALL_DATA} ${WRKSRC}/samples/${f} ${RUBY_EXAMPLESDIR}/uconv +.endfor + ${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/uconv + ${INSTALL_DATA} ${WRKSRC}/README ${RUBY_DOCDIR}/uconv + ${INSTALL_DATA} ${WRKSRC}/README.ja ${RUBY_DOCDIR}/uconv + +.include "../../lang/ruby-base/Makefile.common" +.include "../../mk/bsd.pkg.mk" diff --git a/converters/ruby-uconv/PLIST b/converters/ruby-uconv/PLIST new file mode 100644 index 00000000000..3b8b90b95c2 --- /dev/null +++ b/converters/ruby-uconv/PLIST @@ -0,0 +1,12 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.10.2 2002/06/23 18:42:49 jlam Exp $ +${RUBY_SITEARCHLIBDIR}/uconv.so +${RUBY_DOCDIR}/uconv/README +${RUBY_DOCDIR}/uconv/README.ja +@dirrm ${RUBY_DOCDIR}/uconv +${RUBY_EXAMPLESDIR}/uconv/euc2unicode.rb +${RUBY_EXAMPLESDIR}/uconv/test_euc.txt +${RUBY_EXAMPLESDIR}/uconv/test_euc.xml +${RUBY_EXAMPLESDIR}/uconv/trilang.xml +${RUBY_EXAMPLESDIR}/uconv/unicode2euc.rb +${RUBY_EXAMPLESDIR}/uconv/xmlconv.rb +@dirrm ${RUBY_EXAMPLESDIR}/uconv diff --git a/converters/ruby-uconv/distinfo b/converters/ruby-uconv/distinfo new file mode 100644 index 00000000000..268755b2e57 --- /dev/null +++ b/converters/ruby-uconv/distinfo @@ -0,0 +1,4 @@ +$NetBSD: distinfo,v 1.1.1.1.10.2 2002/06/23 18:42:50 jlam Exp $ + +SHA1 (ruby/uconv-0.4.9.tar.gz) = 28f5692fa4705fdefa19dc9fbc7470c0f01cc750 +Size (ruby/uconv-0.4.9.tar.gz) = 585698 bytes diff --git a/converters/tex2rtf/DESCR b/converters/tex2rtf/DESCR new file mode 100644 index 00000000000..9caaea10c7e --- /dev/null +++ b/converters/tex2rtf/DESCR @@ -0,0 +1,6 @@ +Tex2RTF is a program written by Julian Smart (julian.smart@ukonline.co.uk) +to convert from a LaTeX subset to four other formats: + * Linear RTF, for importing into a wide range of word processors. + * Windows Help hypertext RTF, for compilation with HC (Help Compiler). + * HTML (Hypertext Markup Language), as used on the World Wide Web. + * XLP wxHelp format (the wxWindows toolkit help format). diff --git a/converters/tex2rtf/Makefile b/converters/tex2rtf/Makefile new file mode 100644 index 00000000000..05a89e6db0e --- /dev/null +++ b/converters/tex2rtf/Makefile @@ -0,0 +1,22 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:42:52 jlam Exp $ + +DISTNAME= tex2rtf164_source +PKGNAME= tex2rtf-164 +CATEGORIES= converters textproc +MASTER_SITES= ftp://www.remstar.com/pub/wxwin/tex2rtf/ \ + ftp://ftp.sunet.se/pub7/lang/wxwin/tex2rtf/ +EXTRACT_SUFX= .zip + +MAINTAINER= collver@linuxfreemail.com +HOMEPAGE= http://web.ukonline.co.uk/julian.smart/tex2rtf/ +COMMENT= LaTex-to-RTF translator + +WRKSRC= ${WRKDIR}/src + +do-build: + cd ${WRKSRC} && make -f makefile.unx nogui + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/tex2rtf_nogui ${PREFIX}/bin/tex2rtf + +.include "../../mk/bsd.pkg.mk" diff --git a/converters/tex2rtf/PLIST b/converters/tex2rtf/PLIST new file mode 100644 index 00000000000..ef04d4346d7 --- /dev/null +++ b/converters/tex2rtf/PLIST @@ -0,0 +1,2 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.50.2 2002/06/23 18:42:53 jlam Exp $ +bin/tex2rtf diff --git a/converters/tex2rtf/distinfo b/converters/tex2rtf/distinfo new file mode 100644 index 00000000000..133b2618b24 --- /dev/null +++ b/converters/tex2rtf/distinfo @@ -0,0 +1,6 @@ +$NetBSD: distinfo,v 1.1.1.1.4.2 2002/06/23 18:42:54 jlam Exp $ + +SHA1 (tex2rtf164_source.zip) = 553e76b3ffd7e0a670427ea27a4cdaab3cee4d72 +Size (tex2rtf164_source.zip) = 310555 bytes +SHA1 (patch-aa) = 08b848150d26177e8401a0538fe9ea49395c1a5e +SHA1 (patch-ab) = fbb7a7733670acc96f86765c7c3d34baeab4a061 diff --git a/converters/tex2rtf/patches/patch-aa b/converters/tex2rtf/patches/patch-aa new file mode 100644 index 00000000000..f03ff093092 --- /dev/null +++ b/converters/tex2rtf/patches/patch-aa @@ -0,0 +1,13 @@ +$NetBSD: patch-aa,v 1.1.1.1.6.2 2002/06/23 18:42:55 jlam Exp $ + +--- make.env.orig Thu Sep 12 11:58:42 1996 ++++ make.env +@@ -56,7 +56,7 @@ + # Sun with GCC: nothing + # Solaris: -lgen -ldl -lsocket -lnsl + # SGI: -lPW +-COMPLIBS=-lg++ ++COMPLIBS=-lstdc++ + + # HP-specific compiler library: an AIAI convenience + HPCOMPLIBS= diff --git a/converters/tex2rtf/patches/patch-ab b/converters/tex2rtf/patches/patch-ab new file mode 100644 index 00000000000..2429d67c74e --- /dev/null +++ b/converters/tex2rtf/patches/patch-ab @@ -0,0 +1,22 @@ +$NetBSD: patch-ab,v 1.1.1.1.6.2 2002/06/23 18:42:56 jlam Exp $ + +--- makefile.unx.orig Sun Nov 23 17:55:48 1997 ++++ makefile.unx +@@ -2,7 +2,7 @@ + # Valid targets: xview, motif or nogui. These should produce + # the executables tex2rtf_ol, tex2rtf_motif and tex2rtf_nogui respectively. + +-WXDIR = ../../.. ++WXDIR = .. + + # All common UNIX compiler flags and options are now in + # this central makefile. +@@ -25,7 +25,7 @@ + + TEX2ANYLIB = $(TEX2RTFDIR)/lib/libtex2any$(GUISUFFIX).a + +-INC = -I$(WXDIR)/include/base -I$(WXDIR)/include/x -I$(WXHELPDIR)/src $(COMPPATHS) ++INC = -I$(WXDIR)/include/base -I$(WXDIR)/include/x -I$(WXHELPDIR)/src -I$(WXDIR)/src/wxwin $(COMPPATHS) + + LDFLAGS = $(XLIB) -L$(WXDIR)/lib -L$(TEX2RTFDIR)/lib + diff --git a/converters/ttf2pt1/Makefile b/converters/ttf2pt1/Makefile index aa66818bf9a..efc22faf87f 100644 --- a/converters/ttf2pt1/Makefile +++ b/converters/ttf2pt1/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.1 2002/01/02 20:30:16 reinoud Exp $ +# $NetBSD: Makefile,v 1.1.2.1 2002/06/23 18:42:56 jlam Exp $ # DISTNAME= ttf2pt1-3.4.0 +PKGREVISION= 2 CATEGORIES= converters MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ttf2pt1/} EXTRACT_SUFX= .tgz @@ -10,4 +11,9 @@ MAINTAINER= reinoud@netbsd.org HOMEPAGE= http://ttf2pt1.sourceforge.net COMMENT= TrueType font converter to Postscript type 1 +DEPENDS+= t1utils-[0-9]*:../../textproc/t1utils + +USE_CONFIG_WRAPPER= yes + +.include "../../graphics/freetype2/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/converters/ttf2pt1/PLIST b/converters/ttf2pt1/PLIST index 3712ab956b8..34eac09a030 100644 --- a/converters/ttf2pt1/PLIST +++ b/converters/ttf2pt1/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/02/05 22:39:01 skrll Exp $ +@comment $NetBSD: PLIST,v 1.2.2.1 2002/06/23 18:42:57 jlam Exp $ bin/ttf2pt1 bin/ttf2pt1_convert bin/ttf2pt1_x2gs @@ -13,7 +13,6 @@ share/ttf2pt1/FONTS.hpux share/ttf2pt1/FONTS.hpux.html share/ttf2pt1/FONTS.html share/ttf2pt1/README -share/ttf2pt1/README.FIRST share/ttf2pt1/README.html share/ttf2pt1/app/RPM/ttf2pt1.spec.src share/ttf2pt1/app/X11/README @@ -101,5 +100,3 @@ share/ttf2pt1/scripts/x2gs @dirrm share/ttf2pt1/app/RPM @dirrm share/ttf2pt1/app @dirrm share/ttf2pt1 -@exec ${MKDIR} -p %D/libexec/ttf2pt1 -@dirrm libexec/ttf2pt1 diff --git a/converters/ttf2pt1/distinfo b/converters/ttf2pt1/distinfo index d27e68f0731..120bff4e137 100644 --- a/converters/ttf2pt1/distinfo +++ b/converters/ttf2pt1/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1 2002/01/02 20:30:17 reinoud Exp $ +$NetBSD: distinfo,v 1.1.2.1 2002/06/23 18:42:58 jlam Exp $ SHA1 (ttf2pt1-3.4.0.tgz) = 1e11478ab5f6dae26ea743dc1149603d652746bb Size (ttf2pt1-3.4.0.tgz) = 204811 bytes -SHA1 (patch-aa) = a74ad2bcaa3d4fd12973f229f53e0d5e42215368 +SHA1 (patch-aa) = 798855010e4c1615ac25050e21771103c92f2fff diff --git a/converters/ttf2pt1/patches/patch-aa b/converters/ttf2pt1/patches/patch-aa index 2757b076544..3a49ac765d2 100644 --- a/converters/ttf2pt1/patches/patch-aa +++ b/converters/ttf2pt1/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.1 2002/01/02 20:30:18 reinoud Exp $ +$NetBSD: patch-aa,v 1.1.2.1 2002/06/23 18:42:58 jlam Exp $ --- Makefile.orig Mon Oct 15 04:32:29 2001 +++ Makefile -@@ -20,11 +20,11 @@ +@@ -20,7 +20,7 @@ # # Default @@ -11,12 +11,37 @@ $NetBSD: patch-aa,v 1.1 2002/01/02 20:30:18 reinoud Exp $ # For GNU C # --#CFLAGS_SYS= -O2 -+CFLAGS_SYS= -O2 - # - # For GNU C with long options support library (Linux etc.) - # -@@ -93,7 +93,7 @@ +@@ -54,7 +54,7 @@ + # This WON'T BUILD with FT2-beta8, use the FreeType release 2.0. + # http://download.sourceforge.net/freetype/freetype-2.0.tar.gz + +-CFLAGS_FT= ++CFLAGS_FT= -DUSE_FREETYPE `${FREETYPE_CONFIG} --cflags` + + # To enable use of the FreeType-2 library + # (if the include and lib directory do not match your installation, +@@ -65,7 +65,7 @@ + # + # The FreeType-2 library flags (disabled by default) + +-LIBS_FT= ++LIBS_FT= `${FREETYPE_CONFIG} --libs` -Wl,-R`${FREETYPE_CONFIG} --prefix`/lib + + # To enable use of the FreeType-2 library + # (if the include and lib directory do not match your installation, +@@ -84,20 +84,20 @@ + #CFLAGS_PREF= -DPREFER_FREETYPE + + # Uncomment the second line to not compile t1asm into ttf2pt1 +-CFLAGS_EXTT1ASM= +-#CFLAGS_EXTT1ASM= -DEXTERNAL_T1ASM ++#CFLAGS_EXTT1ASM= ++CFLAGS_EXTT1ASM= -DEXTERNAL_T1ASM + +-CFLAGS= $(CFLAGS_SYS) $(CFLAGS_FT) $(CFLAGS_PREF) ++CFLAGS+= $(CFLAGS_SYS) $(CFLAGS_FT) $(CFLAGS_PREF) + LIBS= $(LIBS_SYS) $(LIBS_FT) + # Installation-related stuff # # The base dir for installation and subdirs in it @@ -25,41 +50,27 @@ $NetBSD: patch-aa,v 1.1 2002/01/02 20:30:18 reinoud Exp $ # for binaries BINDIR = $(INSTDIR)/bin # for binaries of little general interest -@@ -123,7 +123,7 @@ +-LIBXDIR = $(INSTDIR)/libexec/ttf2pt1 ++LIBXDIR = $(INSTDIR)/bin + # for scripts, maps/encodings etc. + SHAREDIR = $(INSTDIR)/share/ttf2pt1 + MANDIR = $(INSTDIR)/man +@@ -118,12 +118,12 @@ + app/X11/README app/netscape/README + + SUBDIRS = app encodings maps scripts other +-TXTFILES = README* FONTS* CHANGES* COPYRIGHT ++TXTFILES = README README.html FONTS* CHANGES* COPYRIGHT + MANS1=ttf2pt1.1 ttf2pt1_convert.1 ttf2pt1_x2gs.1 MANS=$(MANS1) $(MANS5) -all: t1asm ttf2pt1 docs mans rpm -+all: t1asm ttf2pt1 docs mans ++all: ttf2pt1 docs mans docs: $(DOCS) -@@ -136,7 +136,7 @@ - veryclean: clean - rm -f $(DOCS) $(MANS) - --rpm: app/RPM/Makefile app/RPM/ttf2pt1.spec -+#rpm: app/RPM/Makefile app/RPM/ttf2pt1.spec - - ttf2pt1.1: README.html - scripts/html2man . . <README.html -@@ -144,11 +144,11 @@ - ttf2pt1_convert.1 ttf2pt1_x2gs.1: FONTS.html - scripts/html2man . . <FONTS.html - --app/RPM/Makefile: Makefile -- sed 's/^CFLAGS_SYS.*=.*$$/CFLAGS_SYS= -O2 -D_GNU_SOURCE/;/warning:/,/^$$/s/^/#/' <Makefile >app/RPM/Makefile -+#app/RPM/Makefile: Makefile -+# sed 's/^CFLAGS_SYS.*=.*$$/CFLAGS_SYS= -O2 -D_GNU_SOURCE/;/warning:/,/^$$/s/^/#/' <Makefile >app/RPM/Makefile - --app/RPM/ttf2pt1.spec: app/RPM/ttf2pt1.spec.src version.h -- sed 's/^Version:.*/Version: '`grep TTF2PT1_VERSION version.h| cut -d\" -f2`'/' <app/RPM/ttf2pt1.spec.src >$@ -+#app/RPM/ttf2pt1.spec: app/RPM/ttf2pt1.spec.src version.h -+# sed 's/^Version:.*/Version: '`grep TTF2PT1_VERSION version.h| cut -d\" -f2`'/' <app/RPM/ttf2pt1.spec.src >$@ - - t1asm: t1asm.c - $(CC) $(CFLAGS) -o t1asm -DSTANDALONE t1asm.c $(LIBS) -@@ -202,24 +202,24 @@ +@@ -202,31 +202,21 @@ scripts/unhtml <FONTS.hpux.html >FONTS.hpux install: all @@ -68,29 +79,35 @@ $NetBSD: patch-aa,v 1.1 2002/01/02 20:30:18 reinoud Exp $ - scripts/inst_dir $(SHAREDIR) - scripts/inst_dir $(MANDIR)/man1 - scripts/inst_dir $(MANDIR)/man5 -+ install -d $(BINDIR) -+ install -d $(LIBXDIR) -+ install -d $(SHAREDIR) -+ install -d $(MANDIR)/man1 -+ install -d $(MANDIR)/man5 - cp -R $(TXTFILES) $(SUBDIRS) $(SHAREDIR) - chown -R $(OWNER) $(SHAREDIR) - chgrp -R $(GROUP) $(SHAREDIR) - chmod -R go-w $(SHAREDIR) +- cp -R $(TXTFILES) $(SUBDIRS) $(SHAREDIR) +- chown -R $(OWNER) $(SHAREDIR) +- chgrp -R $(GROUP) $(SHAREDIR) +- chmod -R go-w $(SHAREDIR) - scripts/inst_file ttf2pt1 $(BINDIR)/ttf2pt1 $(OWNER) $(GROUP) 0755 - [ -f $(BINDIR)/t1asm ] || scripts/inst_file t1asm $(LIBXDIR)/t1asm $(OWNER) $(GROUP) 0755 -+ install -c -o $(OWNER) -g $(GROUP) -m 0755 ttf2pt1 $(BINDIR) -+ [ -f $(BINDIR)/t1asm ] || install -c -o $(OWNER) -g $(GROUP) -m 0755 t1asm $(LIBXDIR)/t1asm ++ $(BSD_INSTALL_DATA_DIR) $(SHAREDIR) ++ cp -Rf $(TXTFILES) $(SUBDIRS) $(SHAREDIR) ++ $(BSD_INSTALL_PROGRAM) ttf2pt1 $(BINDIR) sed 's|^TTF2PT1_BINDIR=$$|TTF2PT1_BINDIR=$(BINDIR)|;\ s|^TTF2PT1_LIBXDIR=$$|TTF2PT1_LIBXDIR=$(LIBXDIR)|;\ s|^TTF2PT1_SHAREDIR=$$|TTF2PT1_SHAREDIR=$(SHAREDIR)|;' <scripts/convert >cvt.tmp - scripts/inst_file cvt.tmp $(BINDIR)/ttf2pt1_convert $(OWNER) $(GROUP) 0755 - scripts/inst_file cvt.tmp $(SHAREDIR)/scripts/convert $(OWNER) $(GROUP) 0755 -+ install -c -o $(OWNER) -g $(GROUP) -m 0755 cvt.tmp $(BINDIR)/ttf2pt1_convert -+ install -c -o $(OWNER) -g $(GROUP) -m 0755 cvt.tmp $(SHAREDIR)/scripts/convert - rm cvt.tmp +- rm cvt.tmp - scripts/inst_file scripts/x2gs $(BINDIR)/ttf2pt1_x2gs $(OWNER) $(GROUP) 0755 -+ install -c -o $(OWNER) -g $(GROUP) -m 0755 scripts/x2gs $(BINDIR)/ttf2pt1_x2gs ++ $(BSD_INSTALL_SCRIPT) cvt.tmp $(BINDIR)/ttf2pt1_convert ++ rm -f cvt.tmp ++ $(BSD_INSTALL_SCRIPT) scripts/x2gs $(BINDIR)/ttf2pt1_x2gs for i in $(MANS1); do { \ sed 's|TTF2PT1_BINDIR|$(BINDIR)|;\ s|TTF2PT1_LIBXDIR|$(LIBXDIR)|;\ +- s|TTF2PT1_SHAREDIR|$(SHAREDIR)|;' <$$i >$(MANDIR)/man1/$$i \ +- && chown $(OWNER) $(MANDIR)/man1/$$i \ +- && chgrp $(GROUP) $(MANDIR)/man1/$$i \ +- && chmod 0644 $(MANDIR)/man1/$$i \ ++ s|TTF2PT1_SHAREDIR|$(SHAREDIR)|;' <$$i >$$i.tmp \ ++ && $(BSD_INSTALL_MAN) $$i.tmp $(MANDIR)/man1/$$i \ ++ && rm -f $$i.tmp \ + || exit 1; \ + } done + diff --git a/cross/i386-mingw32/Makefile b/cross/i386-mingw32/Makefile index 077ba563bab..2c0c4d5d48c 100644 --- a/cross/i386-mingw32/Makefile +++ b/cross/i386-mingw32/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2002/04/05 18:55:26 kent Exp $ +# $NetBSD: Makefile,v 1.7.2.1 2002/06/23 18:42:59 jlam Exp $ DISTNAME= cross-${TARGET_ARCH}-1.2 PKGREVISION= 3 @@ -12,7 +12,7 @@ USE_CROSSBASE= yes TARGET_ARCH= i386-mingw32 TARGET_DIR= ${PREFIX}/${TARGET_ARCH} -MASTER_SITES+= http://prdownloads.sourceforge.net/mingw/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mingw/} CROSS_DISTFILES+= binutils-2.11.92-20011113-src.tar.gz BINUTILS_WRKSRC= ${WRKDIR}/binutils-2.11.92-20011113 BINUTILS_EXTRAS= dlltool dllwrap windres diff --git a/cross/mipsEEel-netbsd/DESCR b/cross/mipsEEel-netbsd/DESCR index 88dca9f1d92..79ba8a336bf 100644 --- a/cross/mipsEEel-netbsd/DESCR +++ b/cross/mipsEEel-netbsd/DESCR @@ -1,5 +1,5 @@ This is a cross compiler for mipsEEel, R5900 Emotion Engine, -which is the CPU of PlayStatoin2. +which is the CPU of PlayStation2. The cross compiler was tested only for compiling the NetBSD kernel. diff --git a/cross/mipsEEel-netbsd/Makefile b/cross/mipsEEel-netbsd/Makefile index f29774169f6..39f410ee087 100644 --- a/cross/mipsEEel-netbsd/Makefile +++ b/cross/mipsEEel-netbsd/Makefile @@ -1,10 +1,11 @@ -# $NetBSD: Makefile,v 1.4 2001/09/27 23:17:52 jlam Exp $ +# $NetBSD: Makefile,v 1.4.2.1 2002/06/23 18:43:01 jlam Exp $ DISTNAME= cross-${TARGET_ARCH}-${DISTVERSION} TARGET_ARCH= mipsEEel-netbsd DISTVERSION= 1.0.0 +PKGREVISION= 1 CATEGORIES+= cross lang -MAINTAINER= kent@netbsd.org +MAINTAINER= packages@netbsd.org COMMENT= Cross-compiler for NetBSD/PlayStation2 kernel BZCAT= /usr/bin/bzcat @@ -20,11 +21,9 @@ PLIST_SUBST+= SUBDIR="cross-ps2" TARGET_ARCH="${TARGET_ARCH}" \ # # binutils # -MASTER_SITES+= ftp://ftp.netbsd.org/pub/NetBSD/misc/tshiozak/PlayStation2/GPLed-from-SCEI/binutils-2.9EE/ -DISTFILES+= binutils-2.9EE.linux.patch.bz2 -BINUTILS_PATCH1= ${_DISTDIR}/binutils-2.9EE.linux.patch.bz2 -DISTFILES+= binutils-ps2linux-0.9.patch.bz2 -BINUTILS_PATCH2= ${_DISTDIR}/binutils-ps2linux-0.9.patch.bz2 +MASTER_SITES+= ftp://ftp.netbsd.org/pub/NetBSD/misc/hamajima/PlayStation2/GPLed-from-SCEI/binutils-2.9EE/ +DISTFILES+= binutils-ps2linux-1.0.0.patch.bz2 +BINUTILS_PATCH1= ${_DISTDIR}/binutils-ps2linux-1.0.0.patch.bz2 BINUTILS_DISTNAME= binutils-2.9EE BINUTILS_WRKSRC= ${WRKDIR}/${BINUTILS_DISTNAME} @@ -34,16 +33,18 @@ EXTRACT_ONLY= ${BINUTILS_DISTNAME}.tar.gz # # gcc # -MASTER_SITES+= ftp://ftp.netbsd.org/pub/NetBSD/misc/tshiozak/PlayStation2/GPLed-from-SCEI/gcc-2.95.2EE/ +MASTER_SITES+= ftp://ftp.netbsd.org/pub/NetBSD/misc/hamajima/PlayStation2/GPLed-from-SCEI/gcc-2.95.2EE/ GCC_VERSION= 2.95.2 GCC_DISTNAME= gcc-${GCC_VERSION} GCC_WRKSRC= ${WRKDIR}/${GCC_DISTNAME} DISTFILES+= ${GCC_DISTNAME}.tar.gz EXTRACT_ONLY+= ${GCC_DISTNAME}.tar.gz -DISTFILES+= gcc-${GCC_VERSION}.EE-linux.patch.bz2 -GCC_PATCH1= ${_DISTDIR}/gcc-${GCC_VERSION}.EE-linux.patch.bz2 -DISTFILES+= gcc-ps2linux-0.9.1.patch.bz2 -GCC_PATCH2= ${_DISTDIR}/gcc-ps2linux-0.9.1.patch.bz2 +DISTFILES+= gcc-${GCC_VERSION}-frankengcc-patches.patch.bz2 +GCC_PATCH0= ${_DISTDIR}/gcc-${GCC_VERSION}-frankengcc-patches.patch.bz2 +DISTFILES+= gcc-${GCC_VERSION}-single-float-const.patch.bz2 +GCC_PATCH1= ${_DISTDIR}/gcc-${GCC_VERSION}-single-float-const.patch.bz2 +DISTFILES+= gcc-ps2linux-1.0.0.patch.bz2 +GCC_PATCH2= ${_DISTDIR}/gcc-ps2linux-1.0.0.patch.bz2 BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison BUILD_DEPENDS+= autoconf-[0-9]*:../../devel/autoconf @@ -56,7 +57,6 @@ do-install: binutils-install gcc-install binutils-patch: ${BZCAT} ${BINUTILS_PATCH1} | ${PATCH} -d ${BINUTILS_WRKSRC} --forward --quiet -p1 -E - ${BZCAT} ${BINUTILS_PATCH2} | ${PATCH} -d ${BINUTILS_WRKSRC} --forward --quiet -p1 -E for i in patches/binutils-*; do \ ${PATCH} -d ${BINUTILS_WRKSRC} --forward --quiet -E < $$i; \ done @@ -74,6 +74,7 @@ binutils-install: gcc-patch: + ${BZCAT} ${GCC_PATCH0} | ${PATCH} -d ${GCC_WRKSRC} --forward --quiet -p1 -E ${BZCAT} ${GCC_PATCH1} | ${PATCH} -d ${GCC_WRKSRC} --forward --quiet -p1 -E ${BZCAT} ${GCC_PATCH2} | ${PATCH} -d ${GCC_WRKSRC} --forward --quiet -p1 -E for i in patches/gcc-*; do \ @@ -84,21 +85,20 @@ gcc-configure: ${MKDIR} ${GCC_WRKSRC}/obj cd ${GCC_WRKSRC}/obj && ../configure --prefix=${TARGET_DIR} \ --enable-shared --target=${TARGET_ARCH} \ - --enable-languages=c,c++ --with-gnu-as \ + --enable-languages=c --with-gnu-as \ --with-gnu-ld --disable-nls -${RM} ${GCC_WRKSRC}/obj/texinfo/makeinfo/Makefile gcc-build: - -${RM} ${GCC_WRKSRC}/obj/gcc/as - -${RM} ${GCC_WRKSRC}/obj/gcc/ld - ${LN} -s ${BINUTILS_WRKSRC}/obj/gas/as-new ${GCC_WRKSRC}/obj/gcc/as - ${LN} -s ${BINUTILS_WRKSRC}/obj/ld/ld-new ${GCC_WRKSRC}/obj/gcc/ld + ${LN} -sf ${BINUTILS_WRKSRC}/obj/gas/as-new ${GCC_WRKSRC}/obj/gcc/as + ${LN} -sf ${BINUTILS_WRKSRC}/obj/ld/ld-new ${GCC_WRKSRC}/obj/gcc/ld ${GMAKE} -C ${GCC_WRKSRC}/obj/libiberty # ${GMAKE} -C ${GCC_WRKSRC}/obj/texinfo ${GMAKE} -C ${GCC_WRKSRC}/obj/gcc LIBGCC="" LIBGCC1_TEST="" INSTALL_LIBGCC="" gcc-install: - ${GMAKE} -C ${GCC_WRKSRC}/obj/gcc install-common install-headers install-cpp lang.install-normal install-driver + ${GMAKE} -C ${GCC_WRKSRC}/obj/gcc install-common install-headers \ + install-cpp lang.install-normal install-driver .include "../../mk/bsd.pkg.mk" diff --git a/cross/mipsEEel-netbsd/PLIST b/cross/mipsEEel-netbsd/PLIST index 11ec23dcfd5..8ceb393273d 100644 --- a/cross/mipsEEel-netbsd/PLIST +++ b/cross/mipsEEel-netbsd/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:03:38 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.1.2.1 2002/06/23 18:43:02 jlam Exp $ ${SUBDIR}/bin/cpp ${SUBDIR}/bin/ee-dvp-as ${SUBDIR}/bin/ee-dvp-gasp @@ -6,9 +6,7 @@ ${SUBDIR}/bin/gcov ${SUBDIR}/bin/${TARGET_ARCH}-addr2line ${SUBDIR}/bin/${TARGET_ARCH}-ar ${SUBDIR}/bin/${TARGET_ARCH}-as -${SUBDIR}/bin/${TARGET_ARCH}-c++ ${SUBDIR}/bin/${TARGET_ARCH}-c++filt -${SUBDIR}/bin/${TARGET_ARCH}-g++ ${SUBDIR}/bin/${TARGET_ARCH}-gasp ${SUBDIR}/bin/${TARGET_ARCH}-gcc ${SUBDIR}/bin/${TARGET_ARCH}-ld @@ -27,7 +25,6 @@ ${SUBDIR}/include/bfd.h ${SUBDIR}/include/bfdlink.h ${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/SYSCALLS.c.X ${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/cc1 -${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/cc1plus ${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/collect2 ${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/cpp ${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/crtbegin.o @@ -36,19 +33,15 @@ ${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/crtend.o ${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/crtendS.o ${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/include/README ${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/include/assert.h -${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/include/exception ${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/include/fixed ${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/include/float.h ${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/include/iso646.h ${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/include/limits.h -${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/include/new -${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/include/new.h ${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/include/proto.h ${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/include/stdarg.h ${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/include/stdbool.h ${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/include/stddef.h ${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/include/syslimits.h -${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/include/typeinfo ${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/include/va-alpha.h ${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/include/va-arc.h ${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/include/va-c4x.h @@ -120,6 +113,7 @@ ${SUBDIR}/${TARGET_ARCH}/lib/ldscripts/mipslit.xr ${SUBDIR}/${TARGET_ARCH}/lib/ldscripts/mipslit.xu @dirrm ${SUBDIR}/bin @dirrm ${SUBDIR}/include +@dirrm ${SUBDIR}/info @dirrm ${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/include @dirrm ${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION} @dirrm ${SUBDIR}/lib/gcc-lib/${TARGET_ARCH} @@ -131,4 +125,5 @@ ${SUBDIR}/${TARGET_ARCH}/lib/ldscripts/mipslit.xu @dirrm ${SUBDIR}/${TARGET_ARCH}/lib/ldscripts @dirrm ${SUBDIR}/${TARGET_ARCH}/lib @dirrm ${SUBDIR}/${TARGET_ARCH} +@dirrm ${SUBDIR}/share @dirrm ${SUBDIR} diff --git a/cross/mipsEEel-netbsd/distinfo b/cross/mipsEEel-netbsd/distinfo index fe5be8f98ef..9d999945740 100644 --- a/cross/mipsEEel-netbsd/distinfo +++ b/cross/mipsEEel-netbsd/distinfo @@ -1,14 +1,14 @@ -$NetBSD: distinfo,v 1.1 2001/08/05 15:28:41 kent Exp $ +$NetBSD: distinfo,v 1.1.2.1 2002/06/23 18:43:03 jlam Exp $ -SHA1 (binutils-2.9EE.linux.patch.bz2) = 9b8af1ca94cbb6731fc283509d420b9ca35a7658 -Size (binutils-2.9EE.linux.patch.bz2) = 292104 bytes -SHA1 (binutils-ps2linux-0.9.patch.bz2) = 29283f4fe7f450a69495a0da80c44eb28377088d -Size (binutils-ps2linux-0.9.patch.bz2) = 19123 bytes +SHA1 (binutils-ps2linux-1.0.0.patch.bz2) = 965761594a12eeb880a93d94ff25167f73589658 +Size (binutils-ps2linux-1.0.0.patch.bz2) = 314714 bytes SHA1 (binutils-2.9EE.tar.gz) = 541c6815446b091ca17405127602b3673dc84fc8 Size (binutils-2.9EE.tar.gz) = 7199214 bytes SHA1 (gcc-2.95.2.tar.gz) = c3da103de3fa97c78ccc1b4fdc29fa25bf26a6c8 Size (gcc-2.95.2.tar.gz) = 12885815 bytes -SHA1 (gcc-2.95.2.EE-linux.patch.bz2) = df5ee1b60219a1d1f7c073751571554888028b18 -Size (gcc-2.95.2.EE-linux.patch.bz2) = 220838 bytes -SHA1 (gcc-ps2linux-0.9.1.patch.bz2) = 2dd428fc45d2aafafe7bbd479012fbff29fbc07c -Size (gcc-ps2linux-0.9.1.patch.bz2) = 612196 bytes +SHA1 (gcc-2.95.2-frankengcc-patches.patch.bz2) = fe13882ab97f66c65cfc55b117a49827815fe486 +Size (gcc-2.95.2-frankengcc-patches.patch.bz2) = 1300 bytes +SHA1 (gcc-2.95.2-single-float-const.patch.bz2) = e673dd3c15dd90b790e83e328c37424e482d029a +Size (gcc-2.95.2-single-float-const.patch.bz2) = 1429 bytes +SHA1 (gcc-ps2linux-1.0.0.patch.bz2) = afb4b93d0116b1dfd35da59258df441d57863b0a +Size (gcc-ps2linux-1.0.0.patch.bz2) = 819901 bytes diff --git a/cross/mipsEEel-netbsd/patches/binutils-ae b/cross/mipsEEel-netbsd/patches/binutils-ae new file mode 100644 index 00000000000..df1f2dbbd5e --- /dev/null +++ b/cross/mipsEEel-netbsd/patches/binutils-ae @@ -0,0 +1,16 @@ +$NetBSD: binutils-ae,v 1.1.2.2 2002/06/23 18:43:04 jlam Exp $ + +--- config.sub.orig Wed Apr 24 15:22:48 2002 ++++ config.sub +@@ -952,6 +952,11 @@ + basic_machine=c4x-none + os=-coff + ;; ++ algor-* | arc-* | cobalt-* | hpcmips-* | playstation2-* | pmax-*) ++ if [ x$os = x-netbsd ]; then ++ basic_machine=mipsel-unknown ++ fi ++ ;; + *) + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + exit 1 diff --git a/cross/mipsEEel-netbsd/patches/gcc-aa b/cross/mipsEEel-netbsd/patches/gcc-aa index 468b4fdfc86..065eb05c939 100644 --- a/cross/mipsEEel-netbsd/patches/gcc-aa +++ b/cross/mipsEEel-netbsd/patches/gcc-aa @@ -1,11 +1,27 @@ -$NetBSD: gcc-aa,v 1.1 2001/08/05 15:28:41 kent Exp $ +$NetBSD: gcc-aa,v 1.1.2.1 2002/06/23 18:43:04 jlam Exp $ ---- gcc/configure.hoge Thu Aug 2 23:14:48 2001 +--- gcc/configure.orig Wed Apr 24 15:23:36 2002 +++ gcc/configure -@@ -4686,6 +4686,15 @@ +@@ -2947,6 +2947,10 @@ + sparc*-*-*) + cpu_type=sparc + ;; ++ algor-*-netbsd* | arc-*-netbsd* | cobalt-*-netbsd* | hpcmips-*-netbsd* | playstation2-*-netbsd* | pmax-*-netbsd*) ++ cpu_type=mips ++ machine=mipsel-unknown-netbsd ++ ;; + esac + + tm_file=${cpu_type}/${cpu_type}.h +@@ -4682,9 +4686,19 @@ + fi + ;; + mipsel-*-netbsd* | mips-dec-netbsd*) # Decstation running NetBSD ++ xmake_file=x-netbsd + tm_file=mips/netbsd.h # On NetBSD, the headers are already okay, except for math.h. tmake_file=t-netbsd - ;; ++ ;; + mipsEEel-*-netbsd*) # for NetBSD/PlayStation2, incomplete!! + xmake_file=x-linux # Oops + xm_file="xm-siglist.h ${xm_file}" @@ -14,7 +30,6 @@ $NetBSD: gcc-aa,v 1.1 2001/08/05 15:28:41 kent Exp $ + extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o" + gnu_ld=yes + gas=yes -+ ;; + ;; mipsEE*-*-linux*) # MIPS EE w/ Linux & ELF xmake_file=x-linux - xm_file="xm-siglist.h ${xm_file}" diff --git a/cross/mipsEEel-netbsd/patches/gcc-ad b/cross/mipsEEel-netbsd/patches/gcc-ad new file mode 100644 index 00000000000..d1dff41e178 --- /dev/null +++ b/cross/mipsEEel-netbsd/patches/gcc-ad @@ -0,0 +1,16 @@ +$NetBSD: gcc-ad,v 1.1.2.2 2002/06/23 18:43:05 jlam Exp $ + +--- config.sub.orig Wed Apr 24 15:23:34 2002 ++++ config.sub +@@ -880,6 +880,11 @@ + basic_machine=c4x-none + os=-coff + ;; ++ algor-* | arc-* | cobalt-* | hpcmips-* | playstation2-* | pmax-*) ++ if [ x$os = x-netbsd ]; then ++ basic_machine=mipsel-unknown ++ fi ++ ;; + *) + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + exit 1 diff --git a/cross/mipseb-netbsd/Makefile b/cross/mipseb-netbsd/Makefile index 54e42dce296..60fcd345034 100644 --- a/cross/mipseb-netbsd/Makefile +++ b/cross/mipseb-netbsd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/02/16 14:05:02 wiz Exp $ +# $NetBSD: Makefile,v 1.3.2.1 2002/06/23 18:43:06 jlam Exp $ # DISTVERSION= 1.3.0.0 @@ -18,4 +18,9 @@ EGCS_FAKE_RUNTIME= yes TARGET_ARCH= mipseb-netbsd +.include "../../mk/bsd.prefs.mk" +.if (${MACHINE_ARCH} == sparc) +.include "../../lang/gcc/Makefile.gcc" +.endif + .include "../COMMON/cross.mk" diff --git a/cross/mipsel-netbsd/Makefile b/cross/mipsel-netbsd/Makefile index 62f79557b7e..d2b51afb80a 100644 --- a/cross/mipsel-netbsd/Makefile +++ b/cross/mipsel-netbsd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/02/16 14:05:04 wiz Exp $ +# $NetBSD: Makefile,v 1.2.2.1 2002/06/23 18:43:07 jlam Exp $ # DISTVERSION= 1.3.0.0 @@ -18,4 +18,9 @@ EGCS_FAKE_RUNTIME= yes TARGET_ARCH= mipsel-netbsd +.include "../../mk/bsd.prefs.mk" +.if (${MACHINE_ARCH} == sparc) +.include "../../lang/gcc/Makefile.gcc" +.endif + .include "../COMMON/cross.mk" diff --git a/databases/Makefile b/databases/Makefile index 33e05e2a36e..c86a4940c67 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.78 2002/04/27 11:39:44 rh Exp $ +# $NetBSD: Makefile,v 1.78.2.1 2002/06/23 18:43:08 jlam Exp $ # COMMENT= Databases @@ -31,6 +31,7 @@ SUBDIR+= openldap SUBDIR+= openldap1 SUBDIR+= oraedit SUBDIR+= p5-AddressBook +SUBDIR+= p5-Apache-DBI SUBDIR+= p5-DBD-CSV SUBDIR+= p5-DBD-Sybase SUBDIR+= p5-DBD-mysql diff --git a/databases/cdb/Makefile b/databases/cdb/Makefile index d06a6fa6b25..77642412ff6 100644 --- a/databases/cdb/Makefile +++ b/databases/cdb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/03/30 13:15:02 yyamano Exp $ +# $NetBSD: Makefile,v 1.2.2.1 2002/06/23 18:43:10 jlam Exp $ DISTNAME= cdb-0.75 CATEGORIES= databases @@ -11,6 +11,12 @@ COMMENT= creates and reads constant databases ALL_TARGET= it INSTALL_TARGET= setup check +.if (${MACHINE_ARCH} == "arm32" || ${MACHINE_ARCH} == "arm") +.if (${CFLAGS:M-O2} == "-O2") +CFLAGS:= ${CFLAGS:S/-O2/-O0/} +.endif +.endif + pre-build: ${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc ${ECHO} ${CC} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile index 5498b2a58db..d228075e4fd 100644 --- a/databases/freetds/Makefile +++ b/databases/freetds/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2002/03/14 23:57:02 wiz Exp $ +# $NetBSD: Makefile,v 1.7.2.1 2002/06/23 18:43:11 jlam Exp $ DISTNAME= freetds-0.53 CATEGORIES= databases @@ -12,14 +12,20 @@ COMMENT= LGPL'd implementation of Sybase's db-lib/ct-lib/ODBC libs USE_BUILDLINK_ONLY= yes USE_GMAKE= yes -HAS_CONFIGURE= yes -CONFIGURE_ARGS= --prefix=${PREFIX}/freetds +GNU_CONFIGURE= yes +GNU_CONFIGURE_PREFIX= ${PREFIX}/freetds +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --with-tdsver=7.0 USE_LIBTOOL= yes -LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig +LIBTOOL_OVERRIDE= ${WRKSRC}/libtool -#post-install: -# ${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/share/doc/db +EGDIR= ${PREFIX}/share/examples/freetds +CONF_FILES= ${EGDIR}/freetds.conf ${PKG_SYSCONFDIR}/freetds.conf +post-install: + ${INSTALL_DATA_DIR} ${EGDIR} + ${INSTALL_DATA} ${WRKSRC}/freetds.conf ${EGDIR} + +.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/freetds/PLIST b/databases/freetds/PLIST index 4db5600c2c2..68440460f33 100644 --- a/databases/freetds/PLIST +++ b/databases/freetds/PLIST @@ -1,5 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/03/14 23:57:02 wiz Exp $ -freetds/etc/freetds.conf +@comment $NetBSD: PLIST,v 1.2.2.1 2002/06/23 18:43:12 jlam Exp $ freetds/include/bkpublic.h freetds/include/common.h freetds/include/cspublic.h @@ -38,7 +37,8 @@ freetds/lib/libtdssrv.la freetds/lib/libtdssrv.so freetds/lib/libtdssrv.so.0 freetds/lib/libtdssrv.so.0.0 +share/examples/freetds/freetds.conf +@dirrm share/examples/freetds @dirrm freetds/lib @dirrm freetds/include -@dirrm freetds/etc @dirrm freetds diff --git a/databases/freetds/distinfo b/databases/freetds/distinfo index 664267f7631..0971a6ec257 100644 --- a/databases/freetds/distinfo +++ b/databases/freetds/distinfo @@ -1,4 +1,5 @@ -$NetBSD: distinfo,v 1.3 2002/03/14 23:57:02 wiz Exp $ +$NetBSD: distinfo,v 1.3.2.1 2002/06/23 18:43:12 jlam Exp $ SHA1 (freetds-0.53.tgz) = 7ae8e843ad91c357e9fa91e28176775737584af3 Size (freetds-0.53.tgz) = 312692 bytes +SHA1 (patch-aa) = 4eb859650620c4d9edadc2c684154745143ad003 diff --git a/databases/freetds/patches/patch-aa b/databases/freetds/patches/patch-aa new file mode 100644 index 00000000000..7bb79f6d461 --- /dev/null +++ b/databases/freetds/patches/patch-aa @@ -0,0 +1,18 @@ +$NetBSD: patch-aa,v 1.1.2.2 2002/06/23 18:43:13 jlam Exp $ + +--- Makefile.in.orig Sun Dec 16 10:40:25 2001 ++++ Makefile.in +@@ -369,12 +369,7 @@ + + + install-data-local: +- $(mkinstalldirs) $(DEFDIR) $(ETC) +- if [ -f $(ETC)/freetds.conf ]; \ +- then :; \ +- else \ +- $(INSTALL_DATA) freetds.conf $(ETC)/freetds.conf; \ +- fi ++ $(mkinstalldirs) $(DEFDIR) + + test: + @echo "The 'make test' option has been replaced with 'make check'"; diff --git a/databases/gdbm/patches/patch-ab b/databases/gdbm/patches/patch-ab index a7f750cc6f8..3df9ddb1bba 100644 --- a/databases/gdbm/patches/patch-ab +++ b/databases/gdbm/patches/patch-ab @@ -1,3 +1,4 @@ +$NetBSD: patch-ab,v 1.7.2.1 2002/06/23 18:43:14 jlam Exp $ --- Makefile.in.orig Tue May 18 20:16:06 1999 +++ Makefile.in Thu Aug 16 14:27:07 2001 @@ -27,11 +27,11 @@ diff --git a/databases/geneweb/Makefile b/databases/geneweb/Makefile index 34efff4e951..19a44489651 100644 --- a/databases/geneweb/Makefile +++ b/databases/geneweb/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2001/12/05 16:03:56 agc Exp $ +# $NetBSD: Makefile,v 1.7.2.1 2002/06/23 18:43:15 jlam Exp $ # -DISTNAME= geneweb-4.02 +DISTNAME= geneweb-4.06 CATEGORIES= databases MASTER_SITES= ftp://ftp.inria.fr/INRIA/Projects/cristal/geneweb/Src/ @@ -9,8 +9,7 @@ MAINTAINER= wulf@netbsd.org HOMEPAGE= http://cristal.inria.fr/~ddr/GeneWeb/ COMMENT= GeneWeb is a comprehensive genealogy database application -DEPENDS+= ocaml-3.01:../../lang/ocaml -DEPENDS+= camlp4-3.01.6:../../lang/camlp4 +DEPENDS+= ocaml-3.04:../../lang/ocaml USE_GMAKE= yes diff --git a/databases/geneweb/PLIST b/databases/geneweb/PLIST index 560c93a4976..7cb4990654e 100644 --- a/databases/geneweb/PLIST +++ b/databases/geneweb/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:32 skrll Exp $ +@comment $NetBSD: PLIST,v 1.2.2.1 2002/06/23 18:43:16 jlam Exp $ bin/consang bin/ged2gwb bin/gwb2ged @@ -28,6 +28,7 @@ share/doc/geneweb/de/server.htm share/doc/geneweb/de/start.htm share/doc/geneweb/de/update.htm share/doc/geneweb/en/access.htm +share/doc/geneweb/en/cdrom.htm share/doc/geneweb/en/consang.htm share/doc/geneweb/en/diruse.htm share/doc/geneweb/en/divide.htm @@ -46,6 +47,7 @@ share/doc/geneweb/en/server.htm share/doc/geneweb/en/start.htm share/doc/geneweb/en/update.htm share/doc/geneweb/fr/access.htm +share/doc/geneweb/fr/cdrom.htm share/doc/geneweb/fr/consang.htm share/doc/geneweb/fr/diruse.htm share/doc/geneweb/fr/divide.htm @@ -63,24 +65,6 @@ share/doc/geneweb/fr/report.htm share/doc/geneweb/fr/server.htm share/doc/geneweb/fr/start.htm share/doc/geneweb/fr/update.htm -share/doc/geneweb/sv/access.htm -share/doc/geneweb/sv/consang.htm -share/doc/geneweb/sv/diruse.htm -share/doc/geneweb/sv/divide.htm -share/doc/geneweb/sv/faq.htm -share/doc/geneweb/sv/gwformat.htm -share/doc/geneweb/sv/gwsetup.htm -share/doc/geneweb/sv/initial.htm -share/doc/geneweb/sv/links.htm -share/doc/geneweb/sv/maint.htm -share/doc/geneweb/sv/merge.htm -share/doc/geneweb/sv/pcustom.htm -share/doc/geneweb/sv/problem.htm -share/doc/geneweb/sv/recover.htm -share/doc/geneweb/sv/report.htm -share/doc/geneweb/sv/server.htm -share/doc/geneweb/sv/start.htm -share/doc/geneweb/sv/update.htm share/doc/geneweb/images/gwback.jpg share/doc/geneweb/images/gwlogo.gif share/doc/geneweb/images/l-de.jpg @@ -102,6 +86,25 @@ share/doc/geneweb/nl/report.htm share/doc/geneweb/nl/server.htm share/doc/geneweb/nl/start.htm share/doc/geneweb/nl/update.htm +share/doc/geneweb/sv/access.htm +share/doc/geneweb/sv/cdrom.htm +share/doc/geneweb/sv/consang.htm +share/doc/geneweb/sv/diruse.htm +share/doc/geneweb/sv/divide.htm +share/doc/geneweb/sv/faq.htm +share/doc/geneweb/sv/gwformat.htm +share/doc/geneweb/sv/gwsetup.htm +share/doc/geneweb/sv/initial.htm +share/doc/geneweb/sv/links.htm +share/doc/geneweb/sv/maint.htm +share/doc/geneweb/sv/merge.htm +share/doc/geneweb/sv/pcustom.htm +share/doc/geneweb/sv/problem.htm +share/doc/geneweb/sv/recover.htm +share/doc/geneweb/sv/report.htm +share/doc/geneweb/sv/server.htm +share/doc/geneweb/sv/start.htm +share/doc/geneweb/sv/update.htm share/examples/geneweb/a.gwf share/examples/geneweb/only.txt share/geneweb/etc/copyr.txt @@ -114,12 +117,12 @@ share/geneweb/etc/updfam.txt share/geneweb/etc/updind.txt share/geneweb/gwtp_tmp/README share/geneweb/gwtp_tmp/gwtp -share/geneweb/gwtp_tmp/lang/en/conf.txt -share/geneweb/gwtp_tmp/lang/en/recv.txt -share/geneweb/gwtp_tmp/lang/en/send.txt -share/geneweb/gwtp_tmp/lang/fr/conf.txt -share/geneweb/gwtp_tmp/lang/fr/recv.txt -share/geneweb/gwtp_tmp/lang/fr/send.txt +share/geneweb/gwtp_tmp/gwtp.log +share/geneweb/gwtp_tmp/lang/conf.txt +share/geneweb/gwtp_tmp/lang/recv.txt +share/geneweb/gwtp_tmp/lang/send.txt +share/geneweb/gwtp_tmp/lang/send_gedcom.txt +share/geneweb/gwtp_tmp/passwd share/geneweb/images/female.gif share/geneweb/images/gwback.jpg share/geneweb/images/gwlogo.gif @@ -177,325 +180,70 @@ share/geneweb/lang/alias_lg.txt share/geneweb/lang/lexicon.txt share/geneweb/lang/start.txt share/geneweb/lang/version.txt -share/geneweb/setup/de/backg.htm -share/geneweb/setup/de/bsi.htm -share/geneweb/setup/de/bsi_err.htm -share/geneweb/setup/de/bso.htm -share/geneweb/setup/de/bso_err.htm -share/geneweb/setup/de/bso_ok.htm -share/geneweb/setup/de/clean_ok.htm -share/geneweb/setup/de/cleanup.htm -share/geneweb/setup/de/cleanup1.htm -share/geneweb/setup/de/consang.htm -share/geneweb/setup/de/consg_ok.htm -share/geneweb/setup/de/del_ok.htm -share/geneweb/setup/de/delete.htm -share/geneweb/setup/de/delete_1.htm -share/geneweb/setup/de/err_acc.htm -share/geneweb/setup/de/err_cnfl.htm -share/geneweb/setup/de/err_miss.htm -share/geneweb/setup/de/err_name.htm -share/geneweb/setup/de/err_ndir.htm -share/geneweb/setup/de/err_ngw.htm -share/geneweb/setup/de/err_outd.htm -share/geneweb/setup/de/err_reco.htm -share/geneweb/setup/de/err_smdr.htm -share/geneweb/setup/de/err_unkn.htm -share/geneweb/setup/de/ged2gwb.htm -share/geneweb/setup/de/gw2gd_ok.htm -share/geneweb/setup/de/gwb2ged.htm -share/geneweb/setup/de/gwc.htm -share/geneweb/setup/de/gwd.htm -share/geneweb/setup/de/gwd_info.htm -share/geneweb/setup/de/gwd_ok.htm -share/geneweb/setup/de/gwf.htm -share/geneweb/setup/de/gwf_1.htm -share/geneweb/setup/de/gwf_ok.htm -share/geneweb/setup/de/gwu.htm -share/geneweb/setup/de/gwu_ok.htm -share/geneweb/setup/de/intro.txt -share/geneweb/setup/de/list.htm -share/geneweb/setup/de/main.htm -share/geneweb/setup/de/note.htm -share/geneweb/setup/de/recover.htm -share/geneweb/setup/de/recover1.htm -share/geneweb/setup/de/recover2.htm -share/geneweb/setup/de/ren_ok.htm -share/geneweb/setup/de/rename.htm -share/geneweb/setup/de/save.htm -share/geneweb/setup/de/simple.htm -share/geneweb/setup/de/traces.htm -share/geneweb/setup/de/welcome.htm -share/geneweb/setup/en/backg.htm -share/geneweb/setup/en/bsi.htm -share/geneweb/setup/en/bsi_err.htm -share/geneweb/setup/en/bso.htm -share/geneweb/setup/en/bso_err.htm -share/geneweb/setup/en/bso_ok.htm -share/geneweb/setup/en/clean_ok.htm -share/geneweb/setup/en/cleanup.htm -share/geneweb/setup/en/cleanup1.htm -share/geneweb/setup/en/consang.htm -share/geneweb/setup/en/consg_ok.htm -share/geneweb/setup/en/del_ok.htm -share/geneweb/setup/en/delete.htm -share/geneweb/setup/en/delete_1.htm -share/geneweb/setup/en/err_acc.htm -share/geneweb/setup/en/err_cnfl.htm -share/geneweb/setup/en/err_miss.htm -share/geneweb/setup/en/err_name.htm -share/geneweb/setup/en/err_ndir.htm -share/geneweb/setup/en/err_ngw.htm -share/geneweb/setup/en/err_outd.htm -share/geneweb/setup/en/err_reco.htm -share/geneweb/setup/en/err_smdr.htm -share/geneweb/setup/en/err_unkn.htm -share/geneweb/setup/en/ged2gwb.htm -share/geneweb/setup/en/gw2gd_ok.htm -share/geneweb/setup/en/gwb2ged.htm -share/geneweb/setup/en/gwc.htm -share/geneweb/setup/en/gwd.htm -share/geneweb/setup/en/gwd_info.htm -share/geneweb/setup/en/gwd_ok.htm -share/geneweb/setup/en/gwf.htm -share/geneweb/setup/en/gwf_1.htm -share/geneweb/setup/en/gwf_ok.htm -share/geneweb/setup/en/gwu.htm -share/geneweb/setup/en/gwu_ok.htm -share/geneweb/setup/en/intro.txt -share/geneweb/setup/en/list.htm -share/geneweb/setup/en/main.htm -share/geneweb/setup/en/merge.htm -share/geneweb/setup/en/merge_1.htm -share/geneweb/setup/en/note.htm -share/geneweb/setup/en/recover.htm -share/geneweb/setup/en/recover1.htm -share/geneweb/setup/en/recover2.htm -share/geneweb/setup/en/ren_ok.htm -share/geneweb/setup/en/rename.htm -share/geneweb/setup/en/save.htm -share/geneweb/setup/en/simple.htm -share/geneweb/setup/en/traces.htm -share/geneweb/setup/en/welcome.htm -share/geneweb/setup/es/backg.htm -share/geneweb/setup/es/bsi.htm -share/geneweb/setup/es/bsi_err.htm -share/geneweb/setup/es/bso.htm -share/geneweb/setup/es/bso_err.htm -share/geneweb/setup/es/bso_ok.htm -share/geneweb/setup/es/clean_ok.htm -share/geneweb/setup/es/cleanup.htm -share/geneweb/setup/es/cleanup1.htm -share/geneweb/setup/es/consang.htm -share/geneweb/setup/es/consg_ok.htm -share/geneweb/setup/es/del_ok.htm -share/geneweb/setup/es/delete.htm -share/geneweb/setup/es/delete_1.htm -share/geneweb/setup/es/err_acc.htm -share/geneweb/setup/es/err_cnfl.htm -share/geneweb/setup/es/err_miss.htm -share/geneweb/setup/es/err_name.htm -share/geneweb/setup/es/err_ndir.htm -share/geneweb/setup/es/err_ngw.htm -share/geneweb/setup/es/err_outd.htm -share/geneweb/setup/es/err_reco.htm -share/geneweb/setup/es/err_smdr.htm -share/geneweb/setup/es/err_unkn.htm -share/geneweb/setup/es/ged2gwb.htm -share/geneweb/setup/es/gw2gd_ok.htm -share/geneweb/setup/es/gwb2ged.htm -share/geneweb/setup/es/gwc.htm -share/geneweb/setup/es/gwd.htm -share/geneweb/setup/es/gwd_info.htm -share/geneweb/setup/es/gwd_ok.htm -share/geneweb/setup/es/gwf.htm -share/geneweb/setup/es/gwf_1.htm -share/geneweb/setup/es/gwf_ok.htm -share/geneweb/setup/es/gwu.htm -share/geneweb/setup/es/gwu_ok.htm -share/geneweb/setup/es/intro.txt -share/geneweb/setup/es/list.htm -share/geneweb/setup/es/main.htm -share/geneweb/setup/es/note.htm -share/geneweb/setup/es/recover.htm -share/geneweb/setup/es/recover1.htm -share/geneweb/setup/es/recover2.htm -share/geneweb/setup/es/ren_ok.htm -share/geneweb/setup/es/rename.htm -share/geneweb/setup/es/save.htm -share/geneweb/setup/es/simple.htm -share/geneweb/setup/es/traces.htm -share/geneweb/setup/es/welcome.htm -share/geneweb/setup/fr/backg.htm -share/geneweb/setup/fr/bsi.htm -share/geneweb/setup/fr/bsi_err.htm -share/geneweb/setup/fr/bso.htm -share/geneweb/setup/fr/bso_err.htm -share/geneweb/setup/fr/bso_ok.htm -share/geneweb/setup/fr/clean_ok.htm -share/geneweb/setup/fr/cleanup.htm -share/geneweb/setup/fr/cleanup1.htm -share/geneweb/setup/fr/consang.htm -share/geneweb/setup/fr/consg_ok.htm -share/geneweb/setup/fr/del_ok.htm -share/geneweb/setup/fr/delete.htm -share/geneweb/setup/fr/delete_1.htm -share/geneweb/setup/fr/err_acc.htm -share/geneweb/setup/fr/err_cnfl.htm -share/geneweb/setup/fr/err_miss.htm -share/geneweb/setup/fr/err_name.htm -share/geneweb/setup/fr/err_ndir.htm -share/geneweb/setup/fr/err_ngw.htm -share/geneweb/setup/fr/err_outd.htm -share/geneweb/setup/fr/err_reco.htm -share/geneweb/setup/fr/err_smdr.htm -share/geneweb/setup/fr/err_unkn.htm -share/geneweb/setup/fr/ged2gwb.htm -share/geneweb/setup/fr/gw2gd_ok.htm -share/geneweb/setup/fr/gwb2ged.htm -share/geneweb/setup/fr/gwc.htm -share/geneweb/setup/fr/gwd.htm -share/geneweb/setup/fr/gwd_info.htm -share/geneweb/setup/fr/gwd_ok.htm -share/geneweb/setup/fr/gwf.htm -share/geneweb/setup/fr/gwf_1.htm -share/geneweb/setup/fr/gwf_ok.htm -share/geneweb/setup/fr/gwu.htm -share/geneweb/setup/fr/gwu_ok.htm -share/geneweb/setup/fr/intro.txt -share/geneweb/setup/fr/list.htm -share/geneweb/setup/fr/main.htm -share/geneweb/setup/fr/merge.htm -share/geneweb/setup/fr/merge_1.htm -share/geneweb/setup/fr/note.htm -share/geneweb/setup/fr/recover.htm -share/geneweb/setup/fr/recover1.htm -share/geneweb/setup/fr/recover2.htm -share/geneweb/setup/fr/ren_ok.htm -share/geneweb/setup/fr/rename.htm -share/geneweb/setup/fr/save.htm -share/geneweb/setup/fr/simple.htm -share/geneweb/setup/fr/traces.htm -share/geneweb/setup/fr/welcome.htm share/geneweb/setup/intro.txt -share/geneweb/setup/lv/backg.htm -share/geneweb/setup/lv/bsi.htm -share/geneweb/setup/lv/bsi_err.htm -share/geneweb/setup/lv/bso.htm -share/geneweb/setup/lv/bso_err.htm -share/geneweb/setup/lv/bso_ok.htm -share/geneweb/setup/lv/clean_ok.htm -share/geneweb/setup/lv/cleanup.htm -share/geneweb/setup/lv/cleanup1.htm -share/geneweb/setup/lv/consang.htm -share/geneweb/setup/lv/consg_ok.htm -share/geneweb/setup/lv/del_ok.htm -share/geneweb/setup/lv/delete.htm -share/geneweb/setup/lv/delete_1.htm -share/geneweb/setup/lv/err_acc.htm -share/geneweb/setup/lv/err_cnfl.htm -share/geneweb/setup/lv/err_miss.htm -share/geneweb/setup/lv/err_name.htm -share/geneweb/setup/lv/err_ndir.htm -share/geneweb/setup/lv/err_ngw.htm -share/geneweb/setup/lv/err_outd.htm -share/geneweb/setup/lv/err_reco.htm -share/geneweb/setup/lv/err_smdr.htm -share/geneweb/setup/lv/err_unkn.htm -share/geneweb/setup/lv/ged2gwb.htm -share/geneweb/setup/lv/gw2gd_ok.htm -share/geneweb/setup/lv/gwb2ged.htm -share/geneweb/setup/lv/gwc.htm -share/geneweb/setup/lv/gwd.htm -share/geneweb/setup/lv/gwd_info.htm -share/geneweb/setup/lv/gwd_ok.htm -share/geneweb/setup/lv/gwf.htm -share/geneweb/setup/lv/gwf_1.htm -share/geneweb/setup/lv/gwf_ok.htm -share/geneweb/setup/lv/gwu.htm -share/geneweb/setup/lv/gwu_ok.htm -share/geneweb/setup/lv/intro.txt -share/geneweb/setup/lv/list.htm -share/geneweb/setup/lv/main.htm -share/geneweb/setup/lv/note.htm -share/geneweb/setup/lv/recover.htm -share/geneweb/setup/lv/recover1.htm -share/geneweb/setup/lv/recover2.htm -share/geneweb/setup/lv/ren_ok.htm -share/geneweb/setup/lv/rename.htm -share/geneweb/setup/lv/save.htm -share/geneweb/setup/lv/simple.htm -share/geneweb/setup/lv/traces.htm -share/geneweb/setup/lv/welcome.htm -share/geneweb/setup/sv/backg.htm -share/geneweb/setup/sv/bsi.htm -share/geneweb/setup/sv/bsi_err.htm -share/geneweb/setup/sv/bso.htm -share/geneweb/setup/sv/bso_err.htm -share/geneweb/setup/sv/bso_ok.htm -share/geneweb/setup/sv/clean_ok.htm -share/geneweb/setup/sv/cleanup.htm -share/geneweb/setup/sv/cleanup1.htm -share/geneweb/setup/sv/consang.htm -share/geneweb/setup/sv/consg_ok.htm -share/geneweb/setup/sv/del_ok.htm -share/geneweb/setup/sv/delete.htm -share/geneweb/setup/sv/delete_1.htm -share/geneweb/setup/sv/err_acc.htm -share/geneweb/setup/sv/err_cnfl.htm -share/geneweb/setup/sv/err_miss.htm -share/geneweb/setup/sv/err_name.htm -share/geneweb/setup/sv/err_ndir.htm -share/geneweb/setup/sv/err_ngw.htm -share/geneweb/setup/sv/err_outd.htm -share/geneweb/setup/sv/err_reco.htm -share/geneweb/setup/sv/err_smdr.htm -share/geneweb/setup/sv/err_unkn.htm -share/geneweb/setup/sv/ged2gwb.htm -share/geneweb/setup/sv/gw2gd_ok.htm -share/geneweb/setup/sv/gwb2ged.htm -share/geneweb/setup/sv/gwc.htm -share/geneweb/setup/sv/gwd.htm -share/geneweb/setup/sv/gwd_info.htm -share/geneweb/setup/sv/gwd_ok.htm -share/geneweb/setup/sv/gwf.htm -share/geneweb/setup/sv/gwf_1.htm -share/geneweb/setup/sv/gwf_ok.htm -share/geneweb/setup/sv/gwu.htm -share/geneweb/setup/sv/gwu_ok.htm -share/geneweb/setup/sv/intro.txt -share/geneweb/setup/sv/list.htm -share/geneweb/setup/sv/main.htm -share/geneweb/setup/sv/merge.htm -share/geneweb/setup/sv/merge_1.htm -share/geneweb/setup/sv/note.htm -share/geneweb/setup/sv/recover.htm -share/geneweb/setup/sv/recover1.htm -share/geneweb/setup/sv/recover2.htm -share/geneweb/setup/sv/ren_ok.htm -share/geneweb/setup/sv/rename.htm -share/geneweb/setup/sv/save.htm -share/geneweb/setup/sv/simple.htm -share/geneweb/setup/sv/traces.htm -share/geneweb/setup/sv/welcome.htm +share/geneweb/setup/lang/backg.htm +share/geneweb/setup/lang/bsi.htm +share/geneweb/setup/lang/bsi_err.htm +share/geneweb/setup/lang/bso.htm +share/geneweb/setup/lang/bso_err.htm +share/geneweb/setup/lang/bso_ok.htm +share/geneweb/setup/lang/clean_ok.htm +share/geneweb/setup/lang/cleanup.htm +share/geneweb/setup/lang/cleanup1.htm +share/geneweb/setup/lang/consang.htm +share/geneweb/setup/lang/consg_ok.htm +share/geneweb/setup/lang/del_ok.htm +share/geneweb/setup/lang/delete.htm +share/geneweb/setup/lang/delete_1.htm +share/geneweb/setup/lang/err_acc.htm +share/geneweb/setup/lang/err_cnfl.htm +share/geneweb/setup/lang/err_miss.htm +share/geneweb/setup/lang/err_name.htm +share/geneweb/setup/lang/err_ndir.htm +share/geneweb/setup/lang/err_ngw.htm +share/geneweb/setup/lang/err_outd.htm +share/geneweb/setup/lang/err_reco.htm +share/geneweb/setup/lang/err_smdr.htm +share/geneweb/setup/lang/err_unkn.htm +share/geneweb/setup/lang/ged2gwb.htm +share/geneweb/setup/lang/gw2gd_ok.htm +share/geneweb/setup/lang/gwb2ged.htm +share/geneweb/setup/lang/gwc.htm +share/geneweb/setup/lang/gwd.htm +share/geneweb/setup/lang/gwd_info.htm +share/geneweb/setup/lang/gwd_ok.htm +share/geneweb/setup/lang/gwf.htm +share/geneweb/setup/lang/gwf_1.htm +share/geneweb/setup/lang/gwf_ok.htm +share/geneweb/setup/lang/gwu.htm +share/geneweb/setup/lang/gwu_ok.htm +share/geneweb/setup/lang/intro.txt +share/geneweb/setup/lang/list.htm +share/geneweb/setup/lang/main.htm +share/geneweb/setup/lang/merge.htm +share/geneweb/setup/lang/merge_1.htm +share/geneweb/setup/lang/recover.htm +share/geneweb/setup/lang/recover1.htm +share/geneweb/setup/lang/recover2.htm +share/geneweb/setup/lang/ren_ok.htm +share/geneweb/setup/lang/rename.htm +share/geneweb/setup/lang/save.htm +share/geneweb/setup/lang/simple.htm +share/geneweb/setup/lang/traces.htm +share/geneweb/setup/lang/welcome.htm +@dirrm share/geneweb/setup/lang +@dirrm share/geneweb/setup +@dirrm share/geneweb/lang +@dirrm share/geneweb/images +@dirrm share/geneweb/gwtp_tmp/lang +@dirrm share/geneweb/gwtp_tmp +@dirrm share/geneweb/etc +@dirrm share/geneweb @dirrm share/examples/geneweb -@dirrm share/doc/geneweb/de -@dirrm share/doc/geneweb/en -@dirrm share/doc/geneweb/fr -@dirrm share/doc/geneweb/images -@dirrm share/doc/geneweb/nl @dirrm share/doc/geneweb/sv +@dirrm share/doc/geneweb/nl +@dirrm share/doc/geneweb/images +@dirrm share/doc/geneweb/fr +@dirrm share/doc/geneweb/en +@dirrm share/doc/geneweb/de @dirrm share/doc/geneweb -@dirrm share/geneweb/etc -@dirrm share/geneweb/lang -@dirrm share/geneweb/setup/de -@dirrm share/geneweb/setup/en -@dirrm share/geneweb/setup/es -@dirrm share/geneweb/setup/fr -@dirrm share/geneweb/setup/lv -@dirrm share/geneweb/setup/sv -@dirrm share/geneweb/setup -@unexec ${RMDIR} %D/share/geneweb/cnt 2>/dev/null || true -@unexec ${RMDIR} %D/share/geneweb/db 2>/dev/null || true -@unexec ${RMDIR} %D/share/geneweb/images 2>/dev/null || true -@unexec ${RMDIR} %D/share/geneweb 2>/dev/null || true diff --git a/databases/geneweb/distinfo b/databases/geneweb/distinfo index fe04ca2d622..a9008f9ec84 100644 --- a/databases/geneweb/distinfo +++ b/databases/geneweb/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2001/07/27 10:57:41 wiz Exp $ +$NetBSD: distinfo,v 1.4.2.1 2002/06/23 18:43:16 jlam Exp $ -SHA1 (geneweb-4.02.tar.gz) = 34b335620e37bf72dd886895ae33eb96b12ff52e -Size (geneweb-4.02.tar.gz) = 825373 bytes +SHA1 (geneweb-4.06.tar.gz) = 6a3aa6c2cf8cff3b0a9fd3c6b1d899b2bb3211a1 +Size (geneweb-4.06.tar.gz) = 832896 bytes diff --git a/databases/gnome-mime-types/Makefile b/databases/gnome-mime-types/Makefile index 1b44ec3acff..f10bc884d3e 100644 --- a/databases/gnome-mime-types/Makefile +++ b/databases/gnome-mime-types/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/04/27 11:38:54 rh Exp $ +# $NetBSD: Makefile,v 1.1.1.1.2.1 2002/06/23 18:43:17 jlam Exp $ # DISTNAME= gnome-mime-data-1.0.7 @@ -16,4 +16,5 @@ USE_BUILDLINK_ONLY= YES GNU_CONFIGURE= YES .include "../../devel/gettext-lib/buildlink.mk" +.include "../../lang/perl5/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/gnome-mime-types/buildlink.mk b/databases/gnome-mime-types/buildlink.mk new file mode 100644 index 00000000000..078a0882378 --- /dev/null +++ b/databases/gnome-mime-types/buildlink.mk @@ -0,0 +1,39 @@ +# $NetBSD: buildlink.mk,v 1.1.2.2 2002/06/23 18:43:18 jlam Exp $ +# +# This Makefile fragment is included by packages that use gnome-mime-data. +# +# This file was created automatically using createbuildlink 1.6. +# +# To use this Makefile fragment, simply: +# +# (1) Optionally define BUILDLINK_DEPENDS.gnome-mime-data to the dependency pattern +# for the version of gnome-mime-data desired. +# (2) Include this Makefile fragment in the package Makefile, +# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header +# search path, and +# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search +# path. + +.if !defined(GNOME_MIME_DATA_BUILDLINK_MK) +GNOME_MIME_DATA_BUILDLINK_MK= # defined + +.include "../../mk/bsd.buildlink.mk" + +BUILDLINK_DEPENDS.gnome-mime-data?= gnome-mime-data>=1.0.7 +DEPENDS+= ${BUILDLINK_DEPENDS.gnome-mime-data}:../../databases/gnome-mime-types + +EVAL_PREFIX+= BUILDLINK_PREFIX.gnome-mime-data=gnome-mime-data +BUILDLINK_PREFIX.gnome-mime-data_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.gnome-mime-data+= lib/pkgconfig/gnome-mime-data-2.0.pc + +.include "../../devel/gettext-lib/buildlink.mk" +.include "../../devel/pkgconfig/buildlink.mk" + +BUILDLINK_TARGETS.gnome-mime-data= gnome-mime-data-buildlink +BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.gnome-mime-data} +BUILDLINK_TARGETS+= ${BUILDLINK_PKG_CONFIG} + +pre-configure: ${BUILDLINK_TARGETS} +gnome-mime-data-buildlink: _BUILDLINK_USE + +.endif # GNOME_MIME_DATA_BUILDLINK_MK diff --git a/databases/jdbc-postgresql/distinfo b/databases/jdbc-postgresql/distinfo index 26485def2d6..048a1e0d723 100644 --- a/databases/jdbc-postgresql/distinfo +++ b/databases/jdbc-postgresql/distinfo @@ -1,5 +1,4 @@ -$NetBSD: distinfo,v 1.5 2002/04/19 17:59:18 jwise Exp $ +$NetBSD: distinfo,v 1.5.2.1 2002/06/23 18:43:19 jlam Exp $ SHA1 (postgresql-7.2.1.tar.gz) = d5361a502efc394f5c552f1640960557180f3289 Size (postgresql-7.2.1.tar.gz) = 9237680 bytes -SHA1 (patch-aa) = 2052c2952199b2d324a42400dc51c1ae2ccdc292 diff --git a/databases/mysql-client/Makefile b/databases/mysql-client/Makefile index 1a0b473449c..06769ad6522 100644 --- a/databases/mysql-client/Makefile +++ b/databases/mysql-client/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.17.2.2 2002/06/21 23:05:02 jlam Exp $ +# $NetBSD: Makefile,v 1.17.2.3 2002/06/23 18:43:20 jlam Exp $ # PKGNAME= ${DISTNAME:S/-/-client-/} +PKGREVISION= 1 SVR4_PKGNAME= mysqc COMMENT= MySQL, a free SQL database (client) diff --git a/databases/mysql-client/Makefile.common b/databases/mysql-client/Makefile.common index 4b6d5ebeabf..333160e7f02 100644 --- a/databases/mysql-client/Makefile.common +++ b/databases/mysql-client/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.8.2.1 2002/05/11 02:09:00 jlam Exp $ +# $NetBSD: Makefile.common,v 1.8.2.2 2002/06/23 18:43:21 jlam Exp $ DISTNAME= mysql-3.23.49 CATEGORIES= databases @@ -36,6 +36,7 @@ CPPFLAGS+= -Dunix USE_PERL5= # defined USE_LIBTOOL= # defined LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig +LDFLAGS+= -Wl,-R${LOCALBASE}/lib/mysql post-extract: cd ${WRKSRC}; \ diff --git a/databases/mysql-server/Makefile b/databases/mysql-server/Makefile index eb1e58c5a3c..bd790ec1cac 100644 --- a/databases/mysql-server/Makefile +++ b/databases/mysql-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2001/11/02 02:59:28 jlam Exp $ +# $NetBSD: Makefile,v 1.26.2.1 2002/06/23 18:43:22 jlam Exp $ # .include "../mysql-client/Makefile.common" @@ -7,7 +7,7 @@ PKGNAME= ${DISTNAME:S/-/-server-/} SVR4_PKGNAME= mysqs COMMENT= MySQL, a free SQL database (server) -DEPENDS+= ${DISTNAME:S/-/-client-/}:../../databases/mysql-client +DEPENDS+= ${DISTNAME:S/-/-client>=/}:../../databases/mysql-client USE_BUILDLINK_ONLY= YES diff --git a/databases/mysql-server/distinfo b/databases/mysql-server/distinfo index f2498082f76..3435f7ba7ab 100644 --- a/databases/mysql-server/distinfo +++ b/databases/mysql-server/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.15 2002/04/14 13:32:36 veego Exp $ +$NetBSD: distinfo,v 1.15.2.1 2002/06/23 18:43:23 jlam Exp $ SHA1 (mysql-3.23.49.tar.gz) = 0256331c7aa9388955148f80cdca382f467ad1be Size (mysql-3.23.49.tar.gz) = 11844905 bytes @@ -10,4 +10,5 @@ SHA1 (patch-ae) = 81fa0273261ea44c599cf44f5a3a56935c3a62bd SHA1 (patch-af) = 78acdcd5a0f65ecaf545561eb3d450fa43746d1a SHA1 (patch-ag) = 75634ff5c9ee61ff3ef61b1d9a4be4afc65e8754 SHA1 (patch-ah) = 7cd4278c9bdc5220de04f7e6b62bb8d11c892ffb +SHA1 (patch-ai) = 071e34cc9236b08cdc438afbb46801e66efc7e92 SHA1 (patch-aj) = 2e619c6f16a1256174fd3e6e4bca3214679a9347 diff --git a/databases/mysql-server/patches/patch-ai b/databases/mysql-server/patches/patch-ai new file mode 100644 index 00000000000..7cbac7b9cea --- /dev/null +++ b/databases/mysql-server/patches/patch-ai @@ -0,0 +1,40 @@ +$NetBSD: patch-ai,v 1.5.2.2 2002/06/23 18:43:26 jlam Exp $ + +--- mit-pthreads/config/configure.orig Thu Feb 14 18:30:22 2002 ++++ mit-pthreads/config/configure Mon Jun 3 15:59:48 2002 +@@ -1252,7 +1252,7 @@ + name=$host_cpu-$host_os + + case $host in +- alpha-*-netbsd1.3[H-Z]|alpha-*-netbsd1.[45]*) ++ alpha-*-netbsd1.3[H-Z]|alpha-*-netbsd1.[456]*) + name=alpha-netbsd-1.3 + sysincludes=netbsd-1.1 + except="fork lseek pipe fstat" +@@ -1276,7 +1276,7 @@ + CFLAGS="$CFLAGS -std" + fi + ;; +- arm32-*-netbsd1.3[H-Z]|arm32-*-netbsd1.[45]*) ++ arm32-*-netbsd1.3[H-Z]|arm32-*-netbsd1.[456]*) + name=arm32-netbsd-1.3 + sysincludes=netbsd-1.1 + except="fork pipe lseek ftruncate fstat" +@@ -1342,7 +1342,7 @@ + EOF + + ;; +- sparc-*-netbsd1.3[H-Z]|sparc-*-netbsd1.[45]*) ++ sparc-*-netbsd1.3[H-Z]|sparc-*-netbsd1.[456]*) + name=sparc-netbsd-1.3 + sysincludes=netbsd-1.1 + except="pipe fork lseek ftruncate fstat" +@@ -1381,7 +1381,7 @@ + syscall=i386-bsdi-2.0 + except="fork lseek ftruncate sigsuspend" + ;; +- i386-*-netbsd1.3[H-Z]|i386-*-netbsd1.[45]*) ++ i386-*-netbsd1.3[H-Z]|i386-*-netbsd1.[456]*) + name=i386-netbsd-1.3 + sysincludes=netbsd-1.1 + except="fork lseek ftruncate pipe fstat" diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile index f82fbcfd0bc..6d7b2446831 100644 --- a/databases/openldap/Makefile +++ b/databases/openldap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42.2.2 2002/06/21 23:05:02 jlam Exp $ +# $NetBSD: Makefile,v 1.42.2.3 2002/06/23 18:43:27 jlam Exp $ DISTNAME= openldap-2.0.23 SVR4_PKGNAME= oldap @@ -56,7 +56,7 @@ CONFIGURE_ARGS+= --enable-spasswd .endif .if defined(KERBEROS) -USE_KERBEROS= YES +PKG_USE_KERBEROS= YES CONFIGURE_ARGS+= --with-kerberos .else CONFIGURE_ARGS+= --without-kerberos diff --git a/databases/openldap1/Makefile b/databases/openldap1/Makefile index 0c8d319efc5..43c5f754683 100644 --- a/databases/openldap1/Makefile +++ b/databases/openldap1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/10/25 18:46:29 kleink Exp $ +# $NetBSD: Makefile,v 1.2.2.1 2002/06/23 18:43:28 jlam Exp $ # DISTNAME= openldap-1.2.13 @@ -46,7 +46,7 @@ post-configure: ${ECHO} "SLAPD_LIBS = " >> ${WRKSRC}/servers/slapd/tools/Makefile .if defined(KERBEROS) -USE_KERBEROS= yes +PKG_USE_KERBEROS= yes CONFIGURE_ARGS+=--with-kerberos .else CONFIGURE_ARGS+=--without-kerberos diff --git a/databases/p5-Apache-DBI/DESCR b/databases/p5-Apache-DBI/DESCR new file mode 100644 index 00000000000..5a05d6a5f41 --- /dev/null +++ b/databases/p5-Apache-DBI/DESCR @@ -0,0 +1,5 @@ +Apache::AuthDBI.pm and Apache::DBI.pm are supposed to be used with +the Apache server together with an embedded perl interpreter like +mod_perl. They provide support for basic authentication and +authorization as well as support for persistent database connections +via Perl's Database Independent Interface (DBI). diff --git a/databases/p5-Apache-DBI/Makefile b/databases/p5-Apache-DBI/Makefile new file mode 100644 index 00000000000..bd0390166e5 --- /dev/null +++ b/databases/p5-Apache-DBI/Makefile @@ -0,0 +1,23 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:43:29 jlam Exp $ +# + +DISTNAME= ApacheDBI-0.88 +PKGNAME= p5-Apache-DBI-0.88 +SVR4_PKGNAME= p5adb +CATEGORIES= databases perl5 +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Apache/} + +MAINTAINER= packages@netbsd.org +HOMEPAGE= http://www.symbolstone.org/technology/perl/DBI/index.html +COMMENT= DBI support for Apache+mod_perl + +DEPENDS+= p5-DBI>=1.13:../../databases/p5-DBI + +USE_BUILDLINK_ONLY= YES +PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Apache/DBI/.packlist + +do-configure: + @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL + +.include "../../lang/perl5/buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/databases/p5-Apache-DBI/PLIST b/databases/p5-Apache-DBI/PLIST new file mode 100644 index 00000000000..07aa99dceb6 --- /dev/null +++ b/databases/p5-Apache-DBI/PLIST @@ -0,0 +1 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.34.2 2002/06/23 18:43:30 jlam Exp $ diff --git a/databases/p5-Apache-DBI/distinfo b/databases/p5-Apache-DBI/distinfo new file mode 100644 index 00000000000..365816ebc9e --- /dev/null +++ b/databases/p5-Apache-DBI/distinfo @@ -0,0 +1,4 @@ +$NetBSD: distinfo,v 1.1.1.1.6.2 2002/06/23 18:43:31 jlam Exp $ + +SHA1 (ApacheDBI-0.88.tar.gz) = 1a4486be05d346eacb75901e240947de346cb73c +Size (ApacheDBI-0.88.tar.gz) = 25336 bytes diff --git a/databases/p5-DBD-mysql/Makefile b/databases/p5-DBD-mysql/Makefile index b8d68fc708d..db4473c3dfe 100644 --- a/databases/p5-DBD-mysql/Makefile +++ b/databases/p5-DBD-mysql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2002/03/20 11:33:04 martti Exp $ +# $NetBSD: Makefile,v 1.15.2.1 2002/06/23 18:43:31 jlam Exp $ # DISTNAME= Msql-Mysql-modules-1.2219 @@ -14,6 +14,8 @@ COMMENT= Perl DBI/DBD driver for MySQL databases DEPENDS+= p5-DBI>=1.13:../../databases/p5-DBI DEPENDS+= p5-Data-ShowTable-3.3:../../devel/p5-Data-ShowTable +BUILDLINK_DEPENDS.mysql-client?= mysql-client>=3.23.49nb1 + USE_PERL5= # defined PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Msql-Mysql-modules/.packlist diff --git a/databases/p5-DBD-postgresql/Makefile b/databases/p5-DBD-postgresql/Makefile index 5d50197a035..3527f3e6a52 100644 --- a/databases/p5-DBD-postgresql/Makefile +++ b/databases/p5-DBD-postgresql/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.15 2002/03/14 22:23:36 mjl Exp $ +# $NetBSD: Makefile,v 1.15.2.1 2002/06/23 18:43:32 jlam Exp $ # -VER= 1.11 +VER= 1.13 DISTNAME= DBD-Pg-${VER} PKGNAME= p5-DBD-postgresql-${VER} +PKGREVISION= 1 SVR4_PKGNAME= p5dpo CATEGORIES= databases perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=../../authors/id/JBAKER/} diff --git a/databases/p5-DBD-postgresql/distinfo b/databases/p5-DBD-postgresql/distinfo index a4866d6b438..489f5e53b68 100644 --- a/databases/p5-DBD-postgresql/distinfo +++ b/databases/p5-DBD-postgresql/distinfo @@ -1,4 +1,6 @@ -$NetBSD: distinfo,v 1.8 2002/03/14 22:23:36 mjl Exp $ +$NetBSD: distinfo,v 1.8.2.1 2002/06/23 18:43:33 jlam Exp $ -SHA1 (DBD-Pg-1.11.tar.gz) = 514231b30cc34fdee8b92aa995999b94a7e9898a -Size (DBD-Pg-1.11.tar.gz) = 41977 bytes +SHA1 (DBD-Pg-1.13.tar.gz) = f99a5aeebd71e0cac273311cb3405d9ed5e3e9c2 +Size (DBD-Pg-1.13.tar.gz) = 43038 bytes +SHA1 (patch-aa) = 1285ae6d29d41e1d7447909aed385145e16f8681 +SHA1 (patch-ab) = 5b8ee2423026727afdf87a482f681003d491ec39 diff --git a/databases/p5-DBD-postgresql/patches/patch-aa b/databases/p5-DBD-postgresql/patches/patch-aa new file mode 100644 index 00000000000..6d9bc2b2226 --- /dev/null +++ b/databases/p5-DBD-postgresql/patches/patch-aa @@ -0,0 +1,138 @@ +$NetBSD: patch-aa,v 1.1.2.2 2002/06/23 18:43:34 jlam Exp $ + +diff -ur dbdimp.c.orig dbdimp.c +--- dbdimp.c.orig Thu Apr 4 18:55:51 2002 ++++ dbdimp.c Wed May 15 19:16:54 2002 +@@ -40,6 +40,30 @@ + + + int ++_dbd_begin(imp_dbh_t *imp_dbh) ++{ ++ PGresult *result = NULL; ++ ExecStatusType status; ++ ++ if (DBIc_has(imp_dbh, DBIcf_AutoCommit) == TRUE) ++ return 1; ++ ++ if (imp_dbh->need_begin == 0) ++ return 1; ++ ++ imp_dbh->need_begin = 0; ++ ++ result = PQexec(imp_dbh->conn, "begin"); ++ status = result ? PQresultStatus(result) : -1; ++ PQclear(result); ++ if (status != PGRES_COMMAND_OK) { ++ return 0; ++ } ++ ++ return 1; ++} ++ ++int + dbd_discon_all (drh, imp_drh) + SV *drh; + imp_drh_t *imp_drh; +@@ -191,6 +215,7 @@ + + imp_dbh->init_commit = 1; /* initialize AutoCommit */ + imp_dbh->pg_auto_escape = 1; /* initialize pg_auto_escape */ ++ imp_dbh->need_begin = 1; + + DBIc_IMPSET_on(imp_dbh); /* imp_dbh set up now */ + DBIc_ACTIVE_on(imp_dbh); /* call disconnect before freeing */ +@@ -241,6 +266,9 @@ + PGresult* result = 0; + ExecStatusType status; + ++ if (imp_dbh->need_begin) ++ return 1; ++ + /* execute commit */ + result = PQexec(imp_dbh->conn, "commit"); + status = result ? PQresultStatus(result) : -1; +@@ -252,15 +280,8 @@ + return 0; + } + +- /* start new transaction. AutoCommit must be FALSE, ref. 20 lines up */ +- result = PQexec(imp_dbh->conn, "begin"); +- status = result ? PQresultStatus(result) : -1; +- PQclear(result); +- if (status != PGRES_COMMAND_OK) { +- pg_error(dbh, status, "begin failed\n"); +- return 0; +- } +- ++ imp_dbh->need_begin = 1; ++ + return 1; + } + +@@ -284,6 +305,9 @@ + PGresult* result = 0; + ExecStatusType status; + ++ if (imp_dbh->need_begin) ++ return 1; ++ + /* execute rollback */ + result = PQexec(imp_dbh->conn, "rollback"); + status = result ? PQresultStatus(result) : -1; +@@ -295,15 +319,8 @@ + return 0; + } + +- /* start new transaction. AutoCommit must be FALSE, ref. 20 lines up */ +- result = PQexec(imp_dbh->conn, "begin"); +- status = result ? PQresultStatus(result) : -1; +- PQclear(result); +- if (status != PGRES_COMMAND_OK) { +- pg_error(dbh, status, "begin failed\n"); +- return 0; +- } +- ++ imp_dbh->need_begin = 1; ++ + return 1; + } + +@@ -326,7 +343,8 @@ + + if (NULL != imp_dbh->conn) { + /* rollback if AutoCommit = off */ +- if (DBIc_has(imp_dbh, DBIcf_AutoCommit) == FALSE) { ++ if ((imp_dbh->need_begin == 0) ++ && (DBIc_has(imp_dbh, DBIcf_AutoCommit) == FALSE)) { + PGresult* result = 0; + ExecStatusType status; + result = PQexec(imp_dbh->conn, "rollback"); +@@ -402,16 +420,7 @@ + if (dbis->debug >= 2) { PerlIO_printf(DBILOGFP, "dbd_db_STORE: switch AutoCommit to on: commit\n"); } + } else if ((oldval != FALSE && newval == FALSE) || (oldval == FALSE && newval == FALSE && imp_dbh->init_commit)) { + if (NULL != imp_dbh->conn) { +- /* start new transaction */ +- PGresult* result = 0; +- ExecStatusType status; +- result = PQexec(imp_dbh->conn, "begin"); +- status = result ? PQresultStatus(result) : -1; +- PQclear(result); +- if (status != PGRES_COMMAND_OK) { +- pg_error(dbh, status, "begin failed\n"); +- return 0; +- } ++ imp_dbh->need_begin = 1; + } + if (dbis->debug >= 2) { PerlIO_printf(DBILOGFP, "dbd_db_STORE: switch AutoCommit to off: begin\n"); } + } +@@ -1027,6 +1036,9 @@ + SV **svp; + + if (dbis->debug >= 1) { PerlIO_printf(DBILOGFP, "dbd_st_execute\n"); } ++ ++ if (_dbd_begin(imp_dbh) == 0) ++ return 0; + + /* + here we get the statement from the statement handle where diff --git a/databases/p5-DBD-postgresql/patches/patch-ab b/databases/p5-DBD-postgresql/patches/patch-ab new file mode 100644 index 00000000000..406cafb90d8 --- /dev/null +++ b/databases/p5-DBD-postgresql/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1.2.2 2002/06/23 18:43:35 jlam Exp $ + +diff -ur dbdimp.h.orig dbdimp.h +--- dbdimp.h.orig Thu Apr 4 18:55:51 2002 ++++ dbdimp.h Thu Apr 4 19:08:29 2002 +@@ -22,6 +22,7 @@ + PGconn * conn; /* connection structure */ + int init_commit; /* initialize AutoCommit */ + int pg_auto_escape; /* initialize AutoEscape */ ++ int need_begin; /* need a begin */ + }; + + /* Define sth implementor data structure */ diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile index 367ea390ad1..f7e89945634 100644 --- a/databases/rrdtool/Makefile +++ b/databases/rrdtool/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2002/03/13 17:36:45 fredb Exp $ +# $NetBSD: Makefile,v 1.13.2.1 2002/06/23 18:43:37 jlam Exp $ # DISTNAME= rrdtool-1.0.33 @@ -14,8 +14,9 @@ DEPENDS+= cgilib-0.5:../../www/cgilib DEPENDS+= gd>=1.8.4nb1:../../graphics/gd DEPENDS+= jpeg-6*:../../graphics/jpeg -# IEEE math not good enough on alpha -NOT_FOR_PLATFORM= NetBSD-*-alpha +#needs FPC code not found in older versions of NetBSD +NOT_FOR_PLATFORM= NetBSD-1.[0-4]*-alpha NetBSD-1.5-alpha \ + NetBSD-1.5.*-alpha NetBSD-1.5[A-U]-alpha USE_LIBTOOL= # defined USE_GMAKE= # defined diff --git a/databases/xmysqladmin/Makefile b/databases/xmysqladmin/Makefile index 2d8dc9775ec..7c8d7039e09 100644 --- a/databases/xmysqladmin/Makefile +++ b/databases/xmysqladmin/Makefile @@ -1,10 +1,14 @@ -# $NetBSD: Makefile,v 1.9 2002/04/17 04:45:11 fredb Exp $ +# $NetBSD: Makefile,v 1.9.2.1 2002/06/23 18:43:37 jlam Exp $ # DISTNAME= xmysqladmin-1.0 PKGREVISION= 1 CATEGORIES= databases x11 -MASTER_SITES= http://www.mysql.com/Contrib/ +MASTER_SITES= http://gd.tuwien.ac.at/db/mysql/Downloads/Contrib/ \ + http://mysql-mirror.free.fr/Downloads/Contrib/ \ + http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/Contrib/ \ + http://mysql.adgrafix.com/Downloads/Contrib/ \ + http://mysql.secsup.org/Downloads/Contrib/ MAINTAINER= bad@netbsd.org HOMEPAGE= http://www.mysql.com/ diff --git a/devel/GConf/buildlink.mk b/devel/GConf/buildlink.mk index b9bd1cb1c17..1cb8eb3760a 100644 --- a/devel/GConf/buildlink.mk +++ b/devel/GConf/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.7 2002/04/11 22:56:53 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.7.2.1 2002/06/23 18:43:39 jlam Exp $ # # This Makefile fragment is included by packages that use gconf. # @@ -20,7 +20,7 @@ GCONF_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.gconf?= GConf>=1.0.7nb1 DEPENDS+= ${BUILDLINK_DEPENDS.gconf}:../../devel/GConf -EVAL_PREFIX+= BUILDLINK_PREFIX.gconf=gconf +EVAL_PREFIX+= BUILDLINK_PREFIX.gconf=GConf BUILDLINK_PREFIX.gconf_DEFAULT= ${X11PREFIX} BUILDLINK_FILES.gconf= include/gconf/1/gconf/* BUILDLINK_FILES.gconf+= lib/libgconf-* diff --git a/devel/GConf2/DESCR b/devel/GConf2/DESCR new file mode 100644 index 00000000000..0e4bfa1650b --- /dev/null +++ b/devel/GConf2/DESCR @@ -0,0 +1,10 @@ +GConf is a configuration database system, functionally similar to the +Windows registry but lots better. It was written for the GNOME +desktop but does not require GNOME; configure should notice if GNOME +is not installed and compile the basic GConf library anyway. + +There's an introductory article at +http://developer.gnome.org/feature/current/index.html, written a while +ago but mostly still valid. Also, there's a mailing list +gconf-list@gnome.org, see +http://mail.gnome.org/mailman/listinfo/gconf-list diff --git a/devel/GConf2/Makefile b/devel/GConf2/Makefile new file mode 100644 index 00000000000..f44df2a4add --- /dev/null +++ b/devel/GConf2/Makefile @@ -0,0 +1,27 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:43:42 jlam Exp $ +# + +DISTNAME= GConf-1.1.10 +PKGNAME= GConf2-1.1.10 +CATEGORIES= devel gnome +MASTER_SITES= ${MASTER_SITE_GNOME:=pre-gnome2/sources/GConf/} +EXTRACT_SUFX= .tar.bz2 + +MAINTAINER= jmmv@hispabsd.org +HOMEPAGE= http://advogato.org/proj/GConf/ +COMMENT= configuration database system used by GNOME (v2) + +BUILD_USES_MSGFMT= yes + +USE_BUILDLINK_ONLY= YES +GNU_CONFIGURE= YES +USE_LIBTOOL= YES + +LIBTOOL_OVERRIDE= ${WRKSRC}/libtool + +.include "../../databases/db3/buildlink.mk" +.include "../../devel/glib2/buildlink.mk" +.include "../../net/ORBit2/buildlink.mk" +.include "../../textproc/libxml2/buildlink.mk" +.include "../../x11/gtk2/buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/devel/GConf2/PLIST b/devel/GConf2/PLIST new file mode 100644 index 00000000000..0dc6d06728f --- /dev/null +++ b/devel/GConf2/PLIST @@ -0,0 +1,63 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.2.2 2002/06/23 18:43:43 jlam Exp $ +bin/gconf-sanity-check-2 +bin/gconfd-2 +bin/gconftool-2 +etc/gconf/2/path +include/gconf/2/gconf/gconf-changeset.h +include/gconf/2/gconf/gconf-client.h +include/gconf/2/gconf/gconf-engine.h +include/gconf/2/gconf/gconf-enum-types.h +include/gconf/2/gconf/gconf-error.h +include/gconf/2/gconf/gconf-listeners.h +include/gconf/2/gconf/gconf-schema.h +include/gconf/2/gconf/gconf-value.h +include/gconf/2/gconf/gconf.h +lib/GConf/2/libgconfbackend-xml.a +lib/GConf/2/libgconfbackend-xml.la +lib/GConf/2/libgconfbackend-xml.so +lib/libgconf-2.a +lib/libgconf-2.la +lib/libgconf-2.so +lib/libgconf-2.so.5 +lib/libgconf-2.so.5.0 +lib/pkgconfig/gconf-2.0.pc +share/aclocal/gconf-2.m4 +${PKGLOCALEDIR}/locale/az/LC_MESSAGES/GConf2.mo +${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/GConf2.mo +${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/GConf2.mo +${PKGLOCALEDIR}/locale/da/LC_MESSAGES/GConf2.mo +${PKGLOCALEDIR}/locale/de/LC_MESSAGES/GConf2.mo +${PKGLOCALEDIR}/locale/el/LC_MESSAGES/GConf2.mo +${PKGLOCALEDIR}/locale/es/LC_MESSAGES/GConf2.mo +${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/GConf2.mo +${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/GConf2.mo +${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/GConf2.mo +${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/GConf2.mo +${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/GConf2.mo +${PKGLOCALEDIR}/locale/it/LC_MESSAGES/GConf2.mo +${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/GConf2.mo +${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/GConf2.mo +${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/GConf2.mo +${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/GConf2.mo +${PKGLOCALEDIR}/locale/no/LC_MESSAGES/GConf2.mo +${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/GConf2.mo +${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/GConf2.mo +${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/GConf2.mo +${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/GConf2.mo +${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/GConf2.mo +${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/GConf2.mo +${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/GConf2.mo +${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/GConf2.mo +${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/GConf2.mo +${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/GConf2.mo +${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/GConf2.mo +${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/GConf2.mo +@exec ${MKDIR} %D/share/gtk-doc/html/gconf +@dirrm share/gtk-doc/html/gconf +@dirrm lib/GConf/2 +@dirrm lib/GConf +@dirrm include/gconf/2/gconf +@dirrm include/gconf/2 +@dirrm include/gconf +@dirrm etc/gconf/2 +@dirrm etc/gconf diff --git a/devel/GConf2/buildlink.mk b/devel/GConf2/buildlink.mk new file mode 100644 index 00000000000..e5fa88de2ff --- /dev/null +++ b/devel/GConf2/buildlink.mk @@ -0,0 +1,41 @@ +# $NetBSD: buildlink.mk,v 1.3.2.2 2002/06/23 18:43:45 jlam Exp $ +# +# This Makefile fragment is included by packages that use gconf2. +# +# To use this Makefile fragment, simply: +# +# (1) Optionally define BUILDLINK_DEPENDS.gconf2 to the dependency pattern +# for the version of gconf2 desired. +# (2) Include this Makefile fragment in the package Makefile, +# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header +# search path, and +# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search +# path. + +.if !defined(GCONF2_BUILDLINK_MK) +GCONF2_BUILDLINK_MK= # defined + +.include "../../mk/bsd.buildlink.mk" + +BUILDLINK_DEPENDS.gconf2?= GConf2>=1.1.10 +DEPENDS+= ${BUILDLINK_DEPENDS.gconf2}:../../devel/GConf2 + +EVAL_PREFIX+= BUILDLINK_PREFIX.gconf2=GConf2 +BUILDLINK_PREFIX.gconf2_DEFAULT= ${X11PREFIX} +BUILDLINK_FILES.gconf2= include/gconf/2/gconf/* +BUILDLINK_FILES.gconf2+= lib/libgconf-2* + +REPLACE_BUILDLINK_SED+= \ + -e "s|-I${BUILDLINK_DIR}/\(include/gconf/\)|-I${BUILDLINK_PREFIX.gconf2}/\1|g" + +.include "../../databases/db3/buildlink.mk" +.include "../../devel/gettext-lib/buildlink.mk" +.include "../../devel/oaf/buildlink.mk" + +BUILDLINK_TARGETS.gconf2= gconf2-buildlink +BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.gconf2} + +pre-configure: ${BUILDLINK_TARGETS.gconf2} +gconf2-buildlink: _BUILDLINK_USE + +.endif # GCONF2_BUILDLINK_MK diff --git a/devel/GConf2/distinfo b/devel/GConf2/distinfo new file mode 100644 index 00000000000..675f751a1f4 --- /dev/null +++ b/devel/GConf2/distinfo @@ -0,0 +1,4 @@ +$NetBSD: distinfo,v 1.1.1.1.2.2 2002/06/23 18:43:46 jlam Exp $ + +SHA1 (GConf-1.1.10.tar.bz2) = 7fa90d0c5f8962fd5307a2f38177daf26b795312 +Size (GConf-1.1.10.tar.bz2) = 878638 bytes diff --git a/devel/Makefile b/devel/Makefile index dfa7ec1e4fe..8ad38760020 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.285 2002/04/30 12:37:11 wiz Exp $ +# $NetBSD: Makefile,v 1.285.2.1 2002/06/23 18:43:38 jlam Exp $ # COMMENT= Development utilities SUBDIR+= GConf +SUBDIR+= GConf2 SUBDIR+= SDL SUBDIR+= SDL_gfx SUBDIR+= SDL_ttf @@ -56,6 +57,7 @@ SUBDIR+= cxref SUBDIR+= ddd SUBDIR+= dejagnu SUBDIR+= diffutils +SUBDIR+= dlcompat SUBDIR+= dmake SUBDIR+= dmalloc SUBDIR+= doc++ @@ -89,6 +91,7 @@ SUBDIR+= gnome-objc SUBDIR+= gobo-eiffel SUBDIR+= gpasm SUBDIR+= gperf +SUBDIR+= gscope SUBDIR+= gtexinfo SUBDIR+= gtkdiff SUBDIR+= gtl @@ -116,6 +119,7 @@ SUBDIR+= lcc SUBDIR+= lclint SUBDIR+= ldapsdk SUBDIR+= libavl +SUBDIR+= libbegemot SUBDIR+= libctl SUBDIR+= libdockapp SUBDIR+= libetm @@ -152,6 +156,7 @@ SUBDIR+= mrproject SUBDIR+= nana SUBDIR+= nasm SUBDIR+= nasm-devel +SUBDIR+= nbitools SUBDIR+= ncurses SUBDIR+= netcdf SUBDIR+= newmkdep @@ -218,6 +223,7 @@ SUBDIR+= pango SUBDIR+= pardiff SUBDIR+= patch SUBDIR+= pccts +SUBDIR+= pcl-cvs SUBDIR+= pcre SUBDIR+= pedisassem SUBDIR+= php3-pcre @@ -238,6 +244,7 @@ SUBDIR+= prc-tools-gcc SUBDIR+= prc-tools-gdb SUBDIR+= prcs SUBDIR+= pth +SUBDIR+= pth-syscall SUBDIR+= ptl2 SUBDIR+= pwlib SUBDIR+= py-Checker @@ -270,7 +277,6 @@ SUBDIR+= ruby-ri SUBDIR+= ruby-strscan SUBDIR+= ruby-textbuf SUBDIR+= ruby-unit -#SUBDIR+= ruby14-readline # only needed for ruby-1.4 package SUBDIR+= rvm SUBDIR+= rx SUBDIR+= sdcc diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile index 55a4992091a..16373ea40fb 100644 --- a/devel/SDL/Makefile +++ b/devel/SDL/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2002/02/14 00:39:45 wiz Exp $ +# $NetBSD: Makefile,v 1.31.2.1 2002/06/23 18:43:47 jlam Exp $ # DISTNAME= SDL-1.2.3 @@ -11,7 +11,6 @@ COMMENT= Simple DirectMedia Layer, a cross-platform multimedia library BUILD_DEPENDS+= automake>=1.4:../../devel/automake BUILD_DEPENDS+= nasm>=0.98:../../devel/nasm -BUILDLINK_DEPENDS.pth= pth>=1.4.0 USE_BUILDLINK_ONLY= YES diff --git a/devel/autoconf-devel/Makefile b/devel/autoconf-devel/Makefile index 60694644792..b3369992392 100644 --- a/devel/autoconf-devel/Makefile +++ b/devel/autoconf-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2002/04/18 21:36:21 rh Exp $ +# $NetBSD: Makefile,v 1.4.2.1 2002/06/23 18:43:47 jlam Exp $ DISTNAME= autoconf-2.53 CATEGORIES= devel @@ -20,6 +20,9 @@ M4= ${PREFIX}/bin/gm4 INFO_FILES= autoconf.info standards.info +PERL5_REQD= 5.6 +TEXINFO_REQD= 4.0 + .include "../../lang/perl5/buildlink.mk" .include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/autoconf-devel/distinfo b/devel/autoconf-devel/distinfo index 38c69b09582..2d3dfd71eea 100644 --- a/devel/autoconf-devel/distinfo +++ b/devel/autoconf-devel/distinfo @@ -1,4 +1,5 @@ -$NetBSD: distinfo,v 1.3 2002/04/19 13:49:57 wiz Exp $ +$NetBSD: distinfo,v 1.3.2.1 2002/06/23 18:43:48 jlam Exp $ SHA1 (autoconf-2.53.tar.gz) = a9fe8460b4ed6f279f3d3f8a73eb39b19e93dc98 Size (autoconf-2.53.tar.gz) = 990527 bytes +SHA1 (patch-aa) = b9f12e698a6393749f8a9029d452c094a29ee8f8 diff --git a/devel/autoconf-devel/patches/patch-aa b/devel/autoconf-devel/patches/patch-aa new file mode 100644 index 00000000000..c9d7485491c --- /dev/null +++ b/devel/autoconf-devel/patches/patch-aa @@ -0,0 +1,31 @@ +$NetBSD: patch-aa,v 1.1.2.2 2002/06/23 18:43:49 jlam Exp $ + +--- doc/autoconf.texi.orig Fri Mar 8 13:57:41 2002 ++++ doc/autoconf.texi +@@ -413,7 +413,7 @@ + * Changed Quotation:: Broken code which used to work + * New Macros:: Interaction with foreign macros + * Hosts and Cross-Compilation:: Bugward compatibility kludges +-* AC_LIBOBJ vs. LIBOBJS:: ++* AC_LIBOBJ vs LIBOBJS:: + + Generating Test Suites with Autotest + +@@ -11838,7 +11838,7 @@ + * Changed Quotation:: Broken code which used to work + * New Macros:: Interaction with foreign macros + * Hosts and Cross-Compilation:: Bugward compatibility kludges +-* AC_LIBOBJ vs. LIBOBJS:: LIBOBJS is a forbidden token ++* AC_LIBOBJ vs LIBOBJS:: LIBOBJS is a forbidden token + @end menu + + @node Changed Quotation +@@ -12081,7 +12081,7 @@ + @end example + + +-@node AC_LIBOBJ vs. LIBOBJS ++@node AC_LIBOBJ vs LIBOBJS + @subsection @code{AC_LIBOBJ} vs. @code{LIBOBJS} + + Up to Autoconf 2.13, the replacement of functions was triggered via the diff --git a/devel/automake/Makefile b/devel/automake/Makefile index 4b7d286e1f6..5146c0425ac 100644 --- a/devel/automake/Makefile +++ b/devel/automake/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27.2.2 2002/06/21 23:05:05 jlam Exp $ +# $NetBSD: Makefile,v 1.27.2.3 2002/06/23 18:43:50 jlam Exp $ # FreeBSD Id: Makefile,v 1.5 1997/09/19 09:29:04 max Exp # @@ -17,7 +17,7 @@ DEPENDS= autoconf>=2.13:../../devel/autoconf USE_BUILDLINK2= YES GNU_CONFIGURE= YES CONFIGURE_ENV= PERL=${PERL5} -STRIPFLAG= # none +_STRIPFLAG_INSTALL= # none INFO_FILES= automake.info TEXINFO_OVERRIDE= YES diff --git a/devel/binutils/buildlink.mk b/devel/binutils/buildlink.mk index 48c944db69e..78472f3cc43 100644 --- a/devel/binutils/buildlink.mk +++ b/devel/binutils/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.2 2002/04/30 12:44:39 wiz Exp $ +# $NetBSD: buildlink.mk,v 1.2.2.1 2002/06/23 18:43:51 jlam Exp $ # # This Makefile fragment is included by packages that use binutils. # @@ -33,7 +33,7 @@ _NEED_BINUTILS= YES .if ${_NEED_BINUTILS} == "YES" BUILDLINK_DEPENDS.binutils?= binutils>=2.11.2 -DEPENDS+= ${BUILDLINK_DEPENDS.binutils}:../../devel/binutils +BUILD_DEPENDS+= ${BUILDLINK_DEPENDS.binutils}:../../devel/binutils EVAL_PREFIX+= BUILDLINK_PREFIX.binutils=binutils BUILDLINK_PREFIX.binutils_DEFAULT= ${LOCALBASE} diff --git a/devel/bison/PLIST b/devel/bison/PLIST index e81167fcc24..f70668e1b3d 100644 --- a/devel/bison/PLIST +++ b/devel/bison/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2002/03/29 09:42:51 wiz Exp $ +@comment $NetBSD: PLIST,v 1.5.2.1 2002/06/23 18:43:51 jlam Exp $ bin/bison @unexec ${INSTALL_INFO} --delete %D/info/bison.info %D/info/dir info/bison.info @@ -8,7 +8,7 @@ info/bison.info-3 info/bison.info-4 info/bison.info-5 info/bison.info-6 -@comment also in libiconv: lib/charset.alias +@comment from libiconv: lib/charset.alias @exec ${INSTALL_INFO} %D/info/bison.info %D/info/dir man/man1/bison.1 share/bison/bison.simple diff --git a/devel/bonobo-activation/Makefile b/devel/bonobo-activation/Makefile index 094b121dd8e..d8da0b4b4ea 100644 --- a/devel/bonobo-activation/Makefile +++ b/devel/bonobo-activation/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2002/04/27 11:31:24 rh Exp $ +# $NetBSD: Makefile,v 1.2.2.1 2002/06/23 18:43:54 jlam Exp $ # -DISTNAME= bonobo-activation-0.9.7 +DISTNAME= bonobo-activation-0.9.8 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME:=pre-gnome2/sources/bonobo-activation/} EXTRACT_SUFX= .tar.bz2 diff --git a/devel/bonobo-activation/PLIST b/devel/bonobo-activation/PLIST index 7709a5d1b5e..2730eea854d 100644 --- a/devel/bonobo-activation/PLIST +++ b/devel/bonobo-activation/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/04/27 08:57:57 rh Exp $ +@comment $NetBSD: PLIST,v 1.1.1.1.2.1 2002/06/23 18:43:54 jlam Exp $ bin/activation-client bin/bonobo-activation-empty-server bin/bonobo-activation-run-query @@ -23,6 +23,7 @@ lib/bonobo/servers/Bonobo_CosNaming_NamingContext.server lib/bonobo/servers/broken.server lib/bonobo/servers/empty.server lib/bonobo/servers/plugin.server +lib/libbonobo-activation.a lib/libbonobo-activation.la lib/libbonobo-activation.so lib/libbonobo-activation.so.4 diff --git a/devel/bonobo-activation/buildlink.mk b/devel/bonobo-activation/buildlink.mk new file mode 100644 index 00000000000..2b7b6b465af --- /dev/null +++ b/devel/bonobo-activation/buildlink.mk @@ -0,0 +1,58 @@ +# $NetBSD: buildlink.mk,v 1.1.2.2 2002/06/23 18:43:54 jlam Exp $ +# +# This Makefile fragment is included by packages that use bonobo-activation. +# +# This file was created automatically using createbuildlink 1.6. +# +# To use this Makefile fragment, simply: +# +# (1) Optionally define BUILDLINK_DEPENDS.bonobo-activation to the dependency pattern +# for the version of bonobo-activation desired. +# (2) Include this Makefile fragment in the package Makefile, +# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header +# search path, and +# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search +# path. + +.if !defined(BONOBO_ACTIVATION_BUILDLINK_MK) +BONOBO_ACTIVATION_BUILDLINK_MK= # defined + +.include "../../mk/bsd.buildlink.mk" + +BUILDLINK_DEPENDS.bonobo-activation?= bonobo-activation>=0.9.8 +DEPENDS+= ${BUILDLINK_DEPENDS.bonobo-activation}:../../devel/bonobo-activation + +EVAL_PREFIX+= BUILDLINK_PREFIX.bonobo-activation=bonobo-activation +BUILDLINK_PREFIX.bonobo-activation_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.bonobo-activation+= include/bonobo-activation-2.0/bonobo-activation/Bonobo_Activation_types.h +BUILDLINK_FILES.bonobo-activation+= include/bonobo-activation-2.0/bonobo-activation/Bonobo_GenericFactory.h +BUILDLINK_FILES.bonobo-activation+= include/bonobo-activation-2.0/bonobo-activation/Bonobo_Unknown.h +BUILDLINK_FILES.bonobo-activation+= include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-activate.h +BUILDLINK_FILES.bonobo-activation+= include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-async.h +BUILDLINK_FILES.bonobo-activation+= include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-base-service.h +BUILDLINK_FILES.bonobo-activation+= include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-id.h +BUILDLINK_FILES.bonobo-activation+= include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-init.h +BUILDLINK_FILES.bonobo-activation+= include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-register.h +BUILDLINK_FILES.bonobo-activation+= include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-server-info.h +BUILDLINK_FILES.bonobo-activation+= include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-shlib.h +BUILDLINK_FILES.bonobo-activation+= include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-version.h +BUILDLINK_FILES.bonobo-activation+= include/bonobo-activation-2.0/bonobo-activation/bonobo-activation.h +BUILDLINK_FILES.bonobo-activation+= lib/bonobo/servers/Bonobo_CosNaming_NamingContext.server +BUILDLINK_FILES.bonobo-activation+= lib/bonobo/servers/broken.server +BUILDLINK_FILES.bonobo-activation+= lib/bonobo/servers/empty.server +BUILDLINK_FILES.bonobo-activation+= lib/bonobo/servers/plugin.server +BUILDLINK_FILES.bonobo-activation+= lib/libbonobo-activation.* +BUILDLINK_FILES.bonobo-activation+= lib/pkgconfig/bonobo-activation-2.0.pc + +.include "../../textproc/libxml2/buildlink.mk" +.include "../../net/ORBit2/buildlink.mk" +.include "../../devel/pkgconfig/buildlink.mk" + +BUILDLINK_TARGETS.bonobo-activation= bonobo-activation-buildlink +BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.bonobo-activation} +BUILDLINK_TARGETS+= ${BUILDLINK_PKG_CONFIG} + +pre-configure: ${BUILDLINK_TARGETS} +bonobo-activation-buildlink: _BUILDLINK_USE + +.endif # BONOBO_ACTIVATION_BUILDLINK_MK diff --git a/devel/bonobo-activation/distinfo b/devel/bonobo-activation/distinfo index 7ce704b1166..7c948f81aea 100644 --- a/devel/bonobo-activation/distinfo +++ b/devel/bonobo-activation/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/04/27 08:57:57 rh Exp $ +$NetBSD: distinfo,v 1.1.1.1.2.1 2002/06/23 18:43:55 jlam Exp $ -SHA1 (bonobo-activation-0.9.7.tar.bz2) = 2ba20470908a8783d0d1131a3f751e15b6d74d67 -Size (bonobo-activation-0.9.7.tar.bz2) = 407914 bytes +SHA1 (bonobo-activation-0.9.8.tar.bz2) = 0b63eb39aeac699d5ecd7d366d886b30ed151d50 +Size (bonobo-activation-0.9.8.tar.bz2) = 388114 bytes SHA1 (patch-aa) = bb2de068441860108ae049a10c6edc072defda96 SHA1 (patch-ab) = 59af0344f3d63f57bf1099d03b7141b82f20054a diff --git a/devel/bonobo-conf/Makefile b/devel/bonobo-conf/Makefile index 4de53297eb3..d2874b97b76 100644 --- a/devel/bonobo-conf/Makefile +++ b/devel/bonobo-conf/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2002/03/13 17:36:47 fredb Exp $ +# $NetBSD: Makefile,v 1.4.2.1 2002/06/23 18:43:55 jlam Exp $ DISTNAME= bonobo-conf-0.14 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME:=unstable/sources/bonobo-conf/} @@ -9,6 +9,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.gnome.org/ COMMENT= Bonobo configuration system +BUILD_DEPENDS+= autoconf-[0-9]*:../../devel/autoconf BUILD_USES_MSGFMT= YES GNU_CONFIGURE= YES @@ -16,6 +17,9 @@ USE_X11BASE= YES USE_LIBTOOL= YES USE_GMAKE= YES +pre-configure: + cd ${WRKSRC} && autoconf + post-configure: ${RM} -f ${WRKSRC}/libtool ${LN} -s ${LOCALBASE}/bin/libtool ${WRKSRC} @@ -31,5 +35,6 @@ post-install: .include "../../devel/GConf/buildlink.mk" .include "../../devel/popt/buildlink.mk" .include "../../devel/oaf/buildlink.mk" +.include "../../graphics/gdk-pixbuf/buildlink.mk" .include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/bonobo-conf/distinfo b/devel/bonobo-conf/distinfo index ea0f4b87fb8..66ec79e904c 100644 --- a/devel/bonobo-conf/distinfo +++ b/devel/bonobo-conf/distinfo @@ -1,4 +1,6 @@ -$NetBSD: distinfo,v 1.3 2002/01/16 01:37:48 rh Exp $ +$NetBSD: distinfo,v 1.3.2.1 2002/06/23 18:43:56 jlam Exp $ SHA1 (bonobo-conf-0.14.tar.gz) = 9e33ec9eb7553cca90e4e1f9e018e2a7f2740d7a Size (bonobo-conf-0.14.tar.gz) = 438259 bytes +SHA1 (patch-aa) = ff4f1a032862499a2e4682b2475275949fcfb58f +SHA1 (patch-ab) = 3ccae1607d75f44455d2526857637cbe22ad8ff1 diff --git a/devel/bonobo-conf/patches/patch-aa b/devel/bonobo-conf/patches/patch-aa new file mode 100644 index 00000000000..d70bba592a5 --- /dev/null +++ b/devel/bonobo-conf/patches/patch-aa @@ -0,0 +1,21 @@ +--- configure.in.orig Thu Nov 1 12:12:01 2001 ++++ configure.in Tue May 14 18:35:04 2002 +@@ -24,6 +24,7 @@ + AM_PATH_GLIB(1.2.0,,AC_MSG_ERROR(glib not found or too old),gmodule) + AM_PATH_OAF(0.6.2,,AC_MSG_ERROR([OAF not found or too old])) + AM_PATH_GTK(1.2.0,,AC_MSG_ERROR([gtk not found or too old])) ++AM_PATH_GDK_PIXBUF(0.17.0,,AC_MSG_ERROR([gdk-pixbuf not found or too old])) + + AC_ARG_WITH(html-dir, [ --with-html-dir=PATH path to installed docs ]) + if test "x$with_html_dir" = "x" ; then +@@ -65,8 +66,8 @@ + AC_MSG_ERROR([bonobo >= 1.0.14 not found]) + fi + +-BONOBO_LIBS="`gnome-config --libs oaf bonobox gnome`" +-BONOBO_CFLAGS="`gnome-config --cflags oaf bonobox gnome`" ++BONOBO_LIBS="`gnome-config --libs oaf bonobox gnome` $GDK_PIXBUF_LIBS" ++BONOBO_CFLAGS="`gnome-config --cflags oaf bonobox gnome` $GDK_PIXBUF_CFLAGS" + + BONOBO_CONF_LIBS="-lbonobo_conf $BONOBO_LIBS" + BONOBO_CONF_CFLAGS="$BONOBO_CFLAGS" diff --git a/devel/bonobo-conf/patches/patch-ab b/devel/bonobo-conf/patches/patch-ab new file mode 100644 index 00000000000..48e74c6840f --- /dev/null +++ b/devel/bonobo-conf/patches/patch-ab @@ -0,0 +1,173 @@ +--- aclocal.m4.orig Tue May 14 18:26:28 2002 ++++ aclocal.m4 Tue May 14 18:27:19 2002 +@@ -4944,3 +4944,170 @@ + fi + fi]) + ++# Configure paths for gdk-pixbuf ++# Elliot Lee 2000-01-10 ++# stolen from Raph Levien 98-11-18 ++# stolen from Manish Singh 98-9-30 ++# stolen back from Frank Belew ++# stolen from Manish Singh ++# Shamelessly stolen from Owen Taylor ++ ++dnl AM_PATH_GDK_PIXBUF([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) ++dnl Test for GDK_PIXBUF, and define GDK_PIXBUF_CFLAGS and GDK_PIXBUF_LIBS ++dnl ++AC_DEFUN(AM_PATH_GDK_PIXBUF, ++[dnl ++dnl Get the cflags and libraries from the gdk-pixbuf-config script ++dnl ++AC_ARG_WITH(gdk-pixbuf-prefix,[ --with-gdk-pixbuf-prefix=PFX Prefix where GDK_PIXBUF is installed (optional)], ++ gdk_pixbuf_prefix="$withval", gdk_pixbuf_prefix="") ++AC_ARG_WITH(gdk-pixbuf-exec-prefix,[ --with-gdk-pixbuf-exec-prefix=PFX Exec prefix where GDK_PIXBUF is installed (optional)], ++ gdk_pixbuf_exec_prefix="$withval", gdk_pixbuf_exec_prefix="") ++AC_ARG_ENABLE(gdk_pixbuftest, [ --disable-gdk_pixbuftest Do not try to compile and run a test GDK_PIXBUF program], ++ , enable_gdk_pixbuftest=yes) ++ ++ if test x$gdk_pixbuf_exec_prefix != x ; then ++ gdk_pixbuf_args="$gdk_pixbuf_args --exec-prefix=$gdk_pixbuf_exec_prefix" ++ if test x${GDK_PIXBUF_CONFIG+set} = xset ; then ++ GDK_PIXBUF_CONFIG=$gdk_pixbuf_exec_prefix/gdk-pixbuf-config ++ fi ++ fi ++ if test x$gdk_pixbuf_prefix != x ; then ++ gdk_pixbuf_args="$gdk_pixbuf_args --prefix=$gdk_pixbuf_prefix" ++ if test x${GDK_PIXBUF_CONFIG+set} = xset ; then ++ GDK_PIXBUF_CONFIG=$gdk_pixbuf_prefix/bin/gdk-pixbuf-config ++ fi ++ fi ++ ++ AC_PATH_PROG(GDK_PIXBUF_CONFIG, gdk-pixbuf-config, no) ++ min_gdk_pixbuf_version=ifelse([$1], ,0.2.5,$1) ++ AC_MSG_CHECKING(for GDK_PIXBUF - version >= $min_gdk_pixbuf_version) ++ no_gdk_pixbuf="" ++ if test "$GDK_PIXBUF_CONFIG" = "no" ; then ++ no_gdk_pixbuf=yes ++ else ++ GDK_PIXBUF_CFLAGS=`$GDK_PIXBUF_CONFIG $gdk_pixbufconf_args --cflags` ++ GDK_PIXBUF_LIBS=`$GDK_PIXBUF_CONFIG $gdk_pixbufconf_args --libs` ++ ++ gdk_pixbuf_major_version=`$GDK_PIXBUF_CONFIG $gdk_pixbuf_args --version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` ++ gdk_pixbuf_minor_version=`$GDK_PIXBUF_CONFIG $gdk_pixbuf_args --version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` ++ gdk_pixbuf_micro_version=`$GDK_PIXBUF_CONFIG $gdk_pixbuf_config_args --version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` ++ if test "x$enable_gdk_pixbuftest" = "xyes" ; then ++ ac_save_CFLAGS="$CFLAGS" ++ ac_save_LIBS="$LIBS" ++ CFLAGS="$CFLAGS $GDK_PIXBUF_CFLAGS" ++ LIBS="$LIBS $GDK_PIXBUF_LIBS" ++dnl ++dnl Now check if the installed GDK_PIXBUF is sufficiently new. (Also sanity ++dnl checks the results of gdk-pixbuf-config to some extent ++dnl ++ rm -f conf.gdk_pixbuftest ++ AC_TRY_RUN([ ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++#include <gdk-pixbuf/gdk-pixbuf.h> ++ ++char* ++my_strdup (char *str) ++{ ++ char *new_str; ++ ++ if (str) ++ { ++ new_str = malloc ((strlen (str) + 1) * sizeof(char)); ++ strcpy (new_str, str); ++ } ++ else ++ new_str = NULL; ++ ++ return new_str; ++} ++ ++int main () ++{ ++ int major, minor, micro; ++ char *tmp_version; ++ ++ system ("touch conf.gdk_pixbuftest"); ++ ++ /* HP/UX 9 (%@#!) writes to sscanf strings */ ++ tmp_version = my_strdup("$min_gdk_pixbuf_version"); ++ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { ++ printf("%s, bad version string\n", "$min_gdk_pixbuf_version"); ++ exit(1); ++ } ++ ++ if (($gdk_pixbuf_major_version > major) || ++ (($gdk_pixbuf_major_version == major) && ($gdk_pixbuf_minor_version > minor)) || ++ (($gdk_pixbuf_major_version == major) && ($gdk_pixbuf_minor_version == minor) && ($gdk_pixbuf_micro_version >= micro))) ++ { ++ return 0; ++ } ++ else ++ { ++ printf("\n*** 'gdk-pixbuf-config --version' returned %d.%d.%d, but the minimum version\n", $gdk_pixbuf_major_version, $gdk_pixbuf_minor_version, $gdk_pixbuf_micro_version); ++ printf("*** of GDK_PIXBUF required is %d.%d.%d. If gdk-pixbuf-config is correct, then it is\n", major, minor, micro); ++ printf("*** best to upgrade to the required version.\n"); ++ printf("*** If gdk-pixbuf-config was wrong, set the environment variable GDK_PIXBUF_CONFIG\n"); ++ printf("*** to point to the correct copy of gdk-pixbuf-config, and remove the file\n"); ++ printf("*** config.cache before re-running configure\n"); ++ return 1; ++ } ++} ++ ++],, no_gdk_pixbuf=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ fi ++ fi ++ if test "x$no_gdk_pixbuf" = x ; then ++ AC_MSG_RESULT(yes) ++ ifelse([$2], , :, [$2]) ++ else ++ AC_MSG_RESULT(no) ++ if test "$GDK_PIXBUF_CONFIG" = "no" ; then ++ echo "*** The gdk-pixbuf-config script installed by GDK_PIXBUF could not be found" ++ echo "*** If GDK_PIXBUF was installed in PREFIX, make sure PREFIX/bin is in" ++ echo "*** your path, or set the GDK_PIXBUF_CONFIG environment variable to the" ++ echo "*** full path to gdk-pixbuf-config." ++ else ++ if test -f conf.gdk_pixbuftest ; then ++ : ++ else ++ echo "*** Could not run GDK_PIXBUF test program, checking why..." ++ CFLAGS="$CFLAGS $GDK_PIXBUF_CFLAGS" ++ LIBS="$LIBS $GDK_PIXBUF_LIBS" ++ AC_TRY_LINK([ ++#include <stdio.h> ++#include <gdk-pixbuf/gdk-pixbuf.h> ++], [ return 0; ], ++ [ echo "*** The test program compiled, but did not run. This usually means" ++ echo "*** that the run-time linker is not finding GDK_PIXBUF or finding the wrong" ++ echo "*** version of GDK_PIXBUF. If it is not finding GDK_PIXBUF, you'll need to set your" ++ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" ++ echo "*** to the installed location Also, make sure you have run ldconfig if that" ++ echo "*** is required on your system" ++ echo "***" ++ echo "*** If you have an old version installed, it is best to remove it, although" ++ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], ++ [ echo "*** The test program failed to compile or link. See the file config.log for the" ++ echo "*** exact error that occured. This usually means GDK_PIXBUF was incorrectly installed" ++ echo "*** or that you have moved GDK_PIXBUF since it was installed. In the latter case, you" ++ echo "*** may want to edit the gdk-pixbuf-config script: $GDK_PIXBUF_CONFIG" ]) ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ fi ++ fi ++ GDK_PIXBUF_CFLAGS="" ++ GDK_PIXBUF_LIBS="" ++ ifelse([$3], , :, [$3]) ++ fi ++ AC_SUBST(GDK_PIXBUF_CFLAGS) ++ AC_SUBST(GDK_PIXBUF_LIBS) ++ rm -f conf.gdk_pixbuftest ++]) ++ diff --git a/devel/bonobo/buildlink.mk b/devel/bonobo/buildlink.mk index a47d448e11d..77d59778c59 100644 --- a/devel/bonobo/buildlink.mk +++ b/devel/bonobo/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.6 2002/04/10 15:45:46 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.6.2.1 2002/06/23 18:43:53 jlam Exp $ # # This Makefile fragment is included by packages that use bonobo. # @@ -30,6 +30,7 @@ BUILDLINK_FILES.bonobo+= lib/libbonobo.* BUILDLINK_FILES.bonobo+= lib/libbonobox.* BUILDLINK_FILES.bonobo+= lib/libbonobo-print.* BUILDLINK_FILES.bonobo+= lib/libefs.* +BUILDLINK_FILES.bonobo+= share/idl/Bonobo*.idl CPPFLAGS+= -I${BUILDLINK_DIR}/include/gnome-1.0 diff --git a/devel/ccache/distinfo b/devel/ccache/distinfo index ab85e63eff4..26bc48edf66 100644 --- a/devel/ccache/distinfo +++ b/devel/ccache/distinfo @@ -1,4 +1,5 @@ -$NetBSD: distinfo,v 1.2 2002/05/07 05:22:50 tron Exp $ +$NetBSD: distinfo,v 1.2.2.1 2002/06/23 18:43:58 jlam Exp $ SHA1 (ccache-1.8.tar.gz) = 54a65bca01549aeeb1320db73f2f0803f3df6db5 Size (ccache-1.8.tar.gz) = 62148 bytes +SHA1 (patch-aa) = caafca94d1e2a9a86a8d66959d3a23083e2c0a40 diff --git a/devel/ccache/patches/patch-aa b/devel/ccache/patches/patch-aa new file mode 100644 index 00000000000..268806c5d5e --- /dev/null +++ b/devel/ccache/patches/patch-aa @@ -0,0 +1,17 @@ +$NetBSD: patch-aa,v 1.1.2.2 2002/06/23 18:43:58 jlam Exp $ + +--- util.c.orig Sat Apr 6 22:48:03 2002 ++++ util.c +@@ -83,8 +83,11 @@ + } + } + +- close(fd2); + close(fd1); ++ if (close(fd2) == -1) { ++ unlink(dest); ++ return -1; ++ } + return 0; + } + diff --git a/devel/cpuflags/Makefile b/devel/cpuflags/Makefile index 586f4fe5552..b2529832fa8 100644 --- a/devel/cpuflags/Makefile +++ b/devel/cpuflags/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.22 2002/04/11 11:14:31 abs Exp $ +# $NetBSD: Makefile,v 1.22.2.1 2002/06/23 18:43:59 jlam Exp $ # -DISTNAME= cpuflags-0.22 +DISTNAME= cpuflags-0.23 CATEGORIES= sysutils MASTER_SITES= # empty DISTFILES= # empty @@ -9,7 +9,7 @@ DISTFILES= # empty MAINTAINER= abs@netbsd.org COMMENT= Determine compiler flags to best target current cpu -ONLY_FOR_PLATFORM= NetBSD-*-* Linux-*-* +ONLY_FOR_PLATFORM= NetBSD-*-* Linux-*-* SunOS-*-* EXTRACT_ONLY= # empty WRKSRC= ${WRKDIR} diff --git a/devel/cpuflags/files/cpuflags.SunOS b/devel/cpuflags/files/cpuflags.SunOS new file mode 100755 index 00000000000..d2908e794af --- /dev/null +++ b/devel/cpuflags/files/cpuflags.SunOS @@ -0,0 +1,43 @@ +#!/bin/sh +# $NetBSD: cpuflags.SunOS,v 1.1.2.2 2002/06/23 18:44:00 jlam Exp $ + +arch=`/usr/bin/uname -m` + +case $arch in + sun4c | sun4 ) FLAGS='-mcpu=cypress' ;; + sun4m ) FLAGS='-mcpu=supersparc' ;; + sun4u ) FLAGS='-mcpu=v9' ;; +esac + +if [ -z "$FLAGS" -a -z "$NONE" ] ; then + echo 'Unknown machine - please send details to abs@netbsd.org' >&2 + echo " arch : '$arch'" >&2 +fi + +# Fixup flags for old gcc +if [ -n "$FLAGS" ]; then + gcc_ver=`gcc -v 2>&1 | awk '/gcc version/ {sub("egcs-","");print $3}'` + FLAGS=`awk -v "flags=$FLAGS" -v "gcc_ver=$gcc_ver" ' + {if (gcc_ver < $1){map[$2] = ""$3}} + END{if (flags in map) {print map[flags]}else {print flags}} + ' <<EOD +2.90 -mcpu=21164a +2.90 -march=i386 -mno-486 +2.90 -march=i486 -m486 +2.90 -march=pentium -m486 +2.90 -march=pentiumpro -m486 +2.90 -mcpu=supersparc -msupersparc +2.90 -mcpu=sparclite -msparclite +2.90 -mcpu=cypress -mcypress +2.90 -mcpu=v9 -mv8 +2.90 -mcpu=arm610 -m6 +2.90 -mcpu=strongarm110 -m6 +2.90 -mcpu=arm710 -m6 +2.95 -march=k6 -march=pentium +EOD +` +fi + +echo $FLAGS + +exit 0 diff --git a/devel/cscope/distinfo b/devel/cscope/distinfo index 668be6a7963..6c0f88cf2a6 100644 --- a/devel/cscope/distinfo +++ b/devel/cscope/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.4 2001/10/03 14:57:21 seb Exp $ +$NetBSD: distinfo,v 1.4.2.1 2002/06/23 18:44:00 jlam Exp $ SHA1 (cscope-15.3.tar.gz) = ece72d2ede173dec0536003c4f8ab0fe7b0b3f11 Size (cscope-15.3.tar.gz) = 196580 bytes -SHA1 (patch-aa) = 15313e836e264c4a124090c93685d33d8b293326 -SHA1 (patch-ab) = ff72389fbf0d87d1b7eda51297275fc8a213600f +SHA1 (patch-aa) = 0212dd5ee9777bb2987cc57dca3747299b065f4f +SHA1 (patch-ab) = 6390a64ebb7b03b9b29af1f71fac3137b5d7957c SHA1 (patch-ac) = 46fb2edc1ddec03c0ac50f87acde2b59f907e12b SHA1 (patch-ad) = 4864f8afa7b6090d60d5509d1544b913cb4fcd51 diff --git a/devel/cscope/patches/patch-aa b/devel/cscope/patches/patch-aa index f4a69769f6c..d0a874496f5 100644 --- a/devel/cscope/patches/patch-aa +++ b/devel/cscope/patches/patch-aa @@ -1,14 +1,8 @@ -$NetBSD: patch-aa,v 1.7 2001/10/03 14:57:21 seb Exp $ +$NetBSD: patch-aa,v 1.7.2.1 2002/06/23 18:44:01 jlam Exp $ --- configure.in.orig Mon Jul 2 17:48:55 2001 +++ configure.in -@@ -48,12 +48,12 @@ - ]) - - -+# configure's patch is hand-trimmed after regen from patched configure.in -+ - dnl === BEGIN aclocal REPLACEMENT MACROS +@@ -52,8 +52,6 @@ dnl # ACNU_PROG_LEX fm AC_PROG_LEX # ----------- @@ -17,7 +11,7 @@ $NetBSD: patch-aa,v 1.7 2001/10/03 14:57:21 seb Exp $ AC_DEFUN(ACNU_PROG_LEX,[ dnl autoconf-2.14a dnl AH_CHECK_LIB(fl)dnl -@@ -65,9 +65,7 @@ +@@ -65,9 +63,7 @@ flex*) ac_lib=fl ;; *) ac_lib=l ;; esac diff --git a/devel/cscope/patches/patch-ab b/devel/cscope/patches/patch-ab index fb94462b4fe..ae4f995fbfb 100644 --- a/devel/cscope/patches/patch-ab +++ b/devel/cscope/patches/patch-ab @@ -1,27 +1,19 @@ -$NetBSD: patch-ab,v 1.6 2001/10/03 14:57:21 seb Exp $ +$NetBSD: patch-ab,v 1.6.2.1 2002/06/23 18:44:01 jlam Exp $ ---- configure.orig Mon Jul 2 17:50:46 2001 +--- configure.orig Wed Jun 12 12:47:17 2002 +++ configure -@@ -829,6 +829,8 @@ - - - -+# configure's patch is hand-trimmed after regen from patched configure.in -+ - # ACNU_PROG_LEX fm AC_PROG_LEX - # ----------- - -@@ -1344,9 +1346,8 @@ +@@ -1344,9 +1344,8 @@ flex*) ac_lib=fl ;; *) ac_lib=l ;; esac - LDFLAGS='-L/usr/local/lib' echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 - echo "configure:1350: checking for yywrap in -l$ac_lib" >&5 +-echo "configure:1350: checking for yywrap in -l$ac_lib" >&5 ++echo "configure:1349: checking for yywrap in -l$ac_lib" >&5 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -1380,12 +1381,11 @@ +@@ -1380,12 +1379,11 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 diff --git a/devel/cxref/Makefile b/devel/cxref/Makefile index b2e6834fd55..785f8af5efe 100644 --- a/devel/cxref/Makefile +++ b/devel/cxref/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/02/16 14:38:22 wiz Exp $ +# $NetBSD: Makefile,v 1.2.2.1 2002/06/23 18:44:02 jlam Exp $ # DISTNAME= cxref-1.5a @@ -11,5 +11,6 @@ HOMEPAGE= http://www.gedanken.demon.co.uk/cxref/ COMMENT= C Cross Referencing & Documenting tool GNU_CONFIGURE= YES +CONFIGURE_ARGS+= --with-cxref-cpp .include "../../mk/bsd.pkg.mk" diff --git a/devel/dlcompat/DESCR b/devel/dlcompat/DESCR new file mode 100644 index 00000000000..33a1b7c70c1 --- /dev/null +++ b/devel/dlcompat/DESCR @@ -0,0 +1,7 @@ +Dynamic loading compatibility library + +dlcompat provides the dlopen() interface for dynamic loading of +modules for applications that need it. It is based on Apple code +that was only released via Darwin CVS. + +This version comes from the Fink project. diff --git a/devel/dlcompat/Makefile b/devel/dlcompat/Makefile new file mode 100644 index 00000000000..ee25ffd0919 --- /dev/null +++ b/devel/dlcompat/Makefile @@ -0,0 +1,14 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:44:03 jlam Exp $ +# + +DISTNAME= dlcompat-20020508 +CATEGORIES= devel +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fink/} + +MAINTAINER= schmonz@netbsd.org +HOMEPAGE= http://fink.sourceforge.net/ +COMMENT= Library for dlopen() emulation on Darwin + +ONLY_FOR_PLATFORM= Darwin-*-* + +.include "../../mk/bsd.pkg.mk" diff --git a/devel/dlcompat/PLIST b/devel/dlcompat/PLIST new file mode 100644 index 00000000000..32506a5be4e --- /dev/null +++ b/devel/dlcompat/PLIST @@ -0,0 +1,5 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.2.2 2002/06/23 18:44:03 jlam Exp $ +include/dlfcn.h +lib/libdl.0.dylib +lib/libdl.a +lib/libdl.dylib diff --git a/devel/dlcompat/buildlink.mk b/devel/dlcompat/buildlink.mk new file mode 100644 index 00000000000..75570a59dfe --- /dev/null +++ b/devel/dlcompat/buildlink.mk @@ -0,0 +1,32 @@ +# $NetBSD: buildlink.mk,v 1.1.1.1.2.2 2002/06/23 18:44:04 jlam Exp $ +# +# This Makefile fragment is included by packages that use dlcompat (libdl). +# +# To use this Makefile fragment, simply: +# +# (1) Include this Makefile fragment in the package Makefile, +# (2) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header +# search path, and +# (3) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search +# path. + +.if !defined(DLCOMPAT_BUILDLINK_MK) +DLCOMPAT_BUILDLINK_MK= # defined + +.include "../../mk/bsd.buildlink.mk" + +BUILDLINK_DEPENDS.dlcompat?= dlcompat>=20020508 +DEPENDS+= ${BUILDLINK_DEPENDS.dlcompat}:../../devel/dlcompat + +EVAL_PREFIX+= BUILDLINK_PREFIX.dlcompat=dlcompat +BUILDLINK_PREFIX.dlcompat_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.dlcompat= include/dlfcn.h +BUILDLINK_FILES.dlcompat+= lib/libdl.* + +BUILDLINK_TARGETS.dlcompat+= dlcompat-buildlink +BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.dlcompat} + +pre-configure: ${BUILDLINK_TARGETS.dlcompat} +dlcompat-buildlink: _BUILDLINK_USE + +.endif # DLCOMPAT_BUILDLINK_MK diff --git a/devel/dlcompat/distinfo b/devel/dlcompat/distinfo new file mode 100644 index 00000000000..0d029b01863 --- /dev/null +++ b/devel/dlcompat/distinfo @@ -0,0 +1,5 @@ + + +SHA1 (dlcompat-20020508.tar.gz) = 72a3eb537f24d4f4f7f046d7decc35a2d287ab75 +Size (dlcompat-20020508.tar.gz) = 10193 bytes +SHA1 (patch-aa) = 9c0fb45804941b847ca3093471f1a11eefd2b0e1 diff --git a/devel/dlcompat/patches/patch-aa b/devel/dlcompat/patches/patch-aa new file mode 100644 index 00000000000..710ade8db40 --- /dev/null +++ b/devel/dlcompat/patches/patch-aa @@ -0,0 +1,26 @@ +$NetBSD: patch-aa,v 1.2.2.2 2002/06/23 18:44:05 jlam Exp $ + +--- Makefile.orig Sun May 12 22:36:53 2002 ++++ Makefile +@@ -19,7 +19,7 @@ + # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +-prefix=/usr ++prefix=${PREFIX} + DEBUG=0 + + CC=cc +@@ -67,10 +67,10 @@ + $(RANLIB) libdl.a + + libdl.dylib: libdl.0.dylib +- ln -sf $+ $@ ++ ln -sf $> $@ + + libdl.0.dylib: $(OBJS) +- $(CC) -dynamiclib -o $@ $+ -install_name $(prefix)/lib/$@ ++ $(CC) -dynamiclib -o $@ $> -install_name $(prefix)/lib/$@ + + clean: + rm -f $(OBJS) libdl.* *~ *.o diff --git a/devel/dmalloc/Makefile b/devel/dmalloc/Makefile index e36427c8845..96d2e990e55 100644 --- a/devel/dmalloc/Makefile +++ b/devel/dmalloc/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2002/02/18 15:14:09 seb Exp $ +# $NetBSD: Makefile,v 1.2.2.1 2002/06/23 18:44:06 jlam Exp $ DISTNAME= dmalloc-4.8.2 +PKGREVISION= 2 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dmalloc/} EXTRACT_SUFX= .tgz @@ -10,6 +11,8 @@ HOMEPAGE= http://www.dmalloc.com/ COMMENT= Run-time configurable debugging malloc library GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --enable-shlib +CFLAGS+= -fPIC -DPIC INSTALL_TARGET= install installinfo diff --git a/devel/dmalloc/PLIST b/devel/dmalloc/PLIST index 6758d09bc2f..88a5c25ea2e 100644 --- a/devel/dmalloc/PLIST +++ b/devel/dmalloc/PLIST @@ -1,9 +1,11 @@ -@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:09 seb Exp $ +@comment $NetBSD: PLIST,v 1.2.2.1 2002/06/23 18:44:06 jlam Exp $ bin/dmalloc include/dmalloc.h @unexec ${INSTALL_INFO} --delete %D/info/dmalloc.info %D/info/dir info/dmalloc.info @exec ${INSTALL_INFO} %D/info/dmalloc.info %D/info/dir lib/libdmalloc.a +lib/libdmalloc.so lib/libdmalloclp.a lib/libdmallocxx.a +lib/libdmallocxx.so diff --git a/devel/doc++/Makefile b/devel/doc++/Makefile index 1f007f9fc71..b2da97dc8dc 100644 --- a/devel/doc++/Makefile +++ b/devel/doc++/Makefile @@ -1,14 +1,14 @@ -# $NetBSD: Makefile,v 1.2 2001/02/16 14:38:23 wiz Exp $ +# $NetBSD: Makefile,v 1.2.2.1 2002/06/23 18:44:07 jlam Exp $ -DISTNAME= doc++-3.3.13 +DISTNAME= doc++-3.4.9 CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_SUNSITE:=apps/doctools/} \ - http://zeus.imaginator.com/doc++/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=docpp/} MAINTAINER= jlam@netbsd.org -HOMEPAGE= http://www.imaginator.com/doc++/ +HOMEPAGE= http://docpp.sourceforge.net/ COMMENT= documentation system for C, C++ and Java +USE_GMAKE= yes GNU_CONFIGURE= yes post-install: diff --git a/devel/doc++/PLIST b/devel/doc++/PLIST index fc0a4c25392..3dcba9c3558 100644 --- a/devel/doc++/PLIST +++ b/devel/doc++/PLIST @@ -1,34 +1,42 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:23:15 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.1.2.1 2002/06/23 18:44:07 jlam Exp $ bin/doc++ bin/docify bin/promote share/doc/doc++/ClassGraph.class share/doc/doc++/ClassGraphPanel.class share/doc/doc++/ClassLayout.class +share/doc/doc++/CommandLineOptions.html share/doc/doc++/CommonBase.html +share/doc/doc++/ConfigurationFile.html share/doc/doc++/Derived_Class.html share/doc/doc++/Example.html share/doc/doc++/FileInclusion.html share/doc/doc++/FrequentlyAskedQuestions.html share/doc/doc++/General.html +share/doc/doc++/GeneralInformations.html share/doc/doc++/HIER.html share/doc/doc++/HIERjava.html share/doc/doc++/InstallationInstructions.html share/doc/doc++/Intermediate.html share/doc/doc++/Introduction.html share/doc/doc++/ManualEntries.html +share/doc/doc++/ManualEntryFields.html share/doc/doc++/NavigatorButton.class share/doc/doc++/Quickstart.html share/doc/doc++/ReferenceManual.html share/doc/doc++/Structure.html +share/doc/doc++/Tags.html share/doc/doc++/TextFormatting.html share/doc/doc++/Usage.html -share/doc/doc++/down.gif share/doc/doc++/function.html share/doc/doc++/icon1.gif share/doc/doc++/icon2.gif share/doc/doc++/index.html -share/doc/doc++/logo.gif share/doc/doc++/supportedHTMLmacros.html share/doc/doc++/supportedTeXmacros.html +share/doc/doc++/toc.html +${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/doc++.mo +${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/doc++.mo +${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/doc++.mo +${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/doc++.mo @dirrm share/doc/doc++ diff --git a/devel/doc++/distinfo b/devel/doc++/distinfo index f842318a831..5fea18ad17d 100644 --- a/devel/doc++/distinfo +++ b/devel/doc++/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2001/04/21 00:44:16 wiz Exp $ +$NetBSD: distinfo,v 1.2.2.1 2002/06/23 18:44:07 jlam Exp $ -SHA1 (doc++-3.3.13.tar.gz) = 2eab3f610debf2fb8c8bdb7f5ba41a0240d476a7 -Size (doc++-3.3.13.tar.gz) = 177656 bytes +SHA1 (doc++-3.4.9.tar.gz) = 962e34a801290cbebc23784bb7e69047b9d58e3e +Size (doc++-3.4.9.tar.gz) = 306331 bytes diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile index 4db401483c0..5d418b8d952 100644 --- a/devel/doxygen/Makefile +++ b/devel/doxygen/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2002/03/17 17:23:03 fredb Exp $ +# $NetBSD: Makefile,v 1.4.2.1 2002/06/23 18:44:07 jlam Exp $ DISTNAME= doxygen-1.2.10.src PKGNAME= doxygen-1.2.10 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= devel MASTER_SITES= ftp://ftp.stack.nl/pub/users/dimitri/ @@ -18,6 +18,7 @@ USE_PERL5= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= --make ${GMAKE} --prefix ${LOCALBASE} CONFIGURE_ARGS+= --docdir ${LOCALBASE}/share/doc +REPLACE_PERL= ${WRKSRC}/doc/translater.pl WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} diff --git a/devel/eel/Makefile b/devel/eel/Makefile index 2018a9db527..f4a6c3f9afe 100644 --- a/devel/eel/Makefile +++ b/devel/eel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2002/03/13 17:36:48 fredb Exp $ +# $NetBSD: Makefile,v 1.3.2.1 2002/06/23 18:44:08 jlam Exp $ # DISTNAME= eel-1.0.1 @@ -24,4 +24,6 @@ USE_GMAKE= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig CPPFLAGS+= -D_POSIX_THREAD_SYSCALL_SOFT=1 +.include "../../graphics/png/buildlink.mk" +.include "../../devel/oaf/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ftnchek/patches/patch-aa b/devel/ftnchek/patches/patch-aa index aff9a77c533..26c01334d7a 100644 --- a/devel/ftnchek/patches/patch-aa +++ b/devel/ftnchek/patches/patch-aa @@ -1,3 +1,4 @@ +$NetBSD: patch-aa,v 1.4.2.1 2002/06/23 18:44:08 jlam Exp $ --- configure.orig Tue Nov 13 02:32:40 2001 +++ configure Mon Apr 29 11:09:02 2002 @@ -2731,6 +2731,7 @@ diff --git a/devel/ftnchek/patches/patch-ab b/devel/ftnchek/patches/patch-ab index 2ea62950495..de7a614f07a 100644 --- a/devel/ftnchek/patches/patch-ab +++ b/devel/ftnchek/patches/patch-ab @@ -1,3 +1,4 @@ +$NetBSD: patch-ab,v 1.2.2.1 2002/06/23 18:44:09 jlam Exp $ --- Makefile.in.orig Sat Nov 3 00:49:25 2001 +++ Makefile.in Mon Apr 29 11:14:13 2002 @@ -436,30 +436,19 @@ diff --git a/devel/glib/Makefile b/devel/glib/Makefile index 3d4319fa0fc..e988730e069 100644 --- a/devel/glib/Makefile +++ b/devel/glib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44.2.2 2002/06/21 23:05:06 jlam Exp $ +# $NetBSD: Makefile,v 1.44.2.3 2002/06/23 18:44:09 jlam Exp $ # FreeBSD Id: Makefile,v 1.2 1998/08/06 14:55:12 vanilla Exp # @@ -11,7 +11,7 @@ MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v1.2/ \ ${MASTER_SITE_GNOME:=stable/sources/glib/} MAINTAINER= tron@netbsd.org -HOMEPAGE= http://www.gtk.org/docs/glib_toc.html +HOMEPAGE= http://developer.gnome.org/doc/API/glib/index.html COMMENT= Some useful routines for C programming CONFLICTS= gtk+-1.0.* diff --git a/devel/glib/buildlink.mk b/devel/glib/buildlink.mk index 769a76c347a..a18581d4f88 100644 --- a/devel/glib/buildlink.mk +++ b/devel/glib/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.15 2002/03/19 00:37:38 dmcmahill Exp $ +# $NetBSD: buildlink.mk,v 1.15.2.1 2002/06/23 18:44:10 jlam Exp $ # # This Makefile fragment is included by packages that use glib. # @@ -57,9 +57,9 @@ glib-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE glib-fix-glib-h: .if exists(/usr/include/sys/null.h) @cd ${BUILDLINK_DIR}/include/glib/glib-1.2; \ - if grep "^\#define.NULL" glib.h > /dev/null; then \ + if ${GREP} "^\#define.NULL" glib.h > /dev/null; then \ ${ECHO} WARNING\!; \ - ${ECHO} The installed glib package is broken, please rebuild it from source.;\ + ${ECHO} The installed glib package is broken, please update it to the latest version.;\ ${ECHO} For more information, see PR 14150.; \ ${SED} -e "s|^#define.NULL.*|#include <sys/null.h>|" \ glib.h > glib.h.fixed; \ diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile index be3cdb1b25c..f2503ca697a 100644 --- a/devel/glib2/Makefile +++ b/devel/glib2/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2002/03/30 19:58:09 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.2.2.1 2002/06/23 18:44:11 jlam Exp $ # DISTNAME= glib-2.0.1 PKGNAME= ${DISTNAME:S/glib/glib2/} +PKGREVISION= 1 CATEGORIES= devel MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v2.0/ \ ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.0/ \ diff --git a/devel/glib2/buildlink.mk b/devel/glib2/buildlink.mk index 23f8e901873..40f061b0f76 100644 --- a/devel/glib2/buildlink.mk +++ b/devel/glib2/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.2 2002/03/24 22:21:26 dmcmahill Exp $ +# $NetBSD: buildlink.mk,v 1.2.2.1 2002/06/23 18:44:11 jlam Exp $ # # This Makefile fragment is included by packages that use glib2. # @@ -17,7 +17,7 @@ GLIB2_BUILDLINK_MK= # defined .include "../../mk/bsd.buildlink.mk" -BUILDLINK_DEPENDS.glib2?= glib2>=2.0.0 +BUILDLINK_DEPENDS.glib2?= glib2>=2.0.1nb1 DEPENDS+= ${BUILDLINK_DEPENDS.glib2}:../../devel/glib2 EVAL_PREFIX+= BUILDLINK_PREFIX.glib2=glib2 diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo index fc90cb24aba..41a5d356456 100644 --- a/devel/glib2/distinfo +++ b/devel/glib2/distinfo @@ -1,6 +1,10 @@ -$NetBSD: distinfo,v 1.3 2002/03/30 19:58:10 dmcmahill Exp $ +$NetBSD: distinfo,v 1.3.2.1 2002/06/23 18:44:12 jlam Exp $ SHA1 (glib-2.0.1.tar.gz) = 9590afd43bb14ab85f44affde798f6a9bc6b7760 Size (glib-2.0.1.tar.gz) = 1843874 bytes +SHA1 (patch-aa) = 02f422fed74442042593ef232e6791ce7d2e8b6f +SHA1 (patch-ab) = d5789b61254a84dcf9320014310b9e1ae295b169 +SHA1 (patch-ac) = 550c433ecbc778be6749306dac2967e6a4513c14 +SHA1 (patch-ad) = f58919a3ef05183b3bb4e5b369b56ffe74df5379 SHA1 (patch-ae) = 595a79aea5bbe65a10e34084629900b1da7b4b7b SHA1 (patch-af) = 28dff19acbe3df8c1bcf2055b35eb5b20201f395 diff --git a/devel/glib2/patches/patch-aa b/devel/glib2/patches/patch-aa new file mode 100644 index 00000000000..9b60dc26e08 --- /dev/null +++ b/devel/glib2/patches/patch-aa @@ -0,0 +1,11 @@ +$NetBSD: patch-aa,v 1.3.2.2 2002/06/23 18:44:13 jlam Exp $ + +--- glib-2.0.pc.in.orig Wed Mar 6 01:37:24 2002 ++++ glib-2.0.pc.in +@@ -10,5 +10,5 @@ + Name: GLib + Description: C Utility Library + Version: @VERSION@ +-Libs: -L${libdir} -lglib-2.0 @INTLLIBS@ @ICONV_LIBS@ ++Libs: -Wl,-R${libdir} -L${libdir} -lglib-2.0 @INTLLIBS@ @ICONV_LIBS@ + Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include diff --git a/devel/glib2/patches/patch-ab b/devel/glib2/patches/patch-ab new file mode 100644 index 00000000000..7646e3d0462 --- /dev/null +++ b/devel/glib2/patches/patch-ab @@ -0,0 +1,11 @@ +$NetBSD: patch-ab,v 1.3.2.2 2002/06/23 18:44:13 jlam Exp $ + +--- gmodule-2.0.pc.in.orig Wed Mar 6 01:37:24 2002 ++++ gmodule-2.0.pc.in +@@ -9,5 +9,5 @@ + Description: Dynamic module loader for GLib + Requires: glib-2.0 + Version: @VERSION@ +-Libs: -L${libdir} @G_MODULE_LDFLAGS@ -lgmodule-2.0 @G_MODULE_LIBS@ ++Libs: -Wl,-R${libdir} -L${libdir} @G_MODULE_LDFLAGS@ -lgmodule-2.0 @G_MODULE_LIBS@ + Cflags: diff --git a/devel/glib2/patches/patch-ac b/devel/glib2/patches/patch-ac new file mode 100644 index 00000000000..748658ba6cd --- /dev/null +++ b/devel/glib2/patches/patch-ac @@ -0,0 +1,11 @@ +$NetBSD: patch-ac,v 1.3.2.2 2002/06/23 18:44:14 jlam Exp $ + +--- gobject-2.0.pc.in.orig Wed Mar 6 01:37:24 2002 ++++ gobject-2.0.pc.in +@@ -7,5 +7,5 @@ + Description: GLib Type, Object, Parameter and Signal Library + Requires: glib-2.0 + Version: @VERSION@ +-Libs: -L${libdir} -lgobject-2.0 ++Libs: -Wl,-R${libdir} -L${libdir} -lgobject-2.0 + Cflags: diff --git a/devel/glib2/patches/patch-ad b/devel/glib2/patches/patch-ad new file mode 100644 index 00000000000..59218022ead --- /dev/null +++ b/devel/glib2/patches/patch-ad @@ -0,0 +1,11 @@ +$NetBSD: patch-ad,v 1.3.2.2 2002/06/23 18:44:14 jlam Exp $ + +--- gthread-2.0.pc.in.orig Wed Mar 6 01:37:24 2002 ++++ gthread-2.0.pc.in +@@ -7,5 +7,5 @@ + Description: Thread support for GLib + Requires: glib-2.0 + Version: @VERSION@ +-Libs: -L${libdir} -lgthread-2.0 @G_THREAD_LIBS@ ++Libs: -Wl,-R${libdir} -L${libdir} -lgthread-2.0 @G_THREAD_LIBS@ + Cflags: @G_THREAD_CFLAGS@ diff --git a/devel/gmake/distinfo b/devel/gmake/distinfo index a645a8c339d..6d64ea7d0ec 100644 --- a/devel/gmake/distinfo +++ b/devel/gmake/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2001/04/21 00:44:20 wiz Exp $ +$NetBSD: distinfo,v 1.2.2.1 2002/06/23 18:44:15 jlam Exp $ SHA1 (make-3.79.1.tar.gz) = d3cdff9f91a9cda71af8b2df2a94f9b844fa9704 Size (make-3.79.1.tar.gz) = 1030393 bytes @@ -6,3 +6,4 @@ SHA1 (patch-aa) = 1ee1298fcd4dddcc632948aeda046d1df115319f SHA1 (patch-ab) = 40d3a68312743d5994d2cb137579d2f3be28320e SHA1 (patch-ac) = b5cb517d1ea11692203b3d1fbc6cec19e5c11660 SHA1 (patch-ad) = 1a873f5db090d29a104e3c021950ab20644cc3a1 +SHA1 (patch-ae) = 71a54be609287cee1b163e843ccac4748810e304 diff --git a/devel/gmake/patches/patch-ae b/devel/gmake/patches/patch-ae new file mode 100644 index 00000000000..ba2c4248236 --- /dev/null +++ b/devel/gmake/patches/patch-ae @@ -0,0 +1,21 @@ +$NetBSD: patch-ae,v 1.2.2.2 2002/06/23 18:44:16 jlam Exp $ + +--- config.sub.orig Fri Jun 23 09:30:45 2000 ++++ config.sub Wed Jun 5 19:09:07 2002 +@@ -213,7 +213,7 @@ + | alphaev6[78] \ + | we32k | ns16k | clipper | i370 | sh | sh[34] \ + | powerpc | powerpcle \ +- | 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \ ++ | 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mipseb | mips64el \ + | mips64orion | mips64orionel | mipstx39 | mipstx39el \ + | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \ + | mips64vr5000 | miprs64vr5000el | mcore \ +@@ -251,6 +251,7 @@ + | clipper-* | orion-* \ + | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \ + | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \ ++ | mipseb-* \ + | mips64el-* | mips64orion-* | mips64orionel-* \ + | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \ + | mipstx39-* | mipstx39el-* | mcore-* \ diff --git a/devel/gmp/distinfo b/devel/gmp/distinfo index fcc833e1fe8..6148ed031ca 100644 --- a/devel/gmp/distinfo +++ b/devel/gmp/distinfo @@ -1,4 +1,5 @@ -$NetBSD: distinfo,v 1.3 2002/04/10 12:37:53 hubertf Exp $ +$NetBSD: distinfo,v 1.3.2.1 2002/06/23 18:44:16 jlam Exp $ SHA1 (gmp-4.0.1.tar.gz) = 3ead9745123e1324c0f0ab9985d4cb28b6d74655 Size (gmp-4.0.1.tar.gz) = 1745294 bytes +SHA1 (patch-aa) = 01e298efa337dec5e92e9376f369128cf481fbf0 diff --git a/devel/gmp/patches/patch-aa b/devel/gmp/patches/patch-aa new file mode 100644 index 00000000000..b1e92346401 --- /dev/null +++ b/devel/gmp/patches/patch-aa @@ -0,0 +1,33 @@ +$NetBSD: patch-aa,v 1.7.2.2 2002/06/23 18:44:17 jlam Exp $ + +--- longlong.h.orig Thu Nov 15 14:48:14 2001 ++++ longlong.h +@@ -734,8 +734,8 @@ + #define add_ssaaaa(sh, sl, ah, al, bh, bl) \ + __asm__ ("add%.l %5,%1\n\taddx%.l %3,%0" \ + : "=d" ((USItype)(sh)), "=&d" ((USItype)(sl)) \ +- : "%0" ((USItype)(ah)), "d" ((USItype)(bh)), \ +- "%1" ((USItype)(al)), "g" ((USItype)(bl))) ++ : "0" ((USItype)(ah)), "d" ((USItype)(bh)), \ ++ "1" ((USItype)(al)), "g" ((USItype)(bl))) + #define sub_ddmmss(sh, sl, ah, al, bh, bl) \ + __asm__ ("sub%.l %5,%1\n\tsubx%.l %3,%0" \ + : "=d" ((USItype)(sh)), "=&d" ((USItype)(sl)) \ +@@ -750,7 +750,7 @@ + #define umul_ppmm(w1, w0, u, v) \ + __asm__ ("mulu%.l %3,%1:%0" \ + : "=d" ((USItype)(w0)), "=d" ((USItype)(w1)) \ +- : "%0" ((USItype)(u)), "dmi" ((USItype)(v))) ++ : "0" ((USItype)(u)), "dmi" ((USItype)(v))) + #define UMUL_TIME 45 + #define udiv_qrnnd(q, r, n1, n0, d) \ + __asm__ ("divu%.l %4,%1:%0" \ +@@ -788,7 +788,7 @@ + " | End inlined umul_ppmm" \ + : "=&d" ((USItype)(xh)), "=&d" ((USItype)(xl)), \ + "=d" (__umul_tmp1), "=&d" (__umul_tmp2) \ +- : "%2" ((USItype)(a)), "d" ((USItype)(b))); \ ++ : "2" ((USItype)(a)), "d" ((USItype)(b))); \ + } while (0) + #define UMUL_TIME 100 + #define UDIV_TIME 400 diff --git a/devel/gscope/DESCR b/devel/gscope/DESCR new file mode 100644 index 00000000000..cd544080d47 --- /dev/null +++ b/devel/gscope/DESCR @@ -0,0 +1,4 @@ +gscope is a software oscilloscope library build using the GTK and +GNOME toolkits. Gscope can be used to monitor, display and debug +various types of "real-time" data. Additionally, the scope can be +used for graphing file data that is in a tuple format. diff --git a/devel/gscope/Makefile b/devel/gscope/Makefile new file mode 100644 index 00000000000..eabdb4b5ae1 --- /dev/null +++ b/devel/gscope/Makefile @@ -0,0 +1,23 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:44:18 jlam Exp $ +# + +DISTNAME= gscope-0.4.1 +CATEGORIES= devel +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gscope/} + +MAINTAINER= packages@netbsd.org +HOMEPAGE= http://gscope.sourceforge.net/ +COMMENT= software oscilloscope library + +GNU_CONFIGURE= yes +USE_LIBTOOL= yes +LIBTOOL_OVERRIDE= ${WRKSRC}/libtool + +BUILD_DEPENDS+= gtk-doc-[0-9]*:../../textproc/gtk-doc + +.include "../../devel/popt/buildlink.mk" +.include "../../graphics/gdk-pixbuf/buildlink.mk" +.include "../../x11/gnome-libs/buildlink.mk" +.include "../../x11/gtk/buildlink.mk" +.include "../../mk/x11.buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/devel/gscope/PLIST b/devel/gscope/PLIST new file mode 100644 index 00000000000..6afaa55e485 --- /dev/null +++ b/devel/gscope/PLIST @@ -0,0 +1,53 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.4.2 2002/06/23 18:44:19 jlam Exp $ +bin/displaydata +bin/gscope_load +bin/gscope_load_app +bin/gscope_test +include/gscope/gscope.h +include/gscope/gscope_interface.h +include/gscope/gtkscope.h +include/gscope/gtkscopeapp.h +lib/libgscope-0.4.so +lib/libgscope-0.4.so.1 +lib/libgscope-0.4.so.1.0 +lib/libgscope.a +lib/libgscope.la +lib/libgscope.so +share/doc/${PKGNAME}/AUTHORS +share/doc/${PKGNAME}/COPYING +share/doc/${PKGNAME}/ChangeLog +share/doc/${PKGNAME}/NEWS +share/doc/${PKGNAME}/README +share/doc/${PKGNAME}/examples/displaydata.c +share/doc/${PKGNAME}/examples/gscope_load.c +share/doc/${PKGNAME}/examples/gscope_load_app.c +share/doc/${PKGNAME}/examples/gscope_test.c +share/gnome/help/gscope/C/api.html +share/gnome/help/gscope/C/applications.html +share/gnome/help/gscope/C/authors.html +share/gnome/help/gscope/C/bugs.html +share/gnome/help/gscope/C/figures/options.eps +share/gnome/help/gscope/C/figures/options.png +share/gnome/help/gscope/C/figures/scope.eps +share/gnome/help/gscope/C/figures/scope.png +share/gnome/help/gscope/C/index.html +share/gnome/help/gscope/C/library.html +share/gnome/help/gscope/C/license.html +share/gnome/help/gscope/C/ln7.html +share/gnome/help/gscope/C/reference/html/book1.html +share/gnome/help/gscope/C/reference/html/gscope-gscope-interface.html +share/gnome/help/gscope/C/reference/html/gscope.html +share/gnome/help/gscope/C/reference/html/gtkscope.html +share/gnome/help/gscope/C/reference/html/gtkscopeapp.html +share/gnome/help/gscope/C/reference/html/libgscope.html +share/gnome/help/gscope/C/topic.dat +share/gnome/help/gscope/C/usage.html +share/gnome/help/gscope/C/widgets.html +@dirrm share/gnome/help/gscope/C/reference/html +@dirrm share/gnome/help/gscope/C/reference +@dirrm share/gnome/help/gscope/C/figures +@dirrm share/gnome/help/gscope/C +@dirrm share/gnome/help/gscope +@dirrm share/doc/gscope-0.4.1/examples +@dirrm share/doc/gscope-0.4.1 +@dirrm include/gscope diff --git a/devel/gscope/distinfo b/devel/gscope/distinfo new file mode 100644 index 00000000000..fdef5e32fa9 --- /dev/null +++ b/devel/gscope/distinfo @@ -0,0 +1,6 @@ +$NetBSD: distinfo,v 1.1.1.1.12.2 2002/06/23 18:44:19 jlam Exp $ + +SHA1 (gscope-0.4.1.tar.gz) = 275260c5130c4546f6911a3135a885a77d4a5707 +Size (gscope-0.4.1.tar.gz) = 278494 bytes +SHA1 (patch-aa) = a2e04db458ab93751ca8f9aeed3024df4fe7379f +SHA1 (patch-ab) = 7b4a163422eefb30345ab9739481e74e7c4d73c2 diff --git a/devel/gscope/patches/patch-aa b/devel/gscope/patches/patch-aa new file mode 100644 index 00000000000..cdd014b624d --- /dev/null +++ b/devel/gscope/patches/patch-aa @@ -0,0 +1,12 @@ +$NetBSD: patch-aa,v 1.1.1.1.16.2 2002/06/23 18:44:20 jlam Exp $ + +--- gscope/Makefile.in 2002/06/15 00:11:00 1.1 ++++ gscope/Makefile.in 2002/06/15 00:11:55 +@@ -81,6 +81,7 @@ + LT_CURRENT = @LT_CURRENT@ + LT_RELEASE = @LT_RELEASE@ + LT_REVISION = @LT_REVISION@ ++LT_AGE = @GSCOPE_INTERFACE_AGE@ + MAKEINFO = @MAKEINFO@ + OBJDUMP = @OBJDUMP@ + PACKAGE = @PACKAGE@ diff --git a/devel/gscope/patches/patch-ab b/devel/gscope/patches/patch-ab new file mode 100644 index 00000000000..f978e0dc798 --- /dev/null +++ b/devel/gscope/patches/patch-ab @@ -0,0 +1,27 @@ +$NetBSD: patch-ab,v 1.1.1.1.16.2 2002/06/23 18:44:20 jlam Exp $ + +--- doc/C/Makefile.in 2002/06/15 00:37:22 1.1 ++++ doc/C/Makefile.in 2002/06/15 00:37:46 +@@ -337,19 +337,19 @@ + all: + + index.html: gscope.sgml +- -nsgmls -s $< && db2html -o . $< ++ -nsgmls -s $? && db2html -o . $? + -rmdir gscope + -rmdir gscope.junk + + dvi: gscope.dvi + + gscope.dvi: gscope.sgml +- -nsgmls -s $< && db2dvi $< ++ -nsgmls -s $? && db2dvi $? + + ps: gscope.ps + + gscope.ps: gscope.sgml +- -nsgmls -s $< && db2ps $< ++ -nsgmls -s $? && db2ps $? + + # The gscope.sgml to gscope.sgml.in dependency is generated by automake or + # autoconf. diff --git a/devel/gtexinfo/PLIST b/devel/gtexinfo/PLIST index 791e88339c4..8241bdff487 100644 --- a/devel/gtexinfo/PLIST +++ b/devel/gtexinfo/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.2 2002/04/04 11:10:22 seb Exp $ -@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/info-stnd.info -@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/info.info -@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/texinfo +@comment $NetBSD: PLIST,v 1.2.2.1 2002/06/23 18:44:21 jlam Exp $ bin/makeinfo +@unexec %D/bin/install-info --delete --info-dir=%D/info %D/info/info-stnd.info +@unexec %D/bin/install-info --delete --info-dir=%D/info %D/info/info.info +@unexec %D/bin/install-info --delete --info-dir=%D/info %D/info/texinfo bin/texi2dvi bin/texindex bin/install-info @@ -25,9 +25,9 @@ info/texinfo-6 info/texinfo-7 info/texinfo-8 info/texinfo-9 -@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/info-stnd.info -@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/info.info -@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/texinfo +@exec %D/bin/install-info --info-dir=%D/info %D/info/info-stnd.info +@exec %D/bin/install-info --info-dir=%D/info %D/info/info.info +@exec %D/bin/install-info --info-dir=%D/info %D/info/texinfo man/man1/info.1 man/man1/install-info.1 man/man1/makeinfo.1 diff --git a/devel/id-utils/Makefile b/devel/id-utils/Makefile index 344dd6f0dad..436798204de 100644 --- a/devel/id-utils/Makefile +++ b/devel/id-utils/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.24 2002/03/01 01:51:53 wiz Exp $ +# $NetBSD: Makefile,v 1.24.2.1 2002/06/23 18:44:21 jlam Exp $ # FreeBSD Id: Makefile,v 1.4 1996/11/18 10:22:47 asami Exp # DISTNAME= id-utils-3.2 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU:=id-utils/} diff --git a/devel/id-utils/distinfo b/devel/id-utils/distinfo index e1e289351c7..52599481fd3 100644 --- a/devel/id-utils/distinfo +++ b/devel/id-utils/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2002/04/03 16:26:54 joda Exp $ +$NetBSD: distinfo,v 1.9.2.1 2002/06/23 18:44:21 jlam Exp $ SHA1 (id-utils-3.2.tar.gz) = 14d96a2170745883d077fa8c436e4380f28951a5 Size (id-utils-3.2.tar.gz) = 388012 bytes @@ -12,7 +12,7 @@ SHA1 (patch-ag) = 9039dfd96f320f6da6dbeb1012fcd5c554500beb SHA1 (patch-ah) = 962276de4a6582e88e3eea8a6c2f8246c958bea0 SHA1 (patch-ai) = be9f59a6a2e84338d6df945ba5d10285d3205560 SHA1 (patch-aj) = 7f2b3f1eaadfc3a71169d16010375eaf0ce96b46 -SHA1 (patch-ak) = 4d7807168b4fa9e3d497c943f45892e6d574ef9d +SHA1 (patch-ak) = c9f017d6ba122ae1dabf10e97dea640e2b10ef76 SHA1 (patch-al) = 5ff628040e5f3c27263bded593deea57ad0847f5 SHA1 (patch-am) = 137ffa727d505975b775c0a877f1ac9af9cf58a7 SHA1 (patch-an) = 6e300f1c175085fe4190e31a0f3673714b51585b diff --git a/devel/id-utils/patches/patch-ak b/devel/id-utils/patches/patch-ak index 207d0df3289..148065ad258 100644 --- a/devel/id-utils/patches/patch-ak +++ b/devel/id-utils/patches/patch-ak @@ -1,7 +1,7 @@ -$NetBSD: patch-ak,v 1.1 2001/09/19 08:57:07 joda Exp $ +$NetBSD: patch-ak,v 1.1.2.1 2002/06/23 18:44:22 jlam Exp $ ---- src/mkid.c~ Tue Jul 9 06:19:09 1996 -+++ src/mkid.c Wed Sep 19 10:21:00 2001 +--- src/mkid.c.orig Tue Jul 9 14:19:09 1996 ++++ src/mkid.c @@ -33,7 +33,6 @@ #include "hash.h" #include "scanners.h" @@ -10,7 +10,29 @@ $NetBSD: patch-ak,v 1.1 2001/09/19 08:57:07 joda Exp $ #if HAVE_LIMITS_H # include <limits.h> #endif -@@ -363,7 +362,7 @@ +@@ -304,12 +303,18 @@ + { + if (errno == ENOENT) + { +- char const *dir_name = dirname (file_name); +- if (!dir_name || !*dir_name) +- dir_name = "."; ++ char *dir_name = strrchr (file_name, '/'); ++ if (dir_name) ++ { ++ while (*--dir_name == '/') ++ ; ++ dir_name++; ++ } ++ dir_name = dir_name ? strndup (file_name, dir_name - file_name) : strdup("."); + if (access (dir_name, 06) < 0) + error (1, errno, _("can't create `%s' in `%s'"), + basename (file_name), dir_name); ++ free (dir_name); + } + else + error (1, errno, _("can't modify `%s'"), file_name); +@@ -363,7 +368,7 @@ { if (fstat (fileno (source_FILE), &st) < 0) { @@ -19,7 +41,7 @@ $NetBSD: patch-ak,v 1.1 2001/09/19 08:57:07 joda Exp $ maybe_relative_file_name (file_name, flink, cw_dlink); error (0, errno, _("can't stat `%s'"), file_name); } -@@ -372,7 +371,7 @@ +@@ -372,7 +377,7 @@ } if (verbose_flag) { diff --git a/devel/its4/Makefile b/devel/its4/Makefile index 9006e9babf4..08c8a218d17 100644 --- a/devel/its4/Makefile +++ b/devel/its4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/02/16 14:38:32 wiz Exp $ +# $NetBSD: Makefile,v 1.4.2.1 2002/06/23 18:44:22 jlam Exp $ # DISTNAME= its4-1.1.1 @@ -13,14 +13,10 @@ COMMENT= static C/C++ code scanner for potential security problems LICENSE= no-commercial-use -USE_CONFIGURE= YES - +HAS_CONFIGURE= YES CONFIGURE_ARGS+= --prefix=${PREFIX} CONFIGURE_ARGS+= --datadir=${PREFIX}/share/its4 -do-configure: - cd ${WRKSRC} && ./configure ${CONFIGURE_ARGS} - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/its4 ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/docs/its4.1 ${PREFIX}/man/man1 diff --git a/devel/jakarta-ant/files/ant b/devel/jakarta-ant/files/ant index 79a64989394..6175a6d0cf4 100644 --- a/devel/jakarta-ant/files/ant +++ b/devel/jakarta-ant/files/ant @@ -14,7 +14,7 @@ if [ "$JAVA_HOME" != "" ] ; then JAVACMD=$JAVA_HOME/bin/java fi else - JAVA_HOME=@PREFIX@/java + JAVA_HOME=@JAVA_HOME@ if [ "$JAVACMD" = "" ] ; then JAVACMD=$JAVA_HOME/bin/java fi diff --git a/devel/jakarta-ant/patches/patch-aa b/devel/jakarta-ant/patches/patch-aa index 257ed6de3ce..67f7289c1ad 100644 --- a/devel/jakarta-ant/patches/patch-aa +++ b/devel/jakarta-ant/patches/patch-aa @@ -1,3 +1,4 @@ +$NetBSD: patch-aa,v 1.4.2.1 2002/06/23 18:44:24 jlam Exp $ --- build.xml.orig Thu Oct 11 09:58:31 2001 +++ build.xml Fri Apr 19 13:18:12 2002 @@ -247,7 +247,8 @@ diff --git a/devel/jam/Makefile b/devel/jam/Makefile index b130667d24a..fe5f5ed7ace 100644 --- a/devel/jam/Makefile +++ b/devel/jam/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/04/20 20:04:06 schmonz Exp $ +# $NetBSD: Makefile,v 1.1.1.1.2.1 2002/06/23 18:44:24 jlam Exp $ # -DISTNAME= jam-2.3 +DISTNAME= jam-2.4 CATEGORIES= devel MASTER_SITES= ftp://ftp.perforce.com/pub/jam/ EXTRACT_SUFX= .tar diff --git a/devel/jam/distinfo b/devel/jam/distinfo index 1ecabe52b71..97759bf7040 100644 --- a/devel/jam/distinfo +++ b/devel/jam/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/04/20 20:04:06 schmonz Exp $ +$NetBSD: distinfo,v 1.1.1.1.2.1 2002/06/23 18:44:25 jlam Exp $ -SHA1 (jam-2.3.tar) = 48cadad95883070a51d86e9aff2f2154e24bf746 -Size (jam-2.3.tar) = 542720 bytes +SHA1 (jam-2.4.tar) = b30d24130ce86cd5713be940fc95d313cc4ca51a +Size (jam-2.4.tar) = 583680 bytes SHA1 (patch-aa) = 593cfe30545bd5eeee674e8b1a7fbc596110d6b0 diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile index 39179dd5434..0f3950f696c 100644 --- a/devel/kdevelop/Makefile +++ b/devel/kdevelop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2002/03/13 17:36:50 fredb Exp $ +# $NetBSD: Makefile,v 1.31.2.1 2002/06/23 18:44:25 jlam Exp $ DISTNAME= kdevelop-2.0.2 PKGREVISION= 1 @@ -6,7 +6,7 @@ CATEGORIES= devel kde MASTER_SITES= # empty DISTFILES= # empty -MAINTAINER= tron@netbsd.org +MAINTAINER= skrll@netbsd.org HOMEPAGE= http://www.kdevelop.org/ COMMENT= Integrated Development Enviroment for Unix/X11/KDE diff --git a/devel/libbegemot/DESCR b/devel/libbegemot/DESCR new file mode 100644 index 00000000000..2da35b2eecd --- /dev/null +++ b/devel/libbegemot/DESCR @@ -0,0 +1,3 @@ +This package contains a library of functions which are found +useful in daily programming. They are used by most of the other +BEGEMOT packages. diff --git a/devel/libbegemot/Makefile b/devel/libbegemot/Makefile new file mode 100644 index 00000000000..ee9a6001f18 --- /dev/null +++ b/devel/libbegemot/Makefile @@ -0,0 +1,16 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:44:26 jlam Exp $ +# + +DISTNAME= libbegemot-1.9 +CATEGORIES= devel +MASTER_SITES= ftp://ftp.fokus.gmd.de/pub/cats/usr/harti/p11/ + +MAINTAINER= packages@netbsd.org +#HOMEPAGE= +COMMENT= base development library, contains useful routines + +GNU_CONFIGURE= yes +USE_LIBTOOL= yes +LIBTOOL_OVERRIDE= ${WRKSRC}/libtool + +.include "../../mk/bsd.pkg.mk" diff --git a/devel/libbegemot/PLIST b/devel/libbegemot/PLIST new file mode 100644 index 00000000000..f6f5457fa96 --- /dev/null +++ b/devel/libbegemot/PLIST @@ -0,0 +1,43 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.10.2 2002/06/23 18:44:27 jlam Exp $ +include/begemot.h +include/rpoll.h +lib/libbegemot.so.1.9 +lib/libbegemot.so.1 +lib/libbegemot.so +lib/libbegemot.a +man/man3/begemot-intro.3 +man/man3/begemot-panic.3 +man/man3/begemot-xalloc.3 +man/man3/begemot-xrealloc.3 +man/man3/begemot-prstat.3 +man/man3/begemot-strsave.3 +man/man3/begemot-xstrsave.3 +man/man3/begemot-warn.3 +man/man3/begemot-readline.3 +man/man3/begemot-error.3 +man/man3/begemot-geterrorcnt.3 +man/man3/begemot-getwarncnt.3 +man/man3/begemot-cstrc.3 +man/man3/begemot-cstrd.3 +man/man3/begemot-getfields.3 +man/man3/begemot-getmfields.3 +man/man3/begemot-setfields.3 +man/man3/begemot-strnlen.3 +man/man3/begemot-bug.3 +man/man3/begemot-inform.3 +man/man3/begemot-strtrimsp.3 +man/man3/begemot-set_errmode.3 +man/man3/begemot-rpoll.3 +man/man3/begemot-poll_register.3 +man/man3/begemot-poll_unregister.3 +man/man3/begemot-poll_start_timer.3 +man/man3/begemot-poll_stop_timer.3 +man/man3/begemot-poll_dispatch.3 +man/man3/begemot-frame.3 +man/man3/begemot-frame_read.3 +man/man3/begemot-frame_write.3 +man/man3/begemot-framefd_read.3 +man/man3/begemot-framefd_write.3 +man/man3/begemot-verb.3 +man/man3/begemot-xfree.3 +man/man3/begemot-strnchr.3 diff --git a/devel/libbegemot/distinfo b/devel/libbegemot/distinfo new file mode 100644 index 00000000000..f8f1ea7aa5a --- /dev/null +++ b/devel/libbegemot/distinfo @@ -0,0 +1,5 @@ +$NetBSD: distinfo,v 1.1.1.1.6.2 2002/06/23 18:44:27 jlam Exp $ + +SHA1 (libbegemot-1.9.tar.gz) = f43b9ca4b41e1d6048538c5e0eba7aadbe66ba55 +Size (libbegemot-1.9.tar.gz) = 116847 bytes +SHA1 (patch-aa) = 684a2949302b0fd12475a99dc4a73824ed57377d diff --git a/devel/libbegemot/patches/patch-aa b/devel/libbegemot/patches/patch-aa new file mode 100644 index 00000000000..ef7b6f763da --- /dev/null +++ b/devel/libbegemot/patches/patch-aa @@ -0,0 +1,22 @@ +$NetBSD: patch-aa,v 1.1.1.1.28.2 2002/06/23 18:44:28 jlam Exp $ + +--- Makefile.in 2002/05/16 15:32:51 1.1 ++++ Makefile.in 2002/05/16 15:33:21 +@@ -28,7 +28,7 @@ + + # manual section suffix. If you change this, you must also change the + # section prefixes in the man files also. +-MSECT = l ++MSECT = 3 + + # source files + SRC = panic.c xalloc.c xrealloc.c prstat.c strsave.c xstrsave.c warn.c \ +@@ -84,7 +84,7 @@ + $(INSTALL_DATA) $$file $(includedir) ;\ + done + for file in $(MSRC) ; do \ +- $(INSTALL_DATA) $(srcdir)/$$file.man $(mandir)/man$(MSECT)/$$file.$(MSECT) ;\ ++ $(INSTALL_DATA) $(srcdir)/$$file.man $(mandir)/man$(MSECT)/begemot-$$file.$(MSECT) ;\ + done + + clean: diff --git a/devel/libslang/Makefile b/devel/libslang/Makefile index 5cb27fae702..41505af86a5 100644 --- a/devel/libslang/Makefile +++ b/devel/libslang/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2002/03/25 12:30:09 grant Exp $ +# $NetBSD: Makefile,v 1.33.2.1 2002/06/23 18:44:28 jlam Exp $ # DISTNAME= slang-1.4.5 @@ -7,11 +7,9 @@ SVR4_PKGNAME= lslan CATEGORIES= devel MASTER_SITES= ftp://space.mit.edu/pub/davis/slang/v1.4/ \ http://gd.tuwien.ac.at/editors/davis/slang/v1.4/ \ - ftp://ftp.uni-stuttgart.de/pub/unix/misc/slang/v1.4/ \ - ftp://ftp.fu-berlin.de/pub/unix/news/slrn/v1.4/ \ - ftp://ftp.ntua.gr/pub/lang/slang/v1.4/ \ - ftp://ftp.plig.org/pub/slang/v1.4/ \ - ftp://ftp.gigabell.net/pub/lang/1.4/ + ftp://ftp.uni-stuttgart.de/pub/unix/misc/slang/slang/v1.4/ \ + ftp://ftp.ntua.gr/pub/lang/slang/slang/v1.4/ \ + ftp://ftp.plig.org/pub/slang/v1.4/ EXTRACT_SUFX= .tar.bz2 MAINTAINER= packages@netbsd.org diff --git a/devel/libtool-base/Makefile b/devel/libtool-base/Makefile index d5088360846..6d39a438bb2 100644 --- a/devel/libtool-base/Makefile +++ b/devel/libtool-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9.2.2 2002/06/21 23:05:08 jlam Exp $ +# $NetBSD: Makefile,v 1.9.2.3 2002/06/23 18:44:31 jlam Exp $ # .include "../libtool/Makefile.common" @@ -22,6 +22,10 @@ test: build DEPENDS+= c++rt0>=1.0:../../sysutils/c++rt0 .endif +.if ${MACHINE_PLATFORM:MDarwin-*-*} != "" +.include "../../devel/dlcompat/buildlink.mk" +.endif + .if ${OPSYS} == "NetBSD" .if !exists(/usr/libexec/ld.so) && !exists(/usr/libexec/ld.elf_so) CONFIGURE_ARGS= --disable-shared diff --git a/devel/libtool/Makefile b/devel/libtool/Makefile index dd98641fed9..4eb7845a765 100644 --- a/devel/libtool/Makefile +++ b/devel/libtool/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2002/04/15 18:25:45 kei Exp $ +# $NetBSD: Makefile,v 1.35.2.1 2002/06/23 18:44:29 jlam Exp $ # DISTFILES= # empty @@ -7,8 +7,8 @@ DISTFILES= # empty PKGNAME= ${PKGPFX} SVR4_PKGNAME= ltool -DEPENDS+= ${PKGNAME:C/-/-base-/}:../libtool-base -DEPENDS+= ${PKGNAME:C/-/-info-/}:../libtool-info +DEPENDS+= ${PKGPFX:S/-/-base-/}${PKGREVISION:C/[0-9]*/nb/}${PKGREVISION}:../libtool-base +DEPENDS+= ${PKGPFX:S/-/-info-/}${PKGREVISION:C/[0-9]*/nb/}${PKGREVISION}:../libtool-info COMMENT= Generic shared library support script diff --git a/devel/libtool/Makefile.common b/devel/libtool/Makefile.common index 6c86d90b22c..0636da78d64 100644 --- a/devel/libtool/Makefile.common +++ b/devel/libtool/Makefile.common @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.common,v 1.21 2002/04/15 18:25:45 kei Exp $ +# $NetBSD: Makefile.common,v 1.21.2.1 2002/06/23 18:44:29 jlam Exp $ # DISTNAME= libtool-ml-20010614 PKGPFX= ${DISTNAME:C/ml-/1.4./} -PKGREVISION= 8 +PKGREVISION= 9 WRKSRC= ${WRKDIR}/libtool-ml CATEGORIES= devel pkgtools MASTER_SITES= ${MASTER_SITE_LOCAL} diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo index 269d5ab2ff8..f835cb5e781 100644 --- a/devel/libtool/distinfo +++ b/devel/libtool/distinfo @@ -1,18 +1,18 @@ -$NetBSD: distinfo,v 1.15 2002/03/26 16:31:28 skrll Exp $ +$NetBSD: distinfo,v 1.15.2.1 2002/06/23 18:44:30 jlam Exp $ SHA1 (libtool-ml-20010614.tar.gz) = ff746666737e420592c3017d65bf4c47f1430dac Size (libtool-ml-20010614.tar.gz) = 784246 bytes -SHA1 (patch-ac-new) = 61196acaa12edee0b1209b2ba7c6414453bfa438 -SHA1 (patch-aa) = c085c1dd5a3f3f56bfa279076724fc13311d83bb +SHA1 (patch-aa) = 63005677ad929a7dc08fad93efe6b0905316411d SHA1 (patch-ab) = 1d23b17b2d1ce914e5665b3cbc0adc6590fca827 SHA1 (patch-ac) = 61196acaa12edee0b1209b2ba7c6414453bfa438 SHA1 (patch-ad) = 6aab76688d0f55648e35adc45a3492ba9c87acfb SHA1 (patch-ae) = 03de2a4fc9d828d62c6e6126ecf2dbbfeb1d82ea SHA1 (patch-af) = 2a0630e92b355ee86800c4f3a7993fbb126a0999 -SHA1 (patch-ag) = 93c0ed94970c69f1a4af9ccec31463f2e3adc670 +SHA1 (patch-ag) = 17fd063e27035841a63c94334d535cb7063149c6 SHA1 (patch-ah) = 7f0a0153f5e23aab4a3fcd6ae395b5b56d2b52a1 SHA1 (patch-ai) = bf5296409ccba34bccbc5ed289eeaa8350d7176e SHA1 (patch-aj) = 5382fc0a6a58687da5523c596118a4eeb948f675 SHA1 (patch-ak) = 7e7c6a515361863b683bbc8be24c8146501ca864 SHA1 (patch-al) = 22f1b7289d9ba477255e66364ae23af24a298dd0 +SHA1 (patch-am) = cedc92d0e229ced47ca5eb6ad4997fb1506d5ec9 SHA1 (patch-ao) = 4e115e9d6ddde556205dc786cde471bfee5a5e9e diff --git a/devel/libtool/patches/patch-aa b/devel/libtool/patches/patch-aa index 44dbd7d0ca3..0f843659926 100644 --- a/devel/libtool/patches/patch-aa +++ b/devel/libtool/patches/patch-aa @@ -1,7 +1,16 @@ -$NetBSD: patch-aa,v 1.26 2001/10/04 07:58:02 skrll Exp $ +$NetBSD: patch-aa,v 1.26.2.1 2002/06/23 18:44:30 jlam Exp $ --- ltconfig.in.orig Mon May 21 05:05:06 2001 +++ ltconfig.in +@@ -1104,7 +1104,7 @@ + version_type=darwin + need_lib_prefix=no + need_version=no +- library_names_spec='${libname}${release}${versuffix}.`test .$module = .yes && echo so || echo dylib` ${libname}${release}${major}.$`test .$module = .yes && echo so || echo dylib` ${libname}.`test .$module = .yes && echo so || echo dylib`' ++ library_names_spec='${libname}${release}${versuffix}.`test .$module = .yes && echo so || echo dylib` ${libname}${release}${major}.`test .$module = .yes && echo so || echo dylib` ${libname}.`test .$module = .yes && echo so || echo dylib`' + soname_spec='${libname}${release}${major}.`test .$module = .yes && echo so || echo dylib`' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH @@ -1198,7 +1198,7 @@ # This must be Linux ELF. diff --git a/devel/libtool/patches/patch-ag b/devel/libtool/patches/patch-ag index ebe284886a6..27a5d5c80db 100644 --- a/devel/libtool/patches/patch-ag +++ b/devel/libtool/patches/patch-ag @@ -1,10 +1,27 @@ -$NetBSD: patch-ag,v 1.5 2001/10/26 10:58:03 skrll Exp $ +$NetBSD: patch-ag,v 1.5.2.1 2002/06/23 18:44:31 jlam Exp $ --- ltcf-cxx.sh.orig Wed May 23 05:05:06 2001 +++ ltcf-cxx.sh -@@ -383,7 +383,23 @@ +@@ -382,8 +382,40 @@ + ;; esac ;; ++ darwin* | rhapsody*) ++ case "$host_os" in ++ rhapsody* | darwin1.[012]) ++ allow_undefined_flag='-undefined suppress' ++ ;; ++ *) # Darwin 1.3 on ++ allow_undefined_flag='-flat_namespace -undefined suppress' ++ ;; ++ esac ++ archive_cmds='$CC $(if test .$module = .yes; then echo -bundle; else echo -dynamiclib; fi) $allow_undefined_flag -o $lib $libobjs $deplibs $linkopts -install_name $rpath/$soname $verstring' ++ # We need to add '_' to the symbols in $export_symbols first ++ #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols $lib' ++ hardcode_direct=yes ++ hardcode_shlibpath_var=no ++ whole_archive_flag_spec='-all_load $convenience' ++ ;; netbsd*) - # NetBSD uses g++ - do we need to do anything? + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then @@ -27,7 +44,16 @@ $NetBSD: patch-ag,v 1.5 2001/10/26 10:58:03 skrll Exp $ ;; osf3*) if test "$with_gcc" = yes && test "$with_gnu_ld" = no; then -@@ -982,6 +998,14 @@ +@@ -690,7 +722,7 @@ + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files +- lt_cv_prog_cc_pic='-fno-common' ++ ac_cv_prog_cc_pic='-fno-common' + ;; + *djgpp*) + # DJGPP does not support shared libraries at all +@@ -982,6 +1014,14 @@ esac done diff --git a/devel/libtool/patches/patch-am b/devel/libtool/patches/patch-am new file mode 100644 index 00000000000..7222d814dc8 --- /dev/null +++ b/devel/libtool/patches/patch-am @@ -0,0 +1,54 @@ +$NetBSD: patch-am,v 1.3.2.2 2002/06/23 18:44:31 jlam Exp $ + +--- ltcf-c.sh.orig Wed Apr 25 00:05:02 2001 ++++ ltcf-c.sh +@@ -173,16 +173,6 @@ + $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags' + ;; + +- darwin* | rhapsody*) +- allow_undefined_flag='-undefined suppress' +- archive_cmds='$CC `test .$module = .yes && echo -bundle || echo -dynamiclib` $allow_undefined_flag -o $lib $libobjs $deplibs $linkopts -install_name $rpath/$soname `test -n "$verstring" -a x$verstring != x0.0 && echo $verstring`' +- # We need to add '_' to the symbols in $export_symbols first +- #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' +- hardcode_direct=yes +- hardcode_shlibpath_var=no +- whole_archive_flag_spec='-all_load $convenience' +- ;; +- + netbsd*) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' +@@ -379,6 +369,23 @@ + fix_srcfile_path='`cygpath -w "$srcfile"`' + ;; + ++ darwin* | rhapsody*) ++ case "$host_os" in ++ rhapsody* | darwin1.[012]) ++ allow_undefined_flag='-undefined suppress' ++ ;; ++ *) # Darwin 1.3 on ++ allow_undefined_flag='-flat_namespace -undefined suppress' ++ ;; ++ esac ++ archive_cmds='$CC $(if test .$module = .yes; then echo -bundle; else echo -dynamiclib; fi) $allow_undefined_flag -o $lib $libobjs $deplibs $linkopts -install_name $rpath/$soname $verstring' ++ # We need to add '_' to the symbols in $export_symbols first ++ #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols $lib' ++ hardcode_direct=yes ++ hardcode_shlibpath_var=no ++ whole_archive_flag_spec='-all_load $convenience' ++ ;; ++ + freebsd1*) + ld_shlibs=no + ;; +@@ -644,7 +651,7 @@ + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files +- lt_cv_prog_cc_pic='-fno-common' ++ ac_cv_prog_cc_pic='-fno-common' + ;; + *djgpp*) + # DJGPP does not support shared libraries at all diff --git a/devel/libusb/Makefile b/devel/libusb/Makefile index cf679d4ce1f..0ce1f8d5ec0 100644 --- a/devel/libusb/Makefile +++ b/devel/libusb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2002/03/03 15:26:58 veego Exp $ +# $NetBSD: Makefile,v 1.5.2.1 2002/06/23 18:44:32 jlam Exp $ # DISTNAME= libusb-0.1.5 @@ -13,6 +13,6 @@ COMMENT= USB access library USE_BUILDLINK_ONLY= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES -LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig +LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../mk/bsd.pkg.mk" diff --git a/devel/lwp/Makefile b/devel/lwp/Makefile index bb4ec53c98b..da690721afb 100644 --- a/devel/lwp/Makefile +++ b/devel/lwp/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.12 2001/10/17 02:44:41 phil Exp $ +# $NetBSD: Makefile,v 1.12.2.1 2002/06/23 18:44:33 jlam Exp $ # -DISTNAME= lwp-1.6 +DISTNAME= lwp-1.9 CATEGORIES= devel MASTER_SITES= ftp://ftp.coda.cs.cmu.edu/pub/lwp/src/ \ ftp://ftp.wu-wien.ac.at/pub/systems/coda/src/ @@ -18,6 +18,6 @@ ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-m68k NetBSD-*-sparc* \ GNU_CONFIGURE= YES USE_LIBTOOL= YES USE_BUILDLINK_ONLY= YES -LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig +LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../mk/bsd.pkg.mk" diff --git a/devel/lwp/PLIST b/devel/lwp/PLIST index e1571a821fb..1a9116a79b0 100644 --- a/devel/lwp/PLIST +++ b/devel/lwp/PLIST @@ -1,10 +1,10 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:24:50 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.1.2.1 2002/06/23 18:44:33 jlam Exp $ include/lwp/lock.h include/lwp/lwp.h include/lwp/timer.h -@dirrm include/lwp lib/liblwp.a lib/liblwp.la lib/liblwp.so lib/liblwp.so.2 lib/liblwp.so.2.0 +@dirrm include/lwp diff --git a/devel/lwp/distinfo b/devel/lwp/distinfo index 656b48a3160..e73431b96e4 100644 --- a/devel/lwp/distinfo +++ b/devel/lwp/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2001/04/27 19:00:36 phil Exp $ +$NetBSD: distinfo,v 1.3.2.1 2002/06/23 18:44:33 jlam Exp $ -SHA1 (lwp-1.6.tar.gz) = 0f2ac4edef5d79384218bea30849963753338f73 -Size (lwp-1.6.tar.gz) = 183453 bytes +SHA1 (lwp-1.9.tar.gz) = e5f40cf36ac705ef5d9b0600cb1bab5bf00d817b +Size (lwp-1.9.tar.gz) = 246491 bytes diff --git a/devel/mit-pthreads/Makefile b/devel/mit-pthreads/Makefile index 0c0e213c86e..0b4ae9cecaa 100644 --- a/devel/mit-pthreads/Makefile +++ b/devel/mit-pthreads/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2001/09/27 23:17:56 jlam Exp $ +# $NetBSD: Makefile,v 1.34.2.1 2002/06/23 18:44:34 jlam Exp $ # DISTNAME= pthreads-1_60_beta6 @@ -14,11 +14,11 @@ ONLY_FOR_PLATFORM= NetBSD-*-alpha NetBSD-*-arm32 NetBSD-*-i386 \ NetBSD-*-sparc NetBSD-*-m68k NetBSD-*-powerpc CONFLICTS+= unproven-pthreads-[0-9]* -HAS_CONFIGURE= yes +GNU_CONFIGURE= yes +GNU_CONFIGURE_PREFIX= ${PREFIX}/pthreads MAKE_ENV+= NOLINT=1 NOPROFILE=1 OBJECT_FMT=${OBJECT_FMT} -CONFIGURE_ARGS+= --prefix=${PREFIX}/pthreads -PATCH_FUZZ_FACTOR= +PATCH_FUZZ_FACTOR= # empty post-patch: @${RM} ${WRKSRC}/include/endian.h diff --git a/devel/nasm-devel/Makefile b/devel/nasm-devel/Makefile index 8fe525fdcfe..681de5c496b 100644 --- a/devel/nasm-devel/Makefile +++ b/devel/nasm-devel/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.3 2002/02/18 15:14:14 seb Exp $ +# $NetBSD: Makefile,v 1.3.2.1 2002/06/23 18:44:35 jlam Exp $ # DISTNAME= nasm-0.98.08 CATEGORIES= devel lang -MASTER_SITES= ftp://nasm.2y.net/nasm/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nasm/} MAINTAINER= packages@netbsd.org HOMEPAGE= http://nasm.2y.net/ diff --git a/devel/nbitools/DESCR b/devel/nbitools/DESCR new file mode 100644 index 00000000000..a3d7a190902 --- /dev/null +++ b/devel/nbitools/DESCR @@ -0,0 +1,4 @@ +The itools-R6.3 distribution contains imake, X11 configuration files, +makedepend, xmkmf, mkdirhier, imboot, msub, and imdent. + +nbitools-R6.3 is rearchived with NetBSD-current/xsrc. diff --git a/devel/nbitools/Makefile b/devel/nbitools/Makefile new file mode 100644 index 00000000000..15503ef605e --- /dev/null +++ b/devel/nbitools/Makefile @@ -0,0 +1,21 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:44:36 jlam Exp $ +# + +DISTNAME= nbitools-R6.3 +PKGNAME= nbitools-6.3 +CATEGORIES= devel +MASTER_SITES= ${MASTER_SITE_LOCAL} + +MAINTAINER= sakamoto@netbsd.org +HOMEPAGE= http://www.kitebird.com/imake-book/ +COMMENT= imake and tools derived from NetBSD-current/xsrc + +ALL_TARGET= World +MAKE_ENV+= GCCCMD=gcc + +post-patch: + @${MV} ${WRKSRC}/config/cf/site.def ${WRKSRC}/config/cf/site.def.orig + @${SED} -e 's|^\(\#define[ \t]*ProjectRoot\).*|\1 ${PREFIX}|' \ + ${WRKSRC}/config/cf/site.def.orig > ${WRKSRC}/config/cf/site.def + +.include "../../mk/bsd.pkg.mk" diff --git a/devel/nbitools/PLIST b/devel/nbitools/PLIST new file mode 100644 index 00000000000..eb4074e7a62 --- /dev/null +++ b/devel/nbitools/PLIST @@ -0,0 +1,118 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.18.2 2002/06/23 18:44:36 jlam Exp $ +include/itools/X11/Xfuncproto.h +include/itools/X11/Xos.h +include/itools/X11/Xosdefs.h +lib/itools/X11/config/Amoeba.cf +lib/itools/X11/config/DGUX.cf +lib/itools/X11/config/Darwin.cf +lib/itools/X11/config/FreeBSD.cf +lib/itools/X11/config/Imake.cf +lib/itools/X11/config/Imake.rules +lib/itools/X11/config/Imake.tmpl +lib/itools/X11/config/Library.tmpl +lib/itools/X11/config/Mips.cf +lib/itools/X11/config/Motif.rules +lib/itools/X11/config/Motif.tmpl +lib/itools/X11/config/NetBSD.cf +lib/itools/X11/config/Oki.cf +lib/itools/X11/config/OpenBSD.cf +lib/itools/X11/config/QNX.cf +lib/itools/X11/config/QNX.rules +lib/itools/X11/config/Server.tmpl +lib/itools/X11/config/ServerLib.tmpl +lib/itools/X11/config/Threads.tmpl +lib/itools/X11/config/Win32.cf +lib/itools/X11/config/Win32.rules +lib/itools/X11/config/WinLib.tmpl +lib/itools/X11/config/X11.rules +lib/itools/X11/config/X11.tmpl +lib/itools/X11/config/apollo.cf +lib/itools/X11/config/bsd.cf +lib/itools/X11/config/bsdLib.rules +lib/itools/X11/config/bsdLib.tmpl +lib/itools/X11/config/bsdi.cf +lib/itools/X11/config/cde.rules +lib/itools/X11/config/cde.tmpl +lib/itools/X11/config/convex.cf +lib/itools/X11/config/cray.cf +lib/itools/X11/config/fujitsu.cf +lib/itools/X11/config/generic.cf +lib/itools/X11/config/gnu.cf +lib/itools/X11/config/gnuLib.rules +lib/itools/X11/config/gnuLib.tmpl +lib/itools/X11/config/host.def +lib/itools/X11/config/hp.cf +lib/itools/X11/config/hpLib.rules +lib/itools/X11/config/hpLib.tmpl +lib/itools/X11/config/ibm.cf +lib/itools/X11/config/ibmLib.rules +lib/itools/X11/config/ibmLib.tmpl +lib/itools/X11/config/isc.cf +lib/itools/X11/config/linux-pmac.cf +lib/itools/X11/config/linux.cf +lib/itools/X11/config/lnxLib.rules +lib/itools/X11/config/lnxLib.tmpl +lib/itools/X11/config/lnxdoc.rules +lib/itools/X11/config/lnxdoc.tmpl +lib/itools/X11/config/luna.cf +lib/itools/X11/config/lynx.cf +lib/itools/X11/config/macII.cf +lib/itools/X11/config/mach.cf +lib/itools/X11/config/minix.cf +lib/itools/X11/config/moto.cf +lib/itools/X11/config/ncr.cf +lib/itools/X11/config/nec.cf +lib/itools/X11/config/necLib.rules +lib/itools/X11/config/necLib.tmpl +lib/itools/X11/config/noop.rules +lib/itools/X11/config/nto.cf +lib/itools/X11/config/nto.rules +lib/itools/X11/config/oldlib.rules +lib/itools/X11/config/os2.cf +lib/itools/X11/config/os2.rules +lib/itools/X11/config/os2Lib.rules +lib/itools/X11/config/os2Lib.tmpl +lib/itools/X11/config/osf1.cf +lib/itools/X11/config/osfLib.rules +lib/itools/X11/config/osfLib.tmpl +lib/itools/X11/config/pegasus.cf +lib/itools/X11/config/sco.cf +lib/itools/X11/config/sco5.cf +lib/itools/X11/config/scoLib.rules +lib/itools/X11/config/sequent.cf +lib/itools/X11/config/sgi.cf +lib/itools/X11/config/sgiLib.rules +lib/itools/X11/config/sgiLib.tmpl +lib/itools/X11/config/site.def +lib/itools/X11/config/sony.cf +lib/itools/X11/config/sun.cf +lib/itools/X11/config/sunLib.rules +lib/itools/X11/config/sunLib.tmpl +lib/itools/X11/config/sv3Lib.rules +lib/itools/X11/config/sv3Lib.tmpl +lib/itools/X11/config/sv4Lib.rules +lib/itools/X11/config/sv4Lib.tmpl +lib/itools/X11/config/svr3.cf +lib/itools/X11/config/svr4.cf +lib/itools/X11/config/ultrix.cf +lib/itools/X11/config/usl.cf +lib/itools/X11/config/x386.cf +lib/itools/X11/config/xf86.rules +lib/itools/X11/config/xf86.tmpl +lib/itools/X11/config/xf86site.def +lib/itools/X11/config/xfree86.cf +libexec/itools/gccmakedep +libexec/itools/imake +libexec/itools/imboot +libexec/itools/imdent +libexec/itools/lndir +libexec/itools/makedepend +libexec/itools/mkdirhier +libexec/itools/msub +libexec/itools/xmkmf +@dirrm include/itools/X11 +@dirrm include/itools +@dirrm lib/itools/X11/config +@dirrm lib/itools/X11 +@dirrm lib/itools +@dirrm libexec/itools diff --git a/devel/nbitools/distinfo b/devel/nbitools/distinfo new file mode 100644 index 00000000000..7cc63836923 --- /dev/null +++ b/devel/nbitools/distinfo @@ -0,0 +1,10 @@ +$NetBSD: distinfo,v 1.1.1.1.4.2 2002/06/23 18:44:37 jlam Exp $ + +SHA1 (nbitools-R6.3.tar.gz) = 0f6751417d7ef412be04611fbe4f56386a04322a +Size (nbitools-R6.3.tar.gz) = 435764 bytes +SHA1 (patch-aa) = df66d326f0a5375f829353084bf9935ac2d8e57c +SHA1 (patch-ab) = 4cc71d9e9a3c12106deff9d60118d363ae3ba981 +SHA1 (patch-ac) = bf74465560aa7850ed6f666566ec4a940aca3a67 +SHA1 (patch-ad) = b0c18505891834182c57819489b7d9890802d550 +SHA1 (patch-ae) = 0a0acf8798055a7b1b292e8d2edf998857641550 +SHA1 (patch-af) = b1efcdea967489a035048fc2e7389ac82b106535 diff --git a/devel/nbitools/nbitools.mk b/devel/nbitools/nbitools.mk new file mode 100644 index 00000000000..1b4d10ec981 --- /dev/null +++ b/devel/nbitools/nbitools.mk @@ -0,0 +1,9 @@ +# $NetBSD: nbitools.mk,v 1.1.1.1.4.2 2002/06/23 18:44:37 jlam Exp $ +.if !defined(NBITOOLS_MK) +NBITOOLS_MK= # defined + +BUILD_DEPENDS+= nbitools>=6.3:../../devel/nbitools +EVAL_PREFIX+= NBITOOLSDIR=nbitools +XMKMF_CMD= ${NBITOOLSDIR}/libexec/itools/xmkmf + +.endif # NBITOOLS_MK diff --git a/devel/nbitools/patches/patch-aa b/devel/nbitools/patches/patch-aa new file mode 100644 index 00000000000..6f390afebca --- /dev/null +++ b/devel/nbitools/patches/patch-aa @@ -0,0 +1,13 @@ +$NetBSD: patch-aa,v 1.1.1.1.50.2 2002/06/23 18:44:38 jlam Exp $ + +--- include/Imakefile.orig Thu May 29 22:59:31 1997 ++++ include/Imakefile +@@ -14,7 +14,7 @@ + + BuildIncludes($(HEADERS),X11,..) + +-InstallMultipleFlags($(HEADERS),$(INCDIR)/X11,$(INSTINCFLAGS)) ++InstallMultipleFlags($(HEADERS),$(INCDIR)/itools/X11,$(INSTINCFLAGS)) + + InstallLinkKitNonExecFile(X.h,$(LINKKITDIR)/include) + InstallLinkKitNonExecFile(Xmd.h,$(LINKKITDIR)/include) diff --git a/devel/nbitools/patches/patch-ab b/devel/nbitools/patches/patch-ab new file mode 100644 index 00000000000..c6b9508013e --- /dev/null +++ b/devel/nbitools/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1.1.1.50.2 2002/06/23 18:44:38 jlam Exp $ + +--- config/extras/extras.tmpl.orig Thu May 29 22:59:30 1997 ++++ config/extras/extras.tmpl +@@ -16,7 +16,7 @@ + * version of xmkmf. Comment it out if you want to use the sh version. + */ + +- PERLPATH = /usr/local/bin/perl ++ PERLPATH = /usr/bin/env perl + + /*#define UsePerlImboot YES*/ + /*#define UsePerlXmkmf YES*/ diff --git a/devel/nbitools/patches/patch-ac b/devel/nbitools/patches/patch-ac new file mode 100644 index 00000000000..9d0356327be --- /dev/null +++ b/devel/nbitools/patches/patch-ac @@ -0,0 +1,25 @@ +$NetBSD: patch-ac,v 1.1.1.1.6.2 2002/06/23 18:44:38 jlam Exp $ + +--- config/util/xmkmf.cpp.orig Thu May 29 22:59:30 1997 ++++ config/util/xmkmf.cpp +@@ -41,10 +41,10 @@ + args="-I$topdir/config/cf -DTOPDIR=$topdir -DCURDIR=$curdir" + fi + +-echo imake $args ++echo BINDIRSPEC/imake $args + case "$do_all" in + yes) +- imake $args && ++ BINDIRSPEC/imake $args && + echo "make Makefiles" && + make Makefiles && + echo "make includes" && +@@ -53,6 +53,6 @@ + make depend + ;; + *) +- imake $args ++ BINDIRSPEC/imake $args + ;; + esac diff --git a/devel/nbitools/patches/patch-ad b/devel/nbitools/patches/patch-ad new file mode 100644 index 00000000000..1983c7f5c29 --- /dev/null +++ b/devel/nbitools/patches/patch-ad @@ -0,0 +1,38 @@ +$NetBSD: patch-ad,v 1.1.1.1.24.2 2002/06/23 18:44:39 jlam Exp $ + +--- config/cf/Imake.tmpl.orig Wed Mar 7 22:08:22 2001 ++++ config/cf/Imake.tmpl +@@ -961,7 +961,7 @@ + #endif + #ifndef ImakeCmd + #ifdef UseInstalled /* assume BINDIR in path */ +-#define ImakeCmd imake ++#define ImakeCmd $(BINDIR)/imake + #else + #define ImakeCmd $(IMAKESRC)/imake + #endif +@@ -969,13 +969,13 @@ + #ifndef DependCmd + #if UseGccMakeDepend + #ifdef UseInstalled /* assume BINDIR in path */ +-#define DependCmd gccmakedep ++#define DependCmd $(BINDIR)/gccmakedep + #else + #define DependCmd $(DEPENDSRC)/gccmakedep + #endif + #else + #ifdef UseInstalled /* assume BINDIR in path */ +-#define DependCmd makedepend ++#define DependCmd $(BINDIR)/makedepend + #else + #define DependCmd $(DEPENDSRC)/makedepend + #endif +@@ -1002,7 +1002,7 @@ + #endif + #ifndef MkdirHierCmd + #ifdef UseInstalled /* assume BINDIR in path */ +-#define MkdirHierCmd mkdirhier ++#define MkdirHierCmd $(BINDIR)/mkdirhier + #else + #define MkdirHierCmd $(SHELL) $(CONFIGSRC)/util/mkdirhier.sh + #endif diff --git a/devel/nbitools/patches/patch-ae b/devel/nbitools/patches/patch-ae new file mode 100644 index 00000000000..3f3f03a2dd8 --- /dev/null +++ b/devel/nbitools/patches/patch-ae @@ -0,0 +1,22 @@ +$NetBSD: patch-ae,v 1.1.1.1.50.2 2002/06/23 18:44:39 jlam Exp $ + +--- config/cf/X11.tmpl.orig Thu Jan 21 21:50:39 1999 ++++ config/cf/X11.tmpl +@@ -628,7 +628,7 @@ + #endif + #ifndef BinDir + #ifdef ProjectRoot +-#define BinDir Concat(ProjectRoot,/bin) ++#define BinDir Concat(ProjectRoot,/libexec/itools) + #else + #define BinDir /usr/bin/X11 + #endif +@@ -678,7 +678,7 @@ + #define BuildLibTop ../.. /* relative to BuildLibDir */ + #endif + #ifndef LibDir +-#define LibDir $(USRLIBDIR)/X11 ++#define LibDir $(USRLIBDIR)/itools/X11 + #endif + #ifndef ConfigDir + #define ConfigDir $(LIBDIR)/config diff --git a/devel/nbitools/patches/patch-af b/devel/nbitools/patches/patch-af new file mode 100644 index 00000000000..c10a8d08928 --- /dev/null +++ b/devel/nbitools/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.1.1.1.6.2 2002/06/23 18:44:39 jlam Exp $ + +--- config/util/Imakefile.orig Thu May 29 22:59:30 1997 ++++ config/util/Imakefile +@@ -37,7 +37,7 @@ + PerlScriptTarget(xmkmf,xmkmf.pl,NullParameter) + #else + AllTarget(ProgramTargetName(xmkmf)) +-CppScriptTarget(ProgramTargetName(xmkmf),xmkmf.cpp,-DCONFIGDIRSPEC='"'"-I$(CONFIGDIR)"'"',$(ICONFIGFILES)) ++CppScriptTarget(ProgramTargetName(xmkmf),xmkmf.cpp,-DCONFIGDIRSPEC='"'"-I$(CONFIGDIR)"'"' -DBINDIRSPEC="$(BINDIR)",$(ICONFIGFILES)) + install:: install.ProgramTargetName(xmkmf) + InstallMultipleDestFlags(install.ProgramTargetName(xmkmf),ProgramTargetName(xmkmf),$(BINDIR),$(INSTBINFLAGS)) + #endif diff --git a/devel/oaf/Makefile b/devel/oaf/Makefile index 7d6420172d9..b8296ad0744 100644 --- a/devel/oaf/Makefile +++ b/devel/oaf/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.16 2002/04/09 17:39:49 jlam Exp $ +# $NetBSD: Makefile,v 1.16.2.1 2002/06/23 18:44:40 jlam Exp $ # -DISTNAME= oaf-0.6.7 -PKGREVISION= 1 +DISTNAME= oaf-0.6.10 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/oaf/} EXTRACT_SUFX= .tar.bz2 diff --git a/devel/oaf/PLIST b/devel/oaf/PLIST index 9fbd387df14..5a00018025a 100644 --- a/devel/oaf/PLIST +++ b/devel/oaf/PLIST @@ -1,16 +1,15 @@ -@comment $NetBSD: PLIST,v 1.2 2002/01/15 23:55:38 rh Exp $ -bin/oafd +@comment $NetBSD: PLIST,v 1.2.2.1 2002/06/23 18:44:40 jlam Exp $ bin/oaf-client -bin/oaf-run-query bin/oaf-config bin/oaf-empty-server +bin/oaf-run-query bin/oaf-slay bin/oaf-sysconf +bin/oafd etc/oaf/oaf-config.xml etc/oaf/oaf-config.xml.sample -include/liboaf/oaf.h -include/liboaf/liboaf.h include/liboaf/liboaf-version.h +include/liboaf/liboaf.h include/liboaf/oaf-actid.h include/liboaf/oaf-activate.h include/liboaf/oaf-async.h @@ -21,43 +20,48 @@ include/liboaf/oaf-plugin.h include/liboaf/oaf-registration.h include/liboaf/oaf-servreg.h include/liboaf/oaf-util.h +include/liboaf/oaf.h +lib/liboaf.a +lib/liboaf.la lib/liboaf.so lib/liboaf.so.0 lib/liboaf.so.0.0 -lib/liboaf.la lib/oafConf.sh man/man1/oafd.1 share/aclocal/oaf.m4 -share/idl/oaf.idl share/idl/oaf-factory.idl -share/locale/az/LC_MESSAGES/oaf.mo -share/locale/da/LC_MESSAGES/oaf.mo -share/locale/de/LC_MESSAGES/oaf.mo -share/locale/el/LC_MESSAGES/oaf.mo -share/locale/es/LC_MESSAGES/oaf.mo -share/locale/fi/LC_MESSAGES/oaf.mo -share/locale/fr/LC_MESSAGES/oaf.mo -share/locale/ga/LC_MESSAGES/oaf.mo -share/locale/gl/LC_MESSAGES/oaf.mo -share/locale/hu/LC_MESSAGES/oaf.mo -share/locale/it/LC_MESSAGES/oaf.mo -share/locale/ja/LC_MESSAGES/oaf.mo -share/locale/ko/LC_MESSAGES/oaf.mo -share/locale/nl/LC_MESSAGES/oaf.mo -share/locale/nn/LC_MESSAGES/oaf.mo -share/locale/no/LC_MESSAGES/oaf.mo -share/locale/pl/LC_MESSAGES/oaf.mo -share/locale/pt/LC_MESSAGES/oaf.mo -share/locale/pt_BR/LC_MESSAGES/oaf.mo -share/locale/ro/LC_MESSAGES/oaf.mo -share/locale/ru/LC_MESSAGES/oaf.mo -share/locale/sk/LC_MESSAGES/oaf.mo -share/locale/sl/LC_MESSAGES/oaf.mo -share/locale/sv/LC_MESSAGES/oaf.mo -share/locale/ta/LC_MESSAGES/oaf.mo -share/locale/tr/LC_MESSAGES/oaf.mo -share/locale/uk/LC_MESSAGES/oaf.mo -share/locale/zh_TW/LC_MESSAGES/oaf.mo +share/idl/oaf.idl +${PKGLOCALEDIR}/locale/az/LC_MESSAGES/oaf.mo +${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/oaf.mo +${PKGLOCALEDIR}/locale/da/LC_MESSAGES/oaf.mo +${PKGLOCALEDIR}/locale/de/LC_MESSAGES/oaf.mo +${PKGLOCALEDIR}/locale/el/LC_MESSAGES/oaf.mo +${PKGLOCALEDIR}/locale/es/LC_MESSAGES/oaf.mo +${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/oaf.mo +${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/oaf.mo +${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/oaf.mo +${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/oaf.mo +${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/oaf.mo +${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/oaf.mo +${PKGLOCALEDIR}/locale/it/LC_MESSAGES/oaf.mo +${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/oaf.mo +${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/oaf.mo +${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/oaf.mo +${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/oaf.mo +${PKGLOCALEDIR}/locale/no/LC_MESSAGES/oaf.mo +${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/oaf.mo +${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/oaf.mo +${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/oaf.mo +${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/oaf.mo +${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/oaf.mo +${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/oaf.mo +${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/oaf.mo +${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/oaf.mo +${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/oaf.mo +${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/oaf.mo +${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/oaf.mo +${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/oaf.mo +${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/oaf.mo share/oaf/OAF_naming-service.oaf share/oaf/empty.oafinfo @dirrm etc/oaf diff --git a/devel/oaf/distinfo b/devel/oaf/distinfo index d38d4a26e2c..d868dbb9f30 100644 --- a/devel/oaf/distinfo +++ b/devel/oaf/distinfo @@ -1,8 +1,6 @@ -$NetBSD: distinfo,v 1.4 2002/01/15 23:55:38 rh Exp $ +$NetBSD: distinfo,v 1.4.2.1 2002/06/23 18:44:41 jlam Exp $ -SHA1 (oaf-0.6.7.tar.bz2) = 079bc5675b28182ae8ea41957c81ae669170950d -Size (oaf-0.6.7.tar.bz2) = 423449 bytes -SHA1 (patch-aa) = 4fd412cae8eff2a1a8bfe01402773ca233f36d6d -SHA1 (patch-ac) = aab19adb68c1969f7714e6ee0fe918e1905bd60d -SHA1 (patch-ad) = ef16360bc1f0549ee75969eb6742d884220fb04d -SHA1 (patch-ag) = b121bc495f623529080c88a95b707b2b4796e5f9 +SHA1 (oaf-0.6.10.tar.bz2) = d8eaff6b3bc953fc4158f55b03ba92cb197518c5 +Size (oaf-0.6.10.tar.bz2) = 435621 bytes +SHA1 (patch-ac) = 28fd433c41209b9f3355e5f039f4f9d30b940a55 +SHA1 (patch-ag) = 57f54e650bacad8ef82c0165ba395ec225e372dc diff --git a/devel/oaf/patches/patch-aa b/devel/oaf/patches/patch-aa deleted file mode 100644 index d8ae3d9b6e5..00000000000 --- a/devel/oaf/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.5 2002/01/16 03:11:56 rh Exp $ - ---- oafd/qsort_ex.c.orig Tue Sep 4 14:07:43 2001 -+++ oafd/qsort_ex.c -@@ -26,7 +26,7 @@ - #include <string.h> - #include "qsort_ex.h" - --#if HAVE_ALLOCA -+#ifdef HAVE_ALLOCA_H - #include <alloca.h> - #endif - diff --git a/devel/oaf/patches/patch-ac b/devel/oaf/patches/patch-ac index 763e2646c4b..0e1be09acd0 100644 --- a/devel/oaf/patches/patch-ac +++ b/devel/oaf/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.3 2000/08/31 05:39:56 rh Exp $ +$NetBSD: patch-ac,v 1.3.2.1 2002/06/23 18:44:41 jlam Exp $ ---- liboaf/Makefile.in.orig Tue Aug 29 17:07:06 2000 -+++ liboaf/Makefile.in -@@ -242,7 +242,7 @@ +--- liboaf/Makefile.in.orig Sat May 18 12:22:48 2002 ++++ liboaf/Makefile.in Sat May 18 12:23:02 2002 +@@ -270,7 +270,7 @@ maintainer-clean-libtool: liboaf.la: $(liboaf_la_OBJECTS) $(liboaf_la_DEPENDENCIES) diff --git a/devel/oaf/patches/patch-ad b/devel/oaf/patches/patch-ad deleted file mode 100644 index c4838e254ce..00000000000 --- a/devel/oaf/patches/patch-ad +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ad,v 1.5 2001/10/01 11:01:03 rh Exp $ - ---- oafd/main.c.orig Tue Jul 24 00:50:25 2001 -+++ oafd/main.c -@@ -37,6 +37,7 @@ - #include <sys/types.h> - #include <sys/stat.h> - #include <fcntl.h> -+#include <locale.h> - #include <popt.h> - #include <signal.h> - #include <stdlib.h> diff --git a/devel/oaf/patches/patch-ag b/devel/oaf/patches/patch-ag index f676c699cac..45335b7c8fe 100644 --- a/devel/oaf/patches/patch-ag +++ b/devel/oaf/patches/patch-ag @@ -1,17 +1,17 @@ -$NetBSD: patch-ag,v 1.5 2001/10/01 11:01:04 rh Exp $ +$NetBSD: patch-ag,v 1.5.2.1 2002/06/23 18:44:42 jlam Exp $ ---- configure.orig Tue Aug 21 07:45:23 2001 -+++ configure -@@ -7215,7 +7215,7 @@ - cat conftest.$ac_ext >&5 - rm -rf conftest* - CATOBJEXT=.mo +--- configure.orig Sat May 18 12:24:35 2002 ++++ configure Sat May 18 12:25:54 2002 +@@ -9196,7 +9196,7 @@ + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + CATOBJEXT=.mo - DATADIRNAME=lib + DATADIRNAME=share fi - rm -f conftest* + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext INSTOBJEXT=.mo -@@ -8825,7 +8825,6 @@ +@@ -11009,7 +11009,6 @@ -Wall \ -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \ -Wnested-externs -Wpointer-arith \ diff --git a/devel/p5-Attribute-Handlers/DESCR b/devel/p5-Attribute-Handlers/DESCR index a31e09fdefb..665174ae303 100644 --- a/devel/p5-Attribute-Handlers/DESCR +++ b/devel/p5-Attribute-Handlers/DESCR @@ -1,7 +1,7 @@ -This module, when inherited by a package, allows that package's class -to define attribute handler subroutines for specific attributes. -Variables and subroutines subsequently defined in that package, -or in packages derived from that package may be given attributes -with the same names as the attribute handler subroutines, which will +This module, when inherited by a package, allows that package's +class to define attribute handler subroutines for specific attributes. +Variables and subroutines subsequently defined in that package, or +in packages derived from that package may be given attributes with +the same names as the attribute handler subroutines, which will then be called in one of the compilation phases (i.e. in a BEGIN, CHECK, INIT, or END block). diff --git a/devel/p5-Attribute-Handlers/Makefile b/devel/p5-Attribute-Handlers/Makefile index e3d13da5070..df865c2727b 100644 --- a/devel/p5-Attribute-Handlers/Makefile +++ b/devel/p5-Attribute-Handlers/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/01/18 21:55:47 mjl Exp $ +# $NetBSD: Makefile,v 1.1.1.1.2.1 2002/06/23 18:44:44 jlam Exp $ -DISTNAME= Attribute-Handlers-0.76 +DISTNAME= Attribute-Handlers-0.77 PKGNAME= p5-${DISTNAME} SVR4_PKGNAME= p5ah CATEGORIES= devel perl5 -MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=../../authors/id/DCONWAY/} +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Attribute/} MAINTAINER= packages@netbsd.org # HOMEPAGE= diff --git a/devel/p5-Attribute-Handlers/distinfo b/devel/p5-Attribute-Handlers/distinfo index b194102576b..47a331b3420 100644 --- a/devel/p5-Attribute-Handlers/distinfo +++ b/devel/p5-Attribute-Handlers/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/01/18 21:55:47 mjl Exp $ +$NetBSD: distinfo,v 1.1.1.1.2.1 2002/06/23 18:44:44 jlam Exp $ -SHA1 (Attribute-Handlers-0.76.tar.gz) = 510bb285b7d15c0b1c713bedc5dc8b7dbd6c14a9 -Size (Attribute-Handlers-0.76.tar.gz) = 12858 bytes +SHA1 (Attribute-Handlers-0.77.tar.gz) = 81ef689288e26a9002ef17fb6ee3c80ddb05aae7 +Size (Attribute-Handlers-0.77.tar.gz) = 14288 bytes diff --git a/devel/p5-Storable/DESCR b/devel/p5-Storable/DESCR index cba0c8e2032..3b781e8f41e 100644 --- a/devel/p5-Storable/DESCR +++ b/devel/p5-Storable/DESCR @@ -1,17 +1,18 @@ The Storable extension brings persistency to your data. -You may recursively store to disk any data structure, no matter how -complex and circular it is, provided it contains only SCALAR, ARRAY, -HASH (possibly tied) and references (possibly blessed) to those items. +You may recursively store to disk any data structure, no matter +how complex and circular it is, provided it contains only SCALAR, +ARRAY, HASH (possibly tied) and references (possibly blessed) to +those items. At a later stage, or in another program, you may retrieve data from -the stored file and recreate the same hiearchy in memory. If you had -blessed references, the retrieved references are blessed into the same -package, so you must make sure you have access to the same perl class -as the one used to create the relevant objects. +the stored file and recreate the same hiearchy in memory. If you +had blessed references, the retrieved references are blessed into +the same package, so you must make sure you have access to the same +perl class as the one used to create the relevant objects. -There is also a dclone() routine which performs an optimized mirroring -of any data structure, preserving its topology. +There is also a dclone() routine which performs an optimized +mirroring of any data structure, preserving its topology. Objects (blessed references) may also redefine the way storage and retrieval is performed, and/or what deep cloning should do on those diff --git a/devel/p5-Storable/Makefile b/devel/p5-Storable/Makefile index 5a08716de51..fd7ea5717d8 100644 --- a/devel/p5-Storable/Makefile +++ b/devel/p5-Storable/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.7 2001/12/04 01:30:59 mjl Exp $ +# $NetBSD: Makefile,v 1.7.2.1 2002/06/23 18:44:45 jlam Exp $ -DISTNAME= Storable-1.0.14 +DISTNAME= Storable-2.04 PKGNAME= p5-${DISTNAME} SVR4_PKGNAME= p5sto CATEGORIES= devel perl5 @@ -10,7 +10,7 @@ MAINTAINER= packages@netbsd.org COMMENT= Perl extension module for persistent data storage USE_BUILDLINK_ONLY= YES -PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Storable/.packlist +PERL5_PACKLIST= ${PERL5_ARCHLIB}/auto/Storable/.packlist do-configure: @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL diff --git a/devel/p5-Storable/distinfo b/devel/p5-Storable/distinfo index 8cc12fa1ff9..93f48692cb5 100644 --- a/devel/p5-Storable/distinfo +++ b/devel/p5-Storable/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2001/12/04 01:31:00 mjl Exp $ +$NetBSD: distinfo,v 1.4.2.1 2002/06/23 18:44:45 jlam Exp $ -SHA1 (Storable-1.0.14.tar.gz) = e0bac665b4ff6ef3ab43bdaae5a1a8e2abd9ba8c -Size (Storable-1.0.14.tar.gz) = 64493 bytes +SHA1 (Storable-2.04.tar.gz) = 7cf845afed5ca783b582a52e4488b2691b27caf5 +Size (Storable-2.04.tar.gz) = 91034 bytes diff --git a/devel/p5-Term-ReadLine/Makefile b/devel/p5-Term-ReadLine/Makefile index 72e9afcb96c..fa03872b581 100644 --- a/devel/p5-Term-ReadLine/Makefile +++ b/devel/p5-Term-ReadLine/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2002/02/07 23:07:28 jlam Exp $ +# $NetBSD: Makefile,v 1.2.2.1 2002/06/23 18:44:46 jlam Exp $ -DISTNAME= Term-ReadLine-Gnu-1.11 -PKGNAME= p5-Term-ReadLine-1.11 +DISTNAME= Term-ReadLine-Gnu-1.12 +PKGNAME= p5-Term-ReadLine-1.12 SVR4_PKGNAME= p5trl CATEGORIES= devel perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Term/} diff --git a/devel/p5-Term-ReadLine/distinfo b/devel/p5-Term-ReadLine/distinfo index 084c055ca98..c5a298f2e29 100644 --- a/devel/p5-Term-ReadLine/distinfo +++ b/devel/p5-Term-ReadLine/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.4 2002/05/07 14:39:14 jdolecek Exp $ +$NetBSD: distinfo,v 1.4.2.1 2002/06/23 18:44:46 jlam Exp $ -SHA1 (Term-ReadLine-Gnu-1.11.tar.gz) = 170daba884c9d629271c1571ec9f11479e9b1d52 -Size (Term-ReadLine-Gnu-1.11.tar.gz) = 65081 bytes -SHA1 (patch-aa) = 30bfc69b7f33acfa41198ffe8a52d9c7682bf428 +SHA1 (Term-ReadLine-Gnu-1.12.tar.gz) = d0121c6d4a0831466f1ee81e099a5ba957c04a7a +Size (Term-ReadLine-Gnu-1.12.tar.gz) = 63886 bytes +SHA1 (patch-aa) = 20d31c4553675d461722185e720b1d21b6fc2c9c diff --git a/devel/p5-Term-ReadLine/patches/patch-aa b/devel/p5-Term-ReadLine/patches/patch-aa index b0b9cab7263..c1b130eb3dc 100644 --- a/devel/p5-Term-ReadLine/patches/patch-aa +++ b/devel/p5-Term-ReadLine/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.4 2002/05/07 14:39:14 jdolecek Exp $ +$NetBSD: patch-aa,v 1.4.2.1 2002/06/23 18:44:47 jlam Exp $ --- Makefile.PL.orig Mon Feb 4 10:37:19 2002 +++ Makefile.PL Mon Feb 4 10:37:37 2002 -@@ -81,7 +81,7 @@ +@@ -79,7 +79,7 @@ close(F); # compile it --$comp_cmd = "$Config{cc} $RLINC $Config{ccflags} $defs $frlver -o rlver $RLLIB $Config{ldflags} $libs"; -+$comp_cmd = "$Config{cc} $RLINC $Config{ccflags} $defs $frlver -o rlver $RLLIB $Config{ldflags} $ENV{LDFLAGS} $libs"; +-$comp_cmd = "$Config{cc} $RLINC $Config{ccflags} $defs $frlver -o rlver $RLLIB $ldflags $Config{ldflags} $libs"; ++$comp_cmd = "$Config{cc} $RLINC $Config{ccflags} $defs $frlver -o rlver $RLLIB $ldflags $Config{ldflags} $ENV{LDFLAGS} $libs"; print $comp_cmd, "\n"; system($comp_cmd); if ($?) { diff --git a/devel/p5-Test-Harness/Makefile b/devel/p5-Test-Harness/Makefile index 7608ea0b6e0..ec16ba32f1c 100644 --- a/devel/p5-Test-Harness/Makefile +++ b/devel/p5-Test-Harness/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.7 2002/04/27 08:04:15 shell Exp $ +# $NetBSD: Makefile,v 1.7.2.1 2002/06/23 18:44:47 jlam Exp $ -DISTNAME= Test-Harness-2.03 +DISTNAME= Test-Harness-2.24 PKGNAME= p5-${DISTNAME} SVR4_PKGNAME= p5tha CATEGORIES= devel perl5 diff --git a/devel/p5-Test-Harness/distinfo b/devel/p5-Test-Harness/distinfo index 6f45a6f99f6..41a83c96537 100644 --- a/devel/p5-Test-Harness/distinfo +++ b/devel/p5-Test-Harness/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.6 2002/04/27 08:04:15 shell Exp $ +$NetBSD: distinfo,v 1.6.2.1 2002/06/23 18:44:48 jlam Exp $ -SHA1 (Test-Harness-2.03.tar.gz) = 17b088d8db583105f241e66a66e71313e7176ea4 -Size (Test-Harness-2.03.tar.gz) = 47330 bytes +SHA1 (Test-Harness-2.24.tar.gz) = 5b7b3a43d791f4f95b3cb9f010dd44ba234c4216 +Size (Test-Harness-2.24.tar.gz) = 48112 bytes SHA1 (patch-aa) = 6d1b83acfafcbd419e391021b6c0f5a58a2d4beb diff --git a/devel/pango/Makefile b/devel/pango/Makefile index f3916005bf8..5b0a952e34f 100644 --- a/devel/pango/Makefile +++ b/devel/pango/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2002/03/30 19:59:33 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.2.2.1 2002/06/23 18:44:48 jlam Exp $ # DISTNAME= pango-1.0.1 +PKGREVISION= 1 CATEGORIES= devel MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v2.0/ \ ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.0/ \ diff --git a/devel/pango/buildlink.mk b/devel/pango/buildlink.mk index 890f689cf48..fa0189527b9 100644 --- a/devel/pango/buildlink.mk +++ b/devel/pango/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.1.1.1 2002/03/24 20:29:35 dmcmahill Exp $ +# $NetBSD: buildlink.mk,v 1.1.1.1.2.1 2002/06/23 18:44:48 jlam Exp $ # # This Makefile fragment is included by packages that use pango. # @@ -17,7 +17,7 @@ PANGO_BUILDLINK_MK= # defined .include "../../mk/bsd.buildlink.mk" -BUILDLINK_DEPENDS.pango?= pango>=1.0.0 +BUILDLINK_DEPENDS.pango?= pango>=1.0.1nb1 DEPENDS+= ${BUILDLINK_DEPENDS.pango}:../../devel/pango EVAL_PREFIX+= BUILDLINK_PREFIX.pango=pango diff --git a/devel/pango/distinfo b/devel/pango/distinfo index c64aceedb95..0ab70c6f424 100644 --- a/devel/pango/distinfo +++ b/devel/pango/distinfo @@ -1,4 +1,7 @@ -$NetBSD: distinfo,v 1.3 2002/03/30 19:59:33 dmcmahill Exp $ +$NetBSD: distinfo,v 1.3.2.1 2002/06/23 18:44:48 jlam Exp $ SHA1 (pango-1.0.1.tar.gz) = c7dfe48f146ba046e999c15f94f372539f98849b Size (pango-1.0.1.tar.gz) = 1172891 bytes +SHA1 (patch-aa) = 74ee4b95170ccb1085d9786c986cbbc305ce6347 +SHA1 (patch-ab) = 8d0cf48a021b1f39eac87894c9b025fb1dcc39ae +SHA1 (patch-ac) = dc3d6393bdf434dd2e7fc219b7539b16d64e56cf diff --git a/devel/pango/patches/patch-aa b/devel/pango/patches/patch-aa new file mode 100644 index 00000000000..5443bfd4e0f --- /dev/null +++ b/devel/pango/patches/patch-aa @@ -0,0 +1,12 @@ +$NetBSD: patch-aa,v 1.3.2.2 2002/06/23 18:44:49 jlam Exp $ + +--- pango.pc.in.orig Thu Mar 7 03:04:39 2002 ++++ pango.pc.in +@@ -9,6 +9,6 @@ + Description: Internationalized text handling + Version: @VERSION@ + Requires: @FRIBIDI_PC@glib-2.0,gobject-2.0,gmodule-2.0 +-Libs: -L${libdir} -lpango-@PANGO_API_VERSION@ ++Libs: -Wl,-R${libdir} -L${libdir} -lpango-@PANGO_API_VERSION@ + Cflags: -I${includedir}/pango-1.0 + diff --git a/devel/pango/patches/patch-ab b/devel/pango/patches/patch-ab new file mode 100644 index 00000000000..bdbb9e9f25f --- /dev/null +++ b/devel/pango/patches/patch-ab @@ -0,0 +1,12 @@ +$NetBSD: patch-ab,v 1.3.2.2 2002/06/23 18:44:49 jlam Exp $ + +--- pangoft2.pc.in.orig Wed Mar 6 03:20:57 2002 ++++ pangoft2.pc.in +@@ -7,6 +7,6 @@ + Description: Freetype 2.0 font support for Pango + Version: @VERSION@ + Requires: pango +-Libs: -L${libdir} -lpangoft2-@PANGO_API_VERSION@ @PKGCONFIG_FREETYPE_LIBS@ ++Libs: -Wl,-R${libdir} -L${libdir} -lpangoft2-@PANGO_API_VERSION@ @PKGCONFIG_FREETYPE_LIBS@ + Cflags: -I${includedir}/pango-1.0 @FREETYPE_CFLAGS@ + diff --git a/devel/pango/patches/patch-ac b/devel/pango/patches/patch-ac new file mode 100644 index 00000000000..24e614c4997 --- /dev/null +++ b/devel/pango/patches/patch-ac @@ -0,0 +1,12 @@ +$NetBSD: patch-ac,v 1.3.2.2 2002/06/23 18:44:50 jlam Exp $ + +--- pangox.pc.in.orig Wed Mar 6 03:20:57 2002 ++++ pangox.pc.in +@@ -7,6 +7,6 @@ + Description: X Window System font support for Pango + Version: @VERSION@ + Requires: pango +-Libs: -L${libdir} -lpangox-@PANGO_API_VERSION@ @PKGCONFIG_X_LIBS@ ++Libs: -Wl,-R${libdir} -L${libdir} -lpangox-@PANGO_API_VERSION@ @PKGCONFIG_X_LIBS@ + Cflags: -I${includedir}/pango-1.0 @X_CFLAGS@ + diff --git a/devel/pcl-cvs/DESCR b/devel/pcl-cvs/DESCR new file mode 100644 index 00000000000..d3d2ed0dcff --- /dev/null +++ b/devel/pcl-cvs/DESCR @@ -0,0 +1,7 @@ +PCL-CVS is a front-end to CVS. It integrates the most +frequently used CVS commands into emacs. + +For VC users, PCL-CVS can be thought of as a VC-dired specially designed +for CVS. PCL-CVS is not a replacement for VC and is supposed to interact well +with it. It provides a global view of your project and allows execution +of cvs commands on several files at a time. diff --git a/devel/pcl-cvs/MESSAGE b/devel/pcl-cvs/MESSAGE new file mode 100644 index 00000000000..0a9ee2bfa15 --- /dev/null +++ b/devel/pcl-cvs/MESSAGE @@ -0,0 +1,7 @@ +$NetBSD: MESSAGE,v 1.1.1.1.2.2 2002/06/23 18:44:51 jlam Exp $ + +To automatically load pcl-cvs when starting emacs, add the following +(or similar) to your .emacs.el file. + +(add-to-list 'load-path "${PREFIX}/${LISPDIR}") +(load "pcl-cvs-startup") diff --git a/devel/pcl-cvs/Makefile b/devel/pcl-cvs/Makefile new file mode 100644 index 00000000000..69f6d6d2428 --- /dev/null +++ b/devel/pcl-cvs/Makefile @@ -0,0 +1,30 @@ +# $NetBSD: Makefile,v 1.2.2.2 2002/06/23 18:44:51 jlam Exp $ +# + +DISTNAME= pcl-cvs-2.9.9 +CATEGORIES= devel +MASTER_SITES= ftp://rum.cs.yale.edu/pub/monnier/pcl-cvs/ + +MAINTAINER= packages@netbsd.org +#HOMEPAGE= +COMMENT= front-end to CVS for emacs + +DEPENDS+= emacs-20.*:../../editors/emacs +DEPENDS+= elib>=1.0:../../devel/elib + +CONFLICTS= emacs-21.* +CONFLICTS+= emacs21 + +.include "../../mk/bsd.prefs.mk" + +LISPDIR= share/emacs/site-lisp/pcl-cvs + +MAKE_ENV+= PREFIX=${PREFIX} +ALL_TARGET= default +INFO_FILES= pcl-cvs.info + +PLIST_SUBST+= LISPDIR=${LISPDIR} +MESSAGE_SUBST+= LISPDIR=${LISPDIR} + +.include "../../mk/texinfo.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/devel/pcl-cvs/PLIST b/devel/pcl-cvs/PLIST new file mode 100644 index 00000000000..107778ae793 --- /dev/null +++ b/devel/pcl-cvs/PLIST @@ -0,0 +1,26 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.2.2 2002/06/23 18:44:52 jlam Exp $ +${LISPDIR}/cvs-compat.el +${LISPDIR}/cvs-compat.elc +${LISPDIR}/cvs-edit.el +${LISPDIR}/cvs-edit.elc +${LISPDIR}/cvs-log.el +${LISPDIR}/cvs-log.elc +${LISPDIR}/cvs-status.el +${LISPDIR}/cvs-status.elc +${LISPDIR}/pcl-cvs-defs.el +${LISPDIR}/pcl-cvs-defs.elc +${LISPDIR}/pcl-cvs-info.el +${LISPDIR}/pcl-cvs-info.elc +${LISPDIR}/pcl-cvs-parse.el +${LISPDIR}/pcl-cvs-parse.elc +${LISPDIR}/pcl-cvs-startup.el +${LISPDIR}/pcl-cvs-util.el +${LISPDIR}/pcl-cvs-util.elc +${LISPDIR}/pcl-cvs.el +${LISPDIR}/pcl-cvs.elc +@unexec install-info --delete --info-dir=%D/info %D/info/pcl-cvs.info +info/pcl-cvs.info +info/pcl-cvs.info-1 +info/pcl-cvs.info-2 +@exec install-info --info-dir=%D/info %D/info/pcl-cvs.info +@dirrm ${LISPDIR} diff --git a/devel/pcl-cvs/distinfo b/devel/pcl-cvs/distinfo new file mode 100644 index 00000000000..e1a8e369168 --- /dev/null +++ b/devel/pcl-cvs/distinfo @@ -0,0 +1,5 @@ +$NetBSD: distinfo,v 1.1.1.1.2.2 2002/06/23 18:44:52 jlam Exp $ + +SHA1 (pcl-cvs-2.9.9.tar.gz) = 7fb527a2a5b9c8ff8256682a11928497fc6cdf96 +Size (pcl-cvs-2.9.9.tar.gz) = 140016 bytes +SHA1 (patch-aa) = c1f347b61c0065dfd6bb2f13f0fb5407af956fcf diff --git a/devel/pcl-cvs/patches/patch-aa b/devel/pcl-cvs/patches/patch-aa new file mode 100644 index 00000000000..369fe5e844d --- /dev/null +++ b/devel/pcl-cvs/patches/patch-aa @@ -0,0 +1,32 @@ +$NetBSD: patch-aa,v 1.1.1.1.2.2 2002/06/23 18:44:52 jlam Exp $ + +--- Makefile.orig Sun Mar 5 21:32:20 2000 ++++ Makefile +@@ -22,7 +22,7 @@ + include makefile.pkg + + # set up the usual installation paths +-prefix = /usr/local ++prefix = ${PREFIX} + datadir = $(prefix)/share + + # the directory where you install third-party emacs packges +@@ -102,8 +102,7 @@ + install_info: $(PACKAGE).info + $(MKDIR) $(infodir) + $(CP) *.info* $(infodir)/ +- -[ ! -w $(infodir)/dir ] \ +- || install-info --info-dir=$(infodir) $(PACKAGE).info ++ -[ -w $(infodir)/dir ] && install-info --info-dir=$(infodir) $(PACKAGE).info + + install_startup: + $(MKDIR) $(lispdir) +@@ -130,7 +129,7 @@ + $(MKDIR) $(docdir) + $(CP) *.dvi $(docdir)/ + +-install: install_elc install_info install_startup # install_el ++install: install_elc install_el install_info # install_startup + + clean: + $(RM) *~ core .\#* $(TEXEXTS) diff --git a/devel/prcs/Makefile b/devel/prcs/Makefile index c7deb55d07e..8c9358bc8df 100644 --- a/devel/prcs/Makefile +++ b/devel/prcs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2002/02/18 15:14:15 seb Exp $ +# $NetBSD: Makefile,v 1.20.2.1 2002/06/23 18:44:53 jlam Exp $ # FreeBSD Id: Makefile,v 1.9 1997/10/13 05:11:40 jmacd Exp # @@ -8,12 +8,13 @@ CATEGORIES= devel MASTER_SITES= ftp://ftp.xcf.berkeley.edu/pub/prcs/ MAINTAINER= packages@netbsd.org -HOMEPAGE= http://www.XCF.Berkeley.EDU/~jmacd/prcs.html +HOMEPAGE= http://prcs.sourceforge.net COMMENT= Project Revision Control System -ONLY_FOR_PLATFORM= NetBSD-*-alpha NetBSD-*-arm32 NetBSD-*-i386 \ - NetBSD-*-mips* NetBSD-*-pc532 NetBSD-*-powerpc \ - NetBSD-*-sparc NetBSD-*-vax SunOS-*-* +ONLY_FOR_PLATFORM= NetBSD-*-alpha NetBSD-*-arm32 NetBSD-*-i386 \ + NetBSD-*-mips* NetBSD-*-pc532 NetBSD-*-powerpc \ + NetBSD-*-sparc NetBSD-*-vax NetBSD-*-arm \ + SunOS-*-* GNU_CONFIGURE= yes CONFIGURE_ENV+= lispdir=${PREFIX}/share/examples/prcs diff --git a/devel/pth-syscall/DESCR b/devel/pth-syscall/DESCR new file mode 100644 index 00000000000..04597abf1f5 --- /dev/null +++ b/devel/pth-syscall/DESCR @@ -0,0 +1,9 @@ +PTH is a very portable POSIX/ANSI-C based library for Unix platforms which +provides non-preemptive scheduling for multiple threads of execution +("multithreading") inside server applications. All threads run in the same +address space of the server application, but each thread has its own +individual program-counter, run-time stack, signal mask and errno variable. + +This version makes use of the --enable-syscall-hard option that provides +replacement syscalls in libpthread. The function gives the appearance of +some preemptiveness as it provides new syscall entry points. diff --git a/devel/pth-syscall/Makefile b/devel/pth-syscall/Makefile new file mode 100644 index 00000000000..29d9fd73f85 --- /dev/null +++ b/devel/pth-syscall/Makefile @@ -0,0 +1,40 @@ +# $NetBSD: Makefile,v 1.2.2.2 2002/06/23 18:44:56 jlam Exp $ +# + +DISTNAME= pth-1.4.1 +PKGNAME= ${DISTNAME:C/pth/pth-syscall/} +CATEGORIES= devel +MASTER_SITES= ${MASTER_SITE_GNU:=pth/} + +MAINTAINER= packages@netbsd.org +HOMEPAGE= http://www.gnu.org/software/pth/pth.html +COMMENT= GNU Portable Thread library + +CONFLICTS= pth-current-[0-9]* pth-[0-9]* + +USE_BUILDLINK_ONLY= YES +USE_LIBTOOL= YES +LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig +GNU_CONFIGURE= YES +CONFIGURE_ARGS+= --enable-pthread +CONFIGURE_ARGS+= --enable-syscall-hard +.if (${MACHINE_ARCH} == "i386" && ${CFLAGS:M-O2} == "-O2") +CFLAGS:= ${CFLAGS:S/-O2/-O0/} +.endif + +# for PLIST +PTH_MAJOR= 14 +PTH_MINOR= 21 +PLIST_SUBST+= PTH_MAJOR=${PTH_MAJOR} PTH_MINOR=${PTH_MINOR} + +test: build + @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} test | \ + tee ${WRKSRC}/test.log + +post-install: + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pth/ + cd ${WRKSRC} && ${INSTALL_DATA} ANNOUNCE AUTHORS COPYING HACKING \ + NEWS README SUPPORT TESTS THANKS USERS pthread.ps rse-pmt.ps \ + ${PREFIX}/share/doc/pth/ + +.include "../../mk/bsd.pkg.mk" diff --git a/devel/pth-syscall/PLIST b/devel/pth-syscall/PLIST new file mode 100644 index 00000000000..2fe90a0fca9 --- /dev/null +++ b/devel/pth-syscall/PLIST @@ -0,0 +1,33 @@ +@comment $NetBSD: PLIST,v 1.1.2.2 2002/06/23 18:44:56 jlam Exp $ +bin/pth-config +bin/pthread-config +include/pth.h +include/pthread.h +lib/libpth.a +lib/libpth.la +lib/libpth.so +lib/libpth.so.${PTH_MAJOR} +lib/libpth.so.${PTH_MAJOR}.${PTH_MINOR} +lib/libpthread.a +lib/libpthread.la +lib/libpthread.so +lib/libpthread.so.${PTH_MAJOR} +lib/libpthread.so.${PTH_MAJOR}.${PTH_MINOR} +man/man1/pth-config.1 +man/man1/pthread-config.1 +man/man3/pth.3 +man/man3/pthread.3 +share/aclocal/pth.m4 +share/doc/pth/ANNOUNCE +share/doc/pth/AUTHORS +share/doc/pth/COPYING +share/doc/pth/HACKING +share/doc/pth/NEWS +share/doc/pth/README +share/doc/pth/SUPPORT +share/doc/pth/TESTS +share/doc/pth/THANKS +share/doc/pth/USERS +share/doc/pth/pthread.ps +share/doc/pth/rse-pmt.ps +@dirrm share/doc/pth diff --git a/devel/pth-syscall/buildlink.mk b/devel/pth-syscall/buildlink.mk new file mode 100644 index 00000000000..fce1cc0ea9c --- /dev/null +++ b/devel/pth-syscall/buildlink.mk @@ -0,0 +1,59 @@ +# $NetBSD: buildlink.mk,v 1.1.2.2 2002/06/23 18:44:56 jlam Exp $ +# +# This Makefile fragment is included by packages that use pth-syscall. +# +# To use this Makefile fragment, simply: +# +# (1) Optionally define BUILDLINK_DEPENDS.pth-syscall to the dependency pattern +# for the version of pth desired. +# (2) Include this Makefile fragment in the package Makefile, +# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header +# search path, and +# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search +# path. + +.if !defined(PTH_SYSCALL_BUILDLINK_MK) +PTH_SYSCALL_BUILDLINK_MK= # defined + +.include "../../mk/bsd.buildlink.mk" + +BUILDLINK_DEPENDS.pth-syscall?= pth-syscall>=1.4.1 +DEPENDS+= ${BUILDLINK_DEPENDS.pth-syscall}:../../devel/pth-syscall + +EVAL_PREFIX+= BUILDLINK_PREFIX.pth-syscall=pth-syscall +BUILDLINK_PREFIX.pth-syscall_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.pth-syscall= include/pth.h +BUILDLINK_FILES.pth-syscall+= include/pthread.h +BUILDLINK_FILES.pth-syscall+= lib/libpth.* +BUILDLINK_FILES.pth-syscall+= lib/libpthread.* + +BUILDLINK_TARGETS.pth-syscall= pth-syscall-buildlink +BUILDLINK_TARGETS.pth-syscall+= pth-syscall-buildlink-config-wrapper +BUILDLINK_TARGETS.pth-syscall+= pth-syscall-pthread-buildlink-config-wrapper +BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.pth-syscall} + +BUILDLINK_CONFIG.pth-syscall= ${BUILDLINK_PREFIX.pth-syscall}/bin/pth-config +BUILDLINK_CONFIG_WRAPPER.pth-syscall= ${BUILDLINK_DIR}/bin/pth-config +REPLACE_BUILDLINK_SED+= \ + -e "s|${BUILDLINK_CONFIG_WRAPPER.pth-syscall}|${BUILDLINK_CONFIG.pth-syscall}|g" + +BUILDLINK_CONFIG.pth-syscall-pthread= ${BUILDLINK_PREFIX.pth-syscall}/bin/pthread-config +BUILDLINK_CONFIG_WRAPPER.pth-syscall-pthread= ${BUILDLINK_DIR}/bin/pthread-config +REPLACE_BUILDLINK_SED+= \ + -e "s|${BUILDLINK_CONFIG_WRAPPER.pth-syscall-pthread}|${BUILDLINK_CONFIG.pth-syscall-pthread}|g" + +.if defined(USE_CONFIG_WRAPPER) +PTH_CONFIG?= ${BUILDLINK_CONFIG_WRAPPER.pth-syscall} +PTHREAD_CONFIG?= ${BUILDLINK_CONFIG_WRAPPER.pth-syscall-pthread} +CONFIGURE_ENV+= PTH_CONFIG="${PTH_CONFIG}" +CONFIGURE_ENV+= PTHREAD_CONFIG="${PTHREAD_CONFIG}" +MAKE_ENV+= PTH_CONFIG="${PTH_CONFIG}" +MAKE_ENV+= PTHREAD_CONFIG="${PTHREAD_CONFIG}" +.endif + +pre-configure: ${BUILDLINK_TARGETS.pth-syscall} +pth-syscall-buildlink: _BUILDLINK_USE +pth-syscall-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE +pth-syscall-pthread-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE + +.endif # PTH_SYSCALL_BUILDLINK_MK diff --git a/devel/pth-syscall/buildlink2.mk b/devel/pth-syscall/buildlink2.mk new file mode 100644 index 00000000000..8f53c754aac --- /dev/null +++ b/devel/pth-syscall/buildlink2.mk @@ -0,0 +1,21 @@ +# $NetBSD: buildlink2.mk,v 1.1.2.1 2002/06/23 18:44:57 jlam Exp $ + +.if !defined(PTH_SYSCALL_BUILDLINK2_MK) +PTH_SYSCALL_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= pth-syscall +BUILDLINK_DEPENDS.pth-syscall?= pth-syscall>=1.4.1 +BUILDLINK_PKGSRCDIR.pth-syscall?= ../../devel/pth-syscall + +EVAL_PREFIX+= BUILDLINK_PREFIX.pth-syscall=pth-syscall +BUILDLINK_PREFIX.pth-syscall_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.pth-syscall= include/pth.h +BUILDLINK_FILES.pth-syscall+= include/pthread.h +BUILDLINK_FILES.pth-syscall+= lib/libpth.* +BUILDLINK_FILES.pth-syscall+= lib/libpthread.* + +BUILDLINK_TARGETS+= pth-syscall-buildlink + +pth-syscall-buildlink: _BUILDLINK_USE + +.endif # PTH_SYSCALL_BUILDLINK2_MK diff --git a/devel/pth-syscall/distinfo b/devel/pth-syscall/distinfo new file mode 100644 index 00000000000..33a962d33a3 --- /dev/null +++ b/devel/pth-syscall/distinfo @@ -0,0 +1,10 @@ +$NetBSD: distinfo,v 1.1.2.2 2002/06/23 18:44:57 jlam Exp $ + +SHA1 (pth-1.4.1.tar.gz) = bc5b0847d57d2b78945a6c8d4ebab57e46213972 +Size (pth-1.4.1.tar.gz) = 446287 bytes +SHA1 (patch-aa) = c2fafc8eba5f084468fe0d07b1763d801b9ead89 +SHA1 (patch-ab) = 57383d10067e8b8f02f17342c66a8715cfb88659 +SHA1 (patch-ac) = 77202a5f9f39e63b24288051273a3518e80c47ec +SHA1 (patch-ad) = 0f1e18cff418b066d37333578f2e5874741f2008 +SHA1 (patch-ae) = fe0714f3d1c71f7f347ba217abf918cb7ea8f31b +SHA1 (patch-af) = 95ab72c602d6b69e10de9e3218f4c455036f40ca diff --git a/devel/pth-syscall/patches/patch-aa b/devel/pth-syscall/patches/patch-aa new file mode 100644 index 00000000000..4c52c67dd50 --- /dev/null +++ b/devel/pth-syscall/patches/patch-aa @@ -0,0 +1,30 @@ +$NetBSD: patch-aa,v 1.1.2.2 2002/06/23 18:44:58 jlam Exp $ + +--- Makefile.in.orig Thu Apr 5 10:27:27 2001 ++++ Makefile.in +@@ -59,7 +59,7 @@ + MKFLAGS = $(MFLAGS) DESTDIR=$(DESTDIR) + LIBS = @LIBS@ + SHTOOL = $(srcdir)/shtool +-LIBTOOL = $(C)libtool ++LIBTOOL = @LIBTOOL@ + RM = rm -f + RMDIR = rmdir + TRUE = true +@@ -232,14 +232,14 @@ + $(SHTOOL) install -c -m 644 $(S)pth.m4 $(DESTDIR)$(datadir)/aclocal/pth.m4 + $(SHTOOL) install -c -m 644 pth.h $(DESTDIR)$(includedir)/pth.h + @umask 022; $(LIBTOOL) --mode=install \ +- $(SHTOOL) install -c libpth.la $(DESTDIR)$(libdir)/libpth.la ++ install -c libpth.la $(DESTDIR)$(libdir)/libpth.la + install-pthread: + $(SHTOOL) install -c -m 755 pthread-config $(DESTDIR)$(bindir)/pthread-config + $(SHTOOL) install -c -m 644 $(S)pthread-config.1 $(DESTDIR)$(mandir)/man1/pthread-config.1 + $(SHTOOL) install -c -m 644 pthread.h $(DESTDIR)$(includedir)/pthread.h + $(SHTOOL) install -c -m 644 $(S)pthread.3 $(DESTDIR)$(mandir)/man3/pthread.3 + @umask 022; $(LIBTOOL) --mode=install \ +- $(SHTOOL) install -c libpthread.la $(DESTDIR)$(libdir)/libpthread.la ++ install -c libpthread.la $(DESTDIR)$(libdir)/libpthread.la + + # uninstall the package + uninstall: diff --git a/devel/pth-syscall/patches/patch-ab b/devel/pth-syscall/patches/patch-ab new file mode 100644 index 00000000000..4795c238373 --- /dev/null +++ b/devel/pth-syscall/patches/patch-ab @@ -0,0 +1,1436 @@ +$NetBSD: patch-ab,v 1.1.2.2 2002/06/23 18:44:59 jlam Exp $ + +--- configure.orig Sun Jan 27 07:29:59 2002 ++++ configure Sat Mar 23 16:08:21 2002 +@@ -178,5 +178,4 @@ + silent= + site= +-sitefile= + srcdir= + target=NONE +@@ -293,5 +292,4 @@ + --no-create do not create output files + --quiet, --silent do not print \`checking...' messages +- --site-file=FILE use FILE as the site file + --version print the version of autoconf that created configure + Directory and file names: +@@ -464,9 +462,4 @@ + site="$ac_optarg" ;; + +- -site-file | --site-file | --site-fil | --site-fi | --site-f) +- ac_prev=sitefile ;; +- -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*) +- sitefile="$ac_optarg" ;; +- + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) + ac_prev=srcdir ;; +@@ -634,14 +627,10 @@ + + # Prefer explicitly selected file to automatically selected ones. +-if test -z "$sitefile"; then +- if test -z "$CONFIG_SITE"; then +- if test "x$prefix" != xNONE; then +- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" +- else +- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" +- fi ++if test -z "$CONFIG_SITE"; then ++ if test "x$prefix" != xNONE; then ++ CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" ++ else ++ CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" + fi +-else +- CONFIG_SITE="$sitefile" + fi + for ac_site_file in $CONFIG_SITE; do +@@ -746,5 +735,5 @@ + set dummy gcc; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:749: checking for $ac_word" >&5 ++echo "configure:738: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -776,5 +765,5 @@ + set dummy cc; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:779: checking for $ac_word" >&5 ++echo "configure:768: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -827,5 +816,5 @@ + set dummy cl; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:830: checking for $ac_word" >&5 ++echo "configure:819: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -859,5 +848,5 @@ + + echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:862: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ++echo "configure:851: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 + + ac_ext=c +@@ -870,10 +859,10 @@ + cat > conftest.$ac_ext << EOF + +-#line 873 "configure" ++#line 862 "configure" + #include "confdefs.h" + + main(){return(0);} + EOF +-if { (eval echo configure:878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cc_works=yes + # If we can't run a trivial program, we are probably using a cross compiler. +@@ -901,10 +890,10 @@ + fi + echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +-echo "configure:904: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 ++echo "configure:893: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 + echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 + cross_compiling=$ac_cv_prog_cc_cross + + echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 +-echo "configure:909: checking whether we are using GNU C" >&5 ++echo "configure:898: checking whether we are using GNU C" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -915,5 +904,5 @@ + #endif + EOF +-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:918: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:907: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then + ac_cv_prog_gcc=yes + else +@@ -934,5 +923,5 @@ + CFLAGS= + echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 +-echo "configure:937: checking whether ${CC-cc} accepts -g" >&5 ++echo "configure:926: checking whether ${CC-cc} accepts -g" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -966,5 +955,5 @@ + + echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 +-echo "configure:969: checking how to run the C preprocessor" >&5 ++echo "configure:958: checking how to run the C preprocessor" >&5 + # On Suns, sometimes $CPP names a directory. + if test -n "$CPP" && test -d "$CPP"; then +@@ -981,5 +970,5 @@ + # not just through cpp. + cat > conftest.$ac_ext <<EOF +-#line 984 "configure" ++#line 973 "configure" + #include "confdefs.h" + #include <assert.h> +@@ -987,5 +976,5 @@ + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:990: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:979: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then +@@ -998,5 +987,5 @@ + CPP="${CC-cc} -E -traditional-cpp" + cat > conftest.$ac_ext <<EOF +-#line 1001 "configure" ++#line 990 "configure" + #include "confdefs.h" + #include <assert.h> +@@ -1004,5 +993,5 @@ + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:1007: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:996: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then +@@ -1015,5 +1004,5 @@ + CPP="${CC-cc} -nologo -E" + cat > conftest.$ac_ext <<EOF +-#line 1018 "configure" ++#line 1007 "configure" + #include "confdefs.h" + #include <assert.h> +@@ -1021,5 +1010,5 @@ + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:1024: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:1013: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then +@@ -1046,5 +1035,5 @@ + + echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 +-echo "configure:1049: checking whether ${MAKE-make} sets \${MAKE}" >&5 ++echo "configure:1038: checking whether ${MAKE-make} sets \${MAKE}" >&5 + set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then +@@ -1087,5 +1076,5 @@ + *-pipe* ) ;; + * ) echo $ac_n "checking for compiler option -pipe""... $ac_c" 1>&6 +-echo "configure:1090: checking for compiler option -pipe" >&5 ++echo "configure:1079: checking for compiler option -pipe" >&5 + if eval "test \"`echo '$''{'ac_cv_compiler_option_pipe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1113,5 +1102,5 @@ + esac + echo $ac_n "checking for compiler option -ggdb3""... $ac_c" 1>&6 +-echo "configure:1116: checking for compiler option -ggdb3" >&5 ++echo "configure:1105: checking for compiler option -ggdb3" >&5 + if eval "test \"`echo '$''{'ac_cv_compiler_option_ggdb3'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1144,5 +1133,5 @@ + WMORE="$WMORE -Wmissing-prototypes -Wmissing-declarations -Wnested-externs" + echo $ac_n "checking for compiler option -W<xxx>""... $ac_c" 1>&6 +-echo "configure:1147: checking for compiler option -W<xxx>" >&5 ++echo "configure:1136: checking for compiler option -W<xxx>" >&5 + if eval "test \"`echo '$''{'ac_cv_compiler_option_wmore'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1169,5 +1158,5 @@ + + echo $ac_n "checking for compiler option -Wno-long-long""... $ac_c" 1>&6 +-echo "configure:1172: checking for compiler option -Wno-long-long" >&5 ++echo "configure:1161: checking for compiler option -Wno-long-long" >&5 + if eval "test \"`echo '$''{'ac_cv_compiler_option_wnolonglong'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1211,5 +1200,5 @@ + *-pipe* ) ;; + * ) echo $ac_n "checking for compiler option -pipe""... $ac_c" 1>&6 +-echo "configure:1214: checking for compiler option -pipe" >&5 ++echo "configure:1203: checking for compiler option -pipe" >&5 + if eval "test \"`echo '$''{'ac_cv_compiler_option_pipe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1249,5 +1238,5 @@ + fi + echo $ac_n "checking for compilation debug mode""... $ac_c" 1>&6 +-echo "configure:1252: checking for compilation debug mode" >&5 ++echo "configure:1241: checking for compilation debug mode" >&5 + echo "$ac_t""$msg" 1>&6 + if test ".$msg" = .enabled; then +@@ -1256,5 +1245,5 @@ + + echo $ac_n "checking for compilation profile mode""... $ac_c" 1>&6 +-echo "configure:1259: checking for compilation profile mode" >&5 ++echo "configure:1248: checking for compilation profile mode" >&5 + # Check whether --enable-profile or --disable-profile was given. + if test "${enable_profile+set}" = set; then +@@ -1290,5 +1279,5 @@ + *-pipe* ) ;; + * ) echo $ac_n "checking for compiler option -pipe""... $ac_c" 1>&6 +-echo "configure:1293: checking for compiler option -pipe" >&5 ++echo "configure:1282: checking for compiler option -pipe" >&5 + if eval "test \"`echo '$''{'ac_cv_compiler_option_pipe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1317,5 +1306,5 @@ + OPT_CFLAGS='-funroll-loops -fstrength-reduce -fomit-frame-pointer -ffast-math' + echo $ac_n "checking for compiler option -f<xxx> for optimizations""... $ac_c" 1>&6 +-echo "configure:1320: checking for compiler option -f<xxx> for optimizations" >&5 ++echo "configure:1309: checking for compiler option -f<xxx> for optimizations" >&5 + if eval "test \"`echo '$''{'ac_cv_compiler_option_optimize_std'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1345,5 +1334,5 @@ + OPT_CFLAGS='-malign-functions=4 -malign-jumps=4 -malign-loops=4' + echo $ac_n "checking for compiler option -f<xxx> for Intel x86 CPU""... $ac_c" 1>&6 +-echo "configure:1348: checking for compiler option -f<xxx> for Intel x86 CPU" >&5 ++echo "configure:1337: checking for compiler option -f<xxx> for Intel x86 CPU" >&5 + if eval "test \"`echo '$''{'ac_cv_compiler_option_optimize_x86'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1380,5 +1369,5 @@ + *-*-solaris* ) + echo $ac_n "checking for compiler option -fast""... $ac_c" 1>&6 +-echo "configure:1383: checking for compiler option -fast" >&5 ++echo "configure:1372: checking for compiler option -fast" >&5 + if eval "test \"`echo '$''{'ac_cv_compiler_option_fast'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1415,5 +1404,5 @@ + fi + echo $ac_n "checking for compilation optimization mode""... $ac_c" 1>&6 +-echo "configure:1418: checking for compilation optimization mode" >&5 ++echo "configure:1407: checking for compilation optimization mode" >&5 + echo "$ac_t""$msg" 1>&6 + +@@ -1459,5 +1448,5 @@ + set dummy ar; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1462: checking for $ac_word" >&5 ++echo "configure:1451: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1488,5 +1477,5 @@ + set dummy ranlib; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1491: checking for $ac_word" >&5 ++echo "configure:1480: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1571,10 +1560,10 @@ + + echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 +-echo "configure:1574: checking for ANSI C header files" >&5 ++echo "configure:1563: checking for ANSI C header files" >&5 + if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 1579 "configure" ++#line 1568 "configure" + #include "confdefs.h" + #include <stdlib.h> +@@ -1584,5 +1573,5 @@ + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:1587: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:1576: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then +@@ -1601,5 +1590,5 @@ + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat > conftest.$ac_ext <<EOF +-#line 1604 "configure" ++#line 1593 "configure" + #include "confdefs.h" + #include <string.h> +@@ -1619,5 +1608,5 @@ + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat > conftest.$ac_ext <<EOF +-#line 1622 "configure" ++#line 1611 "configure" + #include "confdefs.h" + #include <stdlib.h> +@@ -1640,5 +1629,5 @@ + else + cat > conftest.$ac_ext <<EOF +-#line 1643 "configure" ++#line 1632 "configure" + #include "confdefs.h" + #include <ctype.h> +@@ -1651,5 +1640,5 @@ + + EOF +-if { (eval echo configure:1654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:1643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : +@@ -1678,15 +1667,15 @@ + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:1681: checking for $ac_hdr" >&5 ++echo "configure:1670: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 1686 "configure" ++#line 1675 "configure" + #include "confdefs.h" + #include <$ac_hdr> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:1691: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:1680: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then +@@ -1716,10 +1705,10 @@ + for ac_func in gettimeofday select sigaction sigprocmask sigpending sigsuspend; do + echo $ac_n "checking for function $ac_func""... $ac_c" 1>&6 +-echo "configure:1719: checking for function $ac_func" >&5 ++echo "configure:1708: checking for function $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 1724 "configure" ++#line 1713 "configure" + #include "confdefs.h" + +@@ -1748,5 +1737,5 @@ + ; return 0; } + EOF +-if { (eval echo configure:1751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +@@ -1834,5 +1823,5 @@ + + echo $ac_n "checking for number of signals""... $ac_c" 1>&6 +-echo "configure:1837: checking for number of signals" >&5 ++echo "configure:1826: checking for number of signals" >&5 + cross_compile=no + if test "$cross_compiling" = yes; then +@@ -1841,5 +1830,5 @@ + else + cat > conftest.$ac_ext <<EOF +-#line 1844 "configure" ++#line 1833 "configure" + #include "confdefs.h" + +@@ -1871,5 +1860,5 @@ + + EOF +-if { (eval echo configure:1874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:1863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + nsig=`cat conftestval` +@@ -1891,10 +1880,10 @@ + for ac_func in poll; do + echo $ac_n "checking for function $ac_func""... $ac_c" 1>&6 +-echo "configure:1894: checking for function $ac_func" >&5 ++echo "configure:1883: checking for function $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 1899 "configure" ++#line 1888 "configure" + #include "confdefs.h" + +@@ -1923,5 +1912,5 @@ + ; return 0; } + EOF +-if { (eval echo configure:1926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +@@ -1948,10 +1937,10 @@ + + echo $ac_n "checking for define POLLIN in poll.h""... $ac_c" 1>&6 +-echo "configure:1951: checking for define POLLIN in poll.h" >&5 ++echo "configure:1940: checking for define POLLIN in poll.h" >&5 + if eval "test \"`echo '$''{'ac_cv_define_POLLIN'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 1956 "configure" ++#line 1945 "configure" + #include "confdefs.h" + +@@ -1982,5 +1971,5 @@ + + echo $ac_n "checking whether poll(2) facility has to be faked""... $ac_c" 1>&6 +-echo "configure:1985: checking whether poll(2) facility has to be faked" >&5 ++echo "configure:1974: checking whether poll(2) facility has to be faked" >&5 + ac_rc=yes + for ac_spec in func:poll define:POLLIN; do +@@ -2028,15 +2017,15 @@ + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:2031: checking for $ac_hdr" >&5 ++echo "configure:2020: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 2036 "configure" ++#line 2025 "configure" + #include "confdefs.h" + #include <$ac_hdr> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:2041: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:2030: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then +@@ -2066,10 +2055,10 @@ + for ac_func in readv writev; do + echo $ac_n "checking for function $ac_func""... $ac_c" 1>&6 +-echo "configure:2069: checking for function $ac_func" >&5 ++echo "configure:2058: checking for function $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 2074 "configure" ++#line 2063 "configure" + #include "confdefs.h" + +@@ -2098,5 +2087,5 @@ + ; return 0; } + EOF +-if { (eval echo configure:2101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +@@ -2123,5 +2112,5 @@ + + echo $ac_n "checking whether readv(2)/writev(2) facility has to be faked""... $ac_c" 1>&6 +-echo "configure:2126: checking whether readv(2)/writev(2) facility has to be faked" >&5 ++echo "configure:2115: checking whether readv(2)/writev(2) facility has to be faked" >&5 + ac_rc=yes + for ac_spec in func:readv func:writev header:sys/uio.h; do +@@ -2167,10 +2156,10 @@ + for ac_func in usleep strerror; do + echo $ac_n "checking for function $ac_func""... $ac_c" 1>&6 +-echo "configure:2170: checking for function $ac_func" >&5 ++echo "configure:2159: checking for function $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 2175 "configure" ++#line 2164 "configure" + #include "confdefs.h" + +@@ -2199,5 +2188,5 @@ + ; return 0; } + EOF +-if { (eval echo configure:2202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2191: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +@@ -2224,19 +2213,19 @@ + + +-for ac_hdr in sys/resource.h net/errno.h paths.h ++for ac_hdr in net/errno.h paths.h + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:2231: checking for $ac_hdr" >&5 ++echo "configure:2220: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 2236 "configure" ++#line 2225 "configure" + #include "confdefs.h" + #include <$ac_hdr> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:2241: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:2230: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then +@@ -2266,5 +2255,5 @@ + + echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6 +-echo "configure:2269: checking for gethostname in -lnsl" >&5 ++echo "configure:2258: checking for gethostname in -lnsl" >&5 + ac_lib_var=`echo nsl'_'gethostname | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +@@ -2274,5 +2263,5 @@ + LIBS="-lnsl $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 2277 "configure" ++#line 2266 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -2285,5 +2274,5 @@ + ; return 0; } + EOF +-if { (eval echo configure:2288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +@@ -2314,5 +2303,5 @@ + if test ".`echo $LIBS | grep nsl`" = . ;then + echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 +-echo "configure:2317: checking for gethostbyname in -lnsl" >&5 ++echo "configure:2306: checking for gethostbyname in -lnsl" >&5 + ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +@@ -2322,5 +2311,5 @@ + LIBS="-lnsl $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 2325 "configure" ++#line 2314 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -2333,5 +2322,5 @@ + ; return 0; } + EOF +-if { (eval echo configure:2336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +@@ -2362,5 +2351,5 @@ + fi + echo $ac_n "checking for accept in -lsocket""... $ac_c" 1>&6 +-echo "configure:2365: checking for accept in -lsocket" >&5 ++echo "configure:2354: checking for accept in -lsocket" >&5 + ac_lib_var=`echo socket'_'accept | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +@@ -2370,5 +2359,5 @@ + LIBS="-lsocket $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 2373 "configure" ++#line 2362 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -2381,5 +2370,5 @@ + ; return 0; } + EOF +-if { (eval echo configure:2384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +@@ -2413,15 +2402,15 @@ + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:2416: checking for $ac_hdr" >&5 ++echo "configure:2405: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 2421 "configure" ++#line 2410 "configure" + #include "confdefs.h" + #include <$ac_hdr> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:2426: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:2415: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then +@@ -2455,11 +2444,57 @@ + + ++for ac_hdr in sys/resource.h ++do ++ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ++echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ++echo "configure:2451: checking for $ac_hdr" >&5 ++if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ cat > conftest.$ac_ext <<EOF ++#line 2456 "configure" ++#include "confdefs.h" ++#include <$ac_hdr> ++EOF ++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++{ (eval echo configure:2461: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++if test -z "$ac_err"; then ++ rm -rf conftest* ++ eval "ac_cv_header_$ac_safe=yes" ++else ++ echo "$ac_err" >&5 ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_header_$ac_safe=no" ++fi ++rm -f conftest* ++fi ++if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` ++ cat >> confdefs.h <<EOF ++#define $ac_tr_hdr 1 ++EOF ++ ++else ++ echo "$ac_t""no" 1>&6 ++fi ++done ++ ++EXTRA_INCLUDE_SYS_RESOURCE_H="#include <sys/resource.h>" ++if test ".$ac_cv_header_sys_resource_h" != .yes; then ++ EXTRA_INCLUDE_SYS_RESOURCE_H="/* $EXTRA_INCLUDE_SYS_RESOURCE_H */" ++fi ++ ++ + echo $ac_n "checking for typedef sig_atomic_t""... $ac_c" 1>&6 +-echo "configure:2459: checking for typedef sig_atomic_t" >&5 ++echo "configure:2494: checking for typedef sig_atomic_t" >&5 + if eval "test \"`echo '$''{'ac_cv_typedef_sig_atomic_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 2464 "configure" ++#line 2499 "configure" + #include "confdefs.h" + +@@ -2493,10 +2528,10 @@ + + echo $ac_n "checking for typedef pid_t""... $ac_c" 1>&6 +-echo "configure:2496: checking for typedef pid_t" >&5 ++echo "configure:2531: checking for typedef pid_t" >&5 + if eval "test \"`echo '$''{'ac_cv_typedef_pid_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 2501 "configure" ++#line 2536 "configure" + #include "confdefs.h" + +@@ -2530,10 +2565,10 @@ + + echo $ac_n "checking for typedef size_t""... $ac_c" 1>&6 +-echo "configure:2533: checking for typedef size_t" >&5 ++echo "configure:2568: checking for typedef size_t" >&5 + if eval "test \"`echo '$''{'ac_cv_typedef_size_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 2538 "configure" ++#line 2573 "configure" + #include "confdefs.h" + +@@ -2567,10 +2602,10 @@ + + echo $ac_n "checking for typedef ssize_t""... $ac_c" 1>&6 +-echo "configure:2570: checking for typedef ssize_t" >&5 ++echo "configure:2605: checking for typedef ssize_t" >&5 + if eval "test \"`echo '$''{'ac_cv_typedef_ssize_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 2575 "configure" ++#line 2610 "configure" + #include "confdefs.h" + +@@ -2604,10 +2639,10 @@ + + echo $ac_n "checking for typedef off_t""... $ac_c" 1>&6 +-echo "configure:2607: checking for typedef off_t" >&5 ++echo "configure:2642: checking for typedef off_t" >&5 + if eval "test \"`echo '$''{'ac_cv_typedef_off_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 2612 "configure" ++#line 2647 "configure" + #include "confdefs.h" + +@@ -2641,10 +2676,10 @@ + + echo $ac_n "checking for typedef stack_t""... $ac_c" 1>&6 +-echo "configure:2644: checking for typedef stack_t" >&5 ++echo "configure:2679: checking for typedef stack_t" >&5 + if eval "test \"`echo '$''{'ac_cv_typedef_stack_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 2649 "configure" ++#line 2684 "configure" + #include "confdefs.h" + +@@ -2673,5 +2708,5 @@ + + echo $ac_n "checking for attribute ss_base in struct sigaltstack from sys/signal.h""... $ac_c" 1>&6 +-echo "configure:2676: checking for attribute ss_base in struct sigaltstack from sys/signal.h" >&5 ++echo "configure:2711: checking for attribute ss_base in struct sigaltstack from sys/signal.h" >&5 + if eval "test \"`echo '$''{'ac_cv_structattr_ss_base'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -2679,5 +2714,5 @@ + + cat > conftest.$ac_ext <<EOF +-#line 2682 "configure" ++#line 2717 "configure" + #include "confdefs.h" + +@@ -2693,5 +2728,5 @@ + ; return 0; } + EOF +-if { (eval echo configure:2696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_structattr_ss_base=yes +@@ -2713,5 +2748,5 @@ + + echo $ac_n "checking for attribute ss_sp in struct sigaltstack from sys/signal.h""... $ac_c" 1>&6 +-echo "configure:2716: checking for attribute ss_sp in struct sigaltstack from sys/signal.h" >&5 ++echo "configure:2751: checking for attribute ss_sp in struct sigaltstack from sys/signal.h" >&5 + if eval "test \"`echo '$''{'ac_cv_structattr_ss_sp'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -2719,5 +2754,5 @@ + + cat > conftest.$ac_ext <<EOF +-#line 2722 "configure" ++#line 2757 "configure" + #include "confdefs.h" + +@@ -2733,5 +2768,5 @@ + ; return 0; } + EOF +-if { (eval echo configure:2736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_structattr_ss_sp=yes +@@ -2754,8 +2789,8 @@ + + echo $ac_n "checking for a single-argument based gettimeofday""... $ac_c" 1>&6 +-echo "configure:2757: checking for a single-argument based gettimeofday" >&5 ++echo "configure:2792: checking for a single-argument based gettimeofday" >&5 + cross_compile=no + cat > conftest.$ac_ext <<EOF +-#line 2760 "configure" ++#line 2795 "configure" + #include "confdefs.h" + +@@ -2771,5 +2806,5 @@ + ; return 0; } + EOF +-if { (eval echo configure:2774: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:2809: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + msg="yes" +@@ -2796,8 +2831,8 @@ + + echo $ac_n "checking for struct timespec""... $ac_c" 1>&6 +-echo "configure:2799: checking for struct timespec" >&5 ++echo "configure:2834: checking for struct timespec" >&5 + cross_compile=no + cat > conftest.$ac_ext <<EOF +-#line 2802 "configure" ++#line 2837 "configure" + #include "confdefs.h" + +@@ -2811,5 +2846,5 @@ + ; return 0; } + EOF +-if { (eval echo configure:2814: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:2849: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + msg="yes" +@@ -2832,10 +2867,10 @@ + + echo $ac_n "checking for typedef socklen_t""... $ac_c" 1>&6 +-echo "configure:2835: checking for typedef socklen_t" >&5 ++echo "configure:2870: checking for typedef socklen_t" >&5 + if eval "test \"`echo '$''{'ac_cv_typedef_socklen_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 2840 "configure" ++#line 2875 "configure" + #include "confdefs.h" + +@@ -2863,5 +2898,5 @@ + + echo $ac_n "checking for type of argument 3 for accept()""... $ac_c" 1>&6 +-echo "configure:2866: checking for type of argument 3 for accept()" >&5 ++echo "configure:2901: checking for type of argument 3 for accept()" >&5 + if eval "test \"`echo '$''{'ac_cv_argtype_accept3'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -2869,5 +2904,5 @@ + + cat >conftest.$ac_ext <<EOF +-#line 2872 "configure" ++#line 2907 "configure" + #include "confdefs.h" + EOF +@@ -2927,5 +2962,5 @@ + + echo $ac_n "checking for fallback socklen_t""... $ac_c" 1>&6 +-echo "configure:2930: checking for fallback socklen_t" >&5 ++echo "configure:2965: checking for fallback socklen_t" >&5 + if eval "test \"`echo '$''{'ac_cv_check_socklentype'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -2954,10 +2989,10 @@ + + echo $ac_n "checking for typedef nfds_t""... $ac_c" 1>&6 +-echo "configure:2957: checking for typedef nfds_t" >&5 ++echo "configure:2992: checking for typedef nfds_t" >&5 + if eval "test \"`echo '$''{'ac_cv_typedef_nfds_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 2962 "configure" ++#line 2997 "configure" + #include "confdefs.h" + +@@ -2985,5 +3020,5 @@ + + echo $ac_n "checking for type of argument 2 for poll()""... $ac_c" 1>&6 +-echo "configure:2988: checking for type of argument 2 for poll()" >&5 ++echo "configure:3023: checking for type of argument 2 for poll()" >&5 + if eval "test \"`echo '$''{'ac_cv_argtype_poll2'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -2991,5 +3026,5 @@ + + cat >conftest.$ac_ext <<EOF +-#line 2994 "configure" ++#line 3029 "configure" + #include "confdefs.h" + EOF +@@ -3049,5 +3084,5 @@ + + echo $ac_n "checking for fallback nfds_t""... $ac_c" 1>&6 +-echo "configure:3052: checking for fallback nfds_t" >&5 ++echo "configure:3087: checking for fallback nfds_t" >&5 + if eval "test \"`echo '$''{'ac_cv_check_nfdstype'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -3076,5 +3111,5 @@ + + echo $ac_n "checking for built-in type long long""... $ac_c" 1>&6 +-echo "configure:3079: checking for built-in type long long" >&5 ++echo "configure:3114: checking for built-in type long long" >&5 + if eval "test \"`echo '$''{'ac_cv_type_longlong'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -3082,5 +3117,5 @@ + + cat > conftest.$ac_ext <<EOF +-#line 3085 "configure" ++#line 3120 "configure" + #include "confdefs.h" + +@@ -3094,5 +3129,5 @@ + ; return 0; } + EOF +-if { (eval echo configure:3097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:3132: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + cat >> confdefs.h <<\EOF +@@ -3113,5 +3148,5 @@ + + echo $ac_n "checking for built-in type long double""... $ac_c" 1>&6 +-echo "configure:3116: checking for built-in type long double" >&5 ++echo "configure:3151: checking for built-in type long double" >&5 + if eval "test \"`echo '$''{'ac_cv_type_longdouble'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -3119,5 +3154,5 @@ + + cat > conftest.$ac_ext <<EOF +-#line 3122 "configure" ++#line 3157 "configure" + #include "confdefs.h" + +@@ -3131,5 +3166,5 @@ + ; return 0; } + EOF +-if { (eval echo configure:3134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:3169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + cat >> confdefs.h <<\EOF +@@ -3162,15 +3197,15 @@ + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:3165: checking for $ac_hdr" >&5 ++echo "configure:3200: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 3170 "configure" ++#line 3205 "configure" + #include "confdefs.h" + #include <$ac_hdr> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3175: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3210: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then +@@ -3200,10 +3235,10 @@ + for ac_func in makecontext swapcontext getcontext setcontext; do + echo $ac_n "checking for function $ac_func""... $ac_c" 1>&6 +-echo "configure:3203: checking for function $ac_func" >&5 ++echo "configure:3238: checking for function $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 3208 "configure" ++#line 3243 "configure" + #include "confdefs.h" + +@@ -3232,5 +3267,5 @@ + ; return 0; } + EOF +-if { (eval echo configure:3235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:3270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +@@ -3258,5 +3293,5 @@ + + echo $ac_n "checking for usable SVR4/SUSv2 makecontext(2)/swapcontext(2)""... $ac_c" 1>&6 +-echo "configure:3261: checking for usable SVR4/SUSv2 makecontext(2)/swapcontext(2)" >&5 ++echo "configure:3296: checking for usable SVR4/SUSv2 makecontext(2)/swapcontext(2)" >&5 + if eval "test \"`echo '$''{'ac_cv_check_mcsc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -3268,5 +3303,5 @@ + else + cat > conftest.$ac_ext <<EOF +-#line 3271 "configure" ++#line 3306 "configure" + #include "confdefs.h" + +@@ -3324,5 +3359,5 @@ + + EOF +-if { (eval echo configure:3327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:3362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_check_mcsc=`cat conftestval` +@@ -3349,15 +3384,15 @@ + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:3352: checking for $ac_hdr" >&5 ++echo "configure:3387: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 3357 "configure" ++#line 3392 "configure" + #include "confdefs.h" + #include <$ac_hdr> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3362: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3397: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then +@@ -3387,10 +3422,10 @@ + for ac_func in sigsetjmp siglongjmp setjmp longjmp _setjmp _longjmp; do + echo $ac_n "checking for function $ac_func""... $ac_c" 1>&6 +-echo "configure:3390: checking for function $ac_func" >&5 ++echo "configure:3425: checking for function $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 3395 "configure" ++#line 3430 "configure" + #include "confdefs.h" + +@@ -3419,5 +3454,5 @@ + ; return 0; } + EOF +-if { (eval echo configure:3422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:3457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +@@ -3445,10 +3480,10 @@ + for ac_func in sigaltstack sigstack; do + echo $ac_n "checking for function $ac_func""... $ac_c" 1>&6 +-echo "configure:3448: checking for function $ac_func" >&5 ++echo "configure:3483: checking for function $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 3453 "configure" ++#line 3488 "configure" + #include "confdefs.h" + +@@ -3477,5 +3512,5 @@ + ; return 0; } + EOF +-if { (eval echo configure:3480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:3515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +@@ -3502,5 +3537,5 @@ + + echo $ac_n "checking for signal-mask aware setjmp(3)/longjmp(3)""... $ac_c" 1>&6 +-echo "configure:3505: checking for signal-mask aware setjmp(3)/longjmp(3)" >&5 ++echo "configure:3540: checking for signal-mask aware setjmp(3)/longjmp(3)" >&5 + if eval "test \"`echo '$''{'ac_cv_check_sjlj'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -3549,5 +3584,5 @@ + else + cat > conftest.$ac_ext <<EOF +-#line 3552 "configure" ++#line 3587 "configure" + #include "confdefs.h" + +@@ -3649,5 +3684,5 @@ + + EOF +-if { (eval echo configure:3652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:3687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + rc=`cat conftestval` +@@ -3824,10 +3859,10 @@ + + echo $ac_n "checking for typedef stack_t""... $ac_c" 1>&6 +-echo "configure:3827: checking for typedef stack_t" >&5 ++echo "configure:3862: checking for typedef stack_t" >&5 + if eval "test \"`echo '$''{'ac_cv_typedef_stack_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 3832 "configure" ++#line 3867 "configure" + #include "confdefs.h" + +@@ -3856,5 +3891,5 @@ + + echo $ac_n "checking for direction of stack growth""... $ac_c" 1>&6 +-echo "configure:3859: checking for direction of stack growth" >&5 ++echo "configure:3894: checking for direction of stack growth" >&5 + if eval "test \"`echo '$''{'ac_cv_check_stackgrowth'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -3867,5 +3902,5 @@ + else + cat > conftest.$ac_ext <<EOF +-#line 3870 "configure" ++#line 3905 "configure" + #include "confdefs.h" + +@@ -3896,5 +3931,5 @@ + + EOF +-if { (eval echo configure:3899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:3934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_check_stackgrowth=`cat conftestval` +@@ -3932,10 +3967,10 @@ + for ac_func in makecontext; do + echo $ac_n "checking for function $ac_func""... $ac_c" 1>&6 +-echo "configure:3935: checking for function $ac_func" >&5 ++echo "configure:3970: checking for function $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 3940 "configure" ++#line 3975 "configure" + #include "confdefs.h" + +@@ -3964,5 +3999,5 @@ + ; return 0; } + EOF +-if { (eval echo configure:3967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +@@ -3990,5 +4025,5 @@ + + echo $ac_n "checking for stack setup via makecontext""... $ac_c" 1>&6 +-echo "configure:3993: checking for stack setup via makecontext" >&5 ++echo "configure:4028: checking for stack setup via makecontext" >&5 + if eval "test \"`echo '$''{'ac_cv_stacksetup_makecontext'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4007,5 +4042,5 @@ + else + cat > conftest.$ac_ext <<EOF +-#line 4010 "configure" ++#line 4045 "configure" + #include "confdefs.h" + +@@ -4142,5 +4177,5 @@ + + EOF +-if { (eval echo configure:4145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:4180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + +@@ -4181,10 +4216,10 @@ + for ac_func in sigaltstack; do + echo $ac_n "checking for function $ac_func""... $ac_c" 1>&6 +-echo "configure:4184: checking for function $ac_func" >&5 ++echo "configure:4219: checking for function $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 4189 "configure" ++#line 4224 "configure" + #include "confdefs.h" + +@@ -4213,5 +4248,5 @@ + ; return 0; } + EOF +-if { (eval echo configure:4216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +@@ -4243,10 +4278,10 @@ + + echo $ac_n "checking for typedef stack_t""... $ac_c" 1>&6 +-echo "configure:4246: checking for typedef stack_t" >&5 ++echo "configure:4281: checking for typedef stack_t" >&5 + if eval "test \"`echo '$''{'ac_cv_typedef_stack_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 4251 "configure" ++#line 4286 "configure" + #include "confdefs.h" + +@@ -4277,5 +4312,5 @@ + + echo $ac_n "checking for stack setup via sigaltstack""... $ac_c" 1>&6 +-echo "configure:4280: checking for stack setup via sigaltstack" >&5 ++echo "configure:4315: checking for stack setup via sigaltstack" >&5 + if eval "test \"`echo '$''{'ac_cv_stacksetup_sigaltstack'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4294,5 +4329,5 @@ + else + cat > conftest.$ac_ext <<EOF +-#line 4297 "configure" ++#line 4332 "configure" + #include "confdefs.h" + +@@ -4429,5 +4464,5 @@ + + EOF +-if { (eval echo configure:4432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:4467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + +@@ -4467,10 +4502,10 @@ + for ac_func in sigstack; do + echo $ac_n "checking for function $ac_func""... $ac_c" 1>&6 +-echo "configure:4470: checking for function $ac_func" >&5 ++echo "configure:4505: checking for function $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 4475 "configure" ++#line 4510 "configure" + #include "confdefs.h" + +@@ -4499,5 +4534,5 @@ + ; return 0; } + EOF +-if { (eval echo configure:4502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +@@ -4525,5 +4560,5 @@ + + echo $ac_n "checking for stack setup via sigstack""... $ac_c" 1>&6 +-echo "configure:4528: checking for stack setup via sigstack" >&5 ++echo "configure:4563: checking for stack setup via sigstack" >&5 + if eval "test \"`echo '$''{'ac_cv_stacksetup_sigstack'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4542,5 +4577,5 @@ + else + cat > conftest.$ac_ext <<EOF +-#line 4545 "configure" ++#line 4580 "configure" + #include "confdefs.h" + +@@ -4677,5 +4712,5 @@ + + EOF +-if { (eval echo configure:4680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:4715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + +@@ -4788,10 +4823,10 @@ + for ac_func in syscall; do + echo $ac_n "checking for function $ac_func""... $ac_c" 1>&6 +-echo "configure:4791: checking for function $ac_func" >&5 ++echo "configure:4826: checking for function $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 4796 "configure" ++#line 4831 "configure" + #include "confdefs.h" + +@@ -4820,5 +4855,5 @@ + ; return 0; } + EOF +-if { (eval echo configure:4823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +@@ -4848,15 +4883,15 @@ + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:4851: checking for $ac_hdr" >&5 ++echo "configure:4886: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 4856 "configure" ++#line 4891 "configure" + #include "confdefs.h" + #include <$ac_hdr> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:4861: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:4896: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then +@@ -4885,10 +4920,10 @@ + + echo $ac_n "checking for define SYS_read in sys/syscall.h""... $ac_c" 1>&6 +-echo "configure:4888: checking for define SYS_read in sys/syscall.h" >&5 ++echo "configure:4923: checking for define SYS_read in sys/syscall.h" >&5 + if eval "test \"`echo '$''{'ac_cv_define_SYS_read'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 4893 "configure" ++#line 4928 "configure" + #include "confdefs.h" + +@@ -4920,5 +4955,5 @@ + + echo $ac_n "checking whether soft system call mapping is used""... $ac_c" 1>&6 +-echo "configure:4923: checking whether soft system call mapping is used" >&5 ++echo "configure:4958: checking whether soft system call mapping is used" >&5 + # Check whether --enable-syscall-soft or --disable-syscall-soft was given. + if test "${enable_syscall_soft+set}" = set; then +@@ -4942,5 +4977,5 @@ + + echo $ac_n "checking whether hard system call mapping is used""... $ac_c" 1>&6 +-echo "configure:4945: checking whether hard system call mapping is used" >&5 ++echo "configure:4980: checking whether hard system call mapping is used" >&5 + # Check whether --enable-syscall-hard or --disable-syscall-hard was given. + if test "${enable_syscall_hard+set}" = set; then +@@ -5013,5 +5048,5 @@ + + echo $ac_n "checking whether to activate batch build mode""... $ac_c" 1>&6 +-echo "configure:5016: checking whether to activate batch build mode" >&5 ++echo "configure:5051: checking whether to activate batch build mode" >&5 + # Check whether --enable-batch or --disable-batch was given. + if test "${enable_batch+set}" = set; then +@@ -5030,5 +5065,5 @@ + TARGET_ALL='$(TARGET_PREQ) $(TARGET_LIBS)' + echo $ac_n "checking whether to activate maintainer build targets""... $ac_c" 1>&6 +-echo "configure:5033: checking whether to activate maintainer build targets" >&5 ++echo "configure:5068: checking whether to activate maintainer build targets" >&5 + # Check whether --enable-maintainer or --disable-maintainer was given. + if test "${enable_maintainer+set}" = set; then +@@ -5044,5 +5079,5 @@ + fi + echo $ac_n "checking whether to activate test build targets""... $ac_c" 1>&6 +-echo "configure:5047: checking whether to activate test build targets" >&5 ++echo "configure:5082: checking whether to activate test build targets" >&5 + # Check whether --enable-tests or --disable-tests was given. + if test "${enable_tests+set}" = set; then +@@ -5061,5 +5096,5 @@ + + echo $ac_n "checking whether to build Pthread library""... $ac_c" 1>&6 +-echo "configure:5064: checking whether to build Pthread library" >&5 ++echo "configure:5099: checking whether to build Pthread library" >&5 + # Check whether --enable-pthread or --disable-pthread was given. + if test "${enable_pthread+set}" = set; then +@@ -5085,15 +5120,15 @@ + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:5088: checking for $ac_hdr" >&5 ++echo "configure:5123: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 5093 "configure" ++#line 5128 "configure" + #include "confdefs.h" + #include <$ac_hdr> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:5098: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:5133: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then +@@ -5154,4 +5189,5 @@ + + ++ + PTH_EXT_SFIO=0 + # Check whether --with-sfio or --without-sfio was given. +@@ -5220,15 +5256,15 @@ + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:5223: checking for $ac_hdr" >&5 ++echo "configure:5259: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 5228 "configure" ++#line 5264 "configure" + #include "confdefs.h" + #include <$ac_hdr> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:5233: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:5269: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then +@@ -5257,5 +5293,5 @@ + + echo $ac_n "checking for sfdisc in -lsfio""... $ac_c" 1>&6 +-echo "configure:5260: checking for sfdisc in -lsfio" >&5 ++echo "configure:5296: checking for sfdisc in -lsfio" >&5 + ac_lib_var=`echo sfio'_'sfdisc | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +@@ -5265,5 +5301,5 @@ + LIBS="-lsfio $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 5268 "configure" ++#line 5304 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -5276,5 +5312,5 @@ + ; return 0; } + EOF +-if { (eval echo configure:5279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +@@ -5347,5 +5383,5 @@ + fi + echo $ac_n "checking whether to build against Sfio library""... $ac_c" 1>&6 +-echo "configure:5350: checking whether to build against Sfio library" >&5 ++echo "configure:5386: checking whether to build against Sfio library" >&5 + if test ".$with_sfio" = .yes; then + PTH_EXT_SFIO=1 +@@ -5422,15 +5458,15 @@ + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:5425: checking for $ac_hdr" >&5 ++echo "configure:5461: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 5430 "configure" ++#line 5466 "configure" + #include "confdefs.h" + #include <$ac_hdr> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:5435: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:5471: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then +@@ -5459,5 +5495,5 @@ + + echo $ac_n "checking for dmalloc_debug in -ldmalloc""... $ac_c" 1>&6 +-echo "configure:5462: checking for dmalloc_debug in -ldmalloc" >&5 ++echo "configure:5498: checking for dmalloc_debug in -ldmalloc" >&5 + ac_lib_var=`echo dmalloc'_'dmalloc_debug | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +@@ -5467,5 +5503,5 @@ + LIBS="-ldmalloc $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 5470 "configure" ++#line 5506 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -5478,5 +5514,5 @@ + ; return 0; } + EOF +-if { (eval echo configure:5481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +@@ -5549,5 +5585,5 @@ + fi + echo $ac_n "checking whether to build against Dmalloc library""... $ac_c" 1>&6 +-echo "configure:5552: checking whether to build against Dmalloc library" >&5 ++echo "configure:5588: checking whether to build against Dmalloc library" >&5 + if test ".$with_dmalloc" = .yes; then + cat >> confdefs.h <<\EOF +@@ -5712,4 +5748,5 @@ + s%@PTH_FAKE_RWV@%$PTH_FAKE_RWV%g + s%@EXTRA_INCLUDE_SYS_SELECT_H@%$EXTRA_INCLUDE_SYS_SELECT_H%g ++s%@EXTRA_INCLUDE_SYS_RESOURCE_H@%$EXTRA_INCLUDE_SYS_RESOURCE_H%g + s%@FALLBACK_SIG_ATOMIC_T@%$FALLBACK_SIG_ATOMIC_T%g + s%@FALLBACK_PID_T@%$FALLBACK_PID_T%g +@@ -5737,4 +5774,5 @@ + s%@LIBPTHREAD_A@%$LIBPTHREAD_A%g + s%@LIBPTHREAD_LA@%$LIBPTHREAD_LA%g ++s%@LIBTOOL@%$LIBTOOL%g + s%@PTHREAD_CONFIG_1@%$PTHREAD_CONFIG_1%g + s%@PTHREAD_3@%$PTHREAD_3%g diff --git a/devel/pth-syscall/patches/patch-ac b/devel/pth-syscall/patches/patch-ac new file mode 100644 index 00000000000..1a38736957b --- /dev/null +++ b/devel/pth-syscall/patches/patch-ac @@ -0,0 +1,58 @@ +$NetBSD: patch-ac,v 1.1.2.2 2002/06/23 18:44:59 jlam Exp $ + +--- pth_high.c.orig Sat Mar 24 14:49:58 2001 ++++ pth_high.c +@@ -141,8 +141,43 @@ + return 0; + } + ++#ifdef HAVE_SYS_RESOURCE_H ++/* Pth variant of wait4(2) */ ++pid_t pth_wait4(pid_t wpid, int *status, int options, struct rusage *rusage) ++{ ++ pth_event_t ev; ++ static pth_key_t ev_key = PTH_KEY_INIT; ++ pid_t pid; ++ ++ pth_debug2("pth_wait4: called from thread \"%s\"", pth_current->name); ++ ++ for (;;) { ++ /* do a non-blocking poll for the pid */ ++ while ( (pid = pth_sc(wait4)(wpid, status, options|WNOHANG, rusage)) < 0 ++ && errno == EINTR) ; ++ ++ /* if pid was found or caller requested a polling return immediately */ ++ if (pid == -1 || pid > 0 || (pid == 0 && (options & WNOHANG))) ++ break; ++ ++ /* else wait a little bit */ ++ ev = pth_event(PTH_EVENT_TIME|PTH_MODE_STATIC, &ev_key, pth_timeout(0,250000)); ++ pth_wait(ev); ++ } ++ ++ pth_debug2("pth_wait4: leave to thread \"%s\"", pth_current->name); ++ return pid; ++} ++ + /* Pth variant of waitpid(2) */ +-pid_t pth_waitpid(pid_t wpid, int *status, int options) ++pid_t pth_waitpid(pid_t wpid, int *status, int options) ++{ ++ return pth_wait4(wpid, status, options, 0); ++} ++ ++#else ++/* Pth variant of wait4(2) */ ++pid_t pth_waitpid(pid_t wpid, int *status, int options) + { + pth_event_t ev; + static pth_key_t ev_key = PTH_KEY_INIT; +@@ -167,6 +202,8 @@ + pth_debug2("pth_waitpid: leave to thread \"%s\"", pth_current->name); + return pid; + } ++#endif ++ + + /* Pth variant of system(3) */ + int pth_system(const char *cmd) diff --git a/devel/pth-syscall/patches/patch-ad b/devel/pth-syscall/patches/patch-ad new file mode 100644 index 00000000000..a0dda5da9e5 --- /dev/null +++ b/devel/pth-syscall/patches/patch-ad @@ -0,0 +1,42 @@ +$NetBSD: patch-ad,v 1.1.2.2 2002/06/23 18:44:59 jlam Exp $ + +--- pth_syscall.c.orig Sat Mar 24 14:50:03 2001 ++++ pth_syscall.c +@@ -85,11 +85,13 @@ + #if cpp + #if defined(SYS_sigprocmask) + #define PTH_SC_sigprocmask(a1,a2,a3) ((int)syscall(SYS_sigprocmask,(a1),(a2),(a3))) ++#elif defined(SYS___sigprocmask14) ++#define PTH_SC_sigprocmask(a1,a2,a3) ((int)syscall(SYS___sigprocmask14,(a1),(a2),(a3))) + #else + #define PTH_SC_sigprocmask sigprocmask + #endif + #endif /* cpp */ +-#if PTH_SYSCALL_HARD && defined(SYS_sigprocmask) ++#if PTH_SYSCALL_HARD && (defined(SYS_sigprocmask) || defined(SYS___sigprocmask14)) + int sigprocmask(int how, const sigset_t *set, sigset_t *oset) + { + pth_implicit_init(); +@@ -119,6 +121,22 @@ + { + pth_implicit_init(); + return pth_waitpid(wpid, status, options); ++} ++#endif ++ ++/* Pth hard wrapper for syscall wait4(2) */ ++#if cpp ++#if defined(SYS_wait4) ++#define PTH_SC_wait4(a1,a2,a3,a4) ((int)syscall(SYS_wait4,(a1),(a2),(a3),(a4))) ++#else ++#define PTH_SC_wait4 wait4 ++#endif ++#endif /* cpp */ ++#if PTH_SYSCALL_HARD && defined(SYS_wait4) ++pid_t wait4(pid_t wpid, int *status, int options, struct rusage *rusage) ++{ ++ pth_implicit_init(); ++ return pth_wait4(wpid, status, options, rusage); + } + #endif + diff --git a/devel/pth-syscall/patches/patch-ae b/devel/pth-syscall/patches/patch-ae new file mode 100644 index 00000000000..7547facac28 --- /dev/null +++ b/devel/pth-syscall/patches/patch-ae @@ -0,0 +1,37 @@ +$NetBSD: patch-ae,v 1.1.2.2 2002/06/23 18:44:59 jlam Exp $ + +--- configure.in.orig Sat Mar 24 14:49:45 2001 ++++ configure.in +@@ -178,7 +178,7 @@ + AC_CHECK_FUNCTIONS(usleep strerror) + + dnl # check for various other headers which we might need +-AC_HAVE_HEADERS(sys/resource.h net/errno.h paths.h) ++AC_HAVE_HEADERS(net/errno.h paths.h) + + dnl # at least the test programs need some socket stuff + AC_CHECK_LIB(nsl, gethostname) +@@ -196,6 +196,15 @@ + fi + AC_SUBST(EXTRA_INCLUDE_SYS_SELECT_H) + ++dnl # check whether we've to use a non-standard #include <sys/resource.h> to get ++dnl # the definition for struct rusage on platforms that support it. ++AC_HAVE_HEADERS(sys/resource.h) ++EXTRA_INCLUDE_SYS_RESOURCE_H="#include <sys/resource.h>" ++if test ".$ac_cv_header_sys_resource_h" != .yes; then ++ EXTRA_INCLUDE_SYS_RESOURCE_H="/* $EXTRA_INCLUDE_SYS_RESOURCE_H */" ++fi ++AC_SUBST(EXTRA_INCLUDE_SYS_RESOURCE_H) ++ + dnl # check whether we've to define sig_atomic_t + AC_CHECK_TYPEDEF(sig_atomic_t, signal.h) + FALLBACK_SIG_ATOMIC_T="typedef int sig_atomic_t;" +@@ -563,6 +572,7 @@ + AC_SUBST(PTHREAD_O) + AC_SUBST(LIBPTHREAD_A) + AC_SUBST(LIBPTHREAD_LA) ++AC_SUBST(LIBTOOL) + AC_SUBST(PTHREAD_CONFIG_1) + AC_SUBST(PTHREAD_3) + AC_SUBST(INSTALL_PTHREAD) diff --git a/devel/pth-syscall/patches/patch-af b/devel/pth-syscall/patches/patch-af new file mode 100644 index 00000000000..3e13b6e766c --- /dev/null +++ b/devel/pth-syscall/patches/patch-af @@ -0,0 +1,23 @@ +$NetBSD: patch-af,v 1.1.2.2 2002/06/23 18:45:00 jlam Exp $ + +--- pth.h.in.orig Sat Mar 24 14:49:49 2001 ++++ pth.h.in +@@ -44,6 +44,7 @@ + #include <sys/socket.h> /* for sockaddr */ + #include <sys/signal.h> /* for sigset_t */ + @EXTRA_INCLUDE_SYS_SELECT_H@ ++@EXTRA_INCLUDE_SYS_RESOURCE_H@ + + /* fallbacks for essential typedefs */ + #ifndef _PTHREAD_PRIVATE +@@ -499,7 +500,10 @@ + extern ssize_t pth_pread(int, void *, size_t, off_t); + extern ssize_t pth_pwrite(int, const void *, size_t, off_t); + ++ /* additional replacement functions */ ++extern pid_t pth_wait4(pid_t, int *, int, struct rusage *); + END_DECLARATION ++ + + /* soft system call mapping support */ + #if PTH_SYSCALL_SOFT && !defined(_PTH_PRIVATE) diff --git a/devel/pth/Makefile b/devel/pth/Makefile index ecfbb6968a3..754bb59e8f8 100644 --- a/devel/pth/Makefile +++ b/devel/pth/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40.2.2 2002/06/21 23:05:10 jlam Exp $ +# $NetBSD: Makefile,v 1.40.2.3 2002/06/23 18:44:54 jlam Exp $ # DISTNAME= pth-1.4.1 @@ -9,7 +9,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.gnu.org/software/pth/pth.html COMMENT= GNU Portable Thread library -CONFLICTS= pth-current-[0-9]* +CONFLICTS= pth-current-[0-9]* pth-syscall-[0-9]* USE_BUILDLINK2= YES USE_LIBTOOL= YES diff --git a/devel/pth/buildlink.mk b/devel/pth/buildlink.mk index 016b6fc95b4..c47e990a020 100644 --- a/devel/pth/buildlink.mk +++ b/devel/pth/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.9 2001/10/03 20:56:46 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.9.2.1 2002/06/23 18:44:55 jlam Exp $ # # This Makefile fragment is included by packages that use pth. # @@ -17,7 +17,7 @@ PTH_BUILDLINK_MK= # defined .include "../../mk/bsd.buildlink.mk" -BUILDLINK_DEPENDS.pth?= pth>=1.3.2 +BUILDLINK_DEPENDS.pth?= pth>=1.4.0 DEPENDS+= ${BUILDLINK_DEPENDS.pth}:../../devel/pth EVAL_PREFIX+= BUILDLINK_PREFIX.pth=pth diff --git a/devel/py-Checker-mixedcase/Makefile b/devel/py-Checker-mixedcase/Makefile index e8026934fda..8a69cba0e55 100644 --- a/devel/py-Checker-mixedcase/Makefile +++ b/devel/py-Checker-mixedcase/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/01/29 16:27:53 drochner Exp $ +# $NetBSD: Makefile,v 1.1.1.1.2.1 2002/06/23 18:45:00 jlam Exp $ -DISTNAME= pychecker-0.8.8 -PKGNAME= ${PYPKGPREFIX}-checker-0.8.8 +DISTNAME= pychecker-0.8.10 +PKGNAME= ${PYPKGPREFIX}-checker-0.8.10 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pychecker/} -MAINTAINER= shell@shellhung.org +MAINTAINER= shell@netbsd.org HOMEPAGE= http://pychecker.sourceforge.net/ COMMENT= python code checker diff --git a/devel/py-Checker-mixedcase/PLIST b/devel/py-Checker-mixedcase/PLIST index 9a86810cacd..093fc8ada8f 100644 --- a/devel/py-Checker-mixedcase/PLIST +++ b/devel/py-Checker-mixedcase/PLIST @@ -1,5 +1,5 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/01/29 16:27:53 drochner Exp $ -bin/pyChecker${PYVERSSUFFIX} +@comment $NetBSD: PLIST,v 1.1.1.1.2.1 2002/06/23 18:45:01 jlam Exp $ +bin/pyChecker ${PYSITELIB}/pychecker/CodeChecks.py ${PYSITELIB}/pychecker/CodeChecks.pyc ${PYSITELIB}/pychecker/Config.py @@ -30,12 +30,4 @@ ${PYSITELIB}/pychecker/utils.py ${PYSITELIB}/pychecker/utils.pyc ${PYSITELIB}/pychecker/warn.py ${PYSITELIB}/pychecker/warn.pyc -share/doc/${PYPKGPREFIX}-Checker/CHANGELOG -share/doc/${PYPKGPREFIX}-Checker/COPYRIGHT -share/doc/${PYPKGPREFIX}-Checker/KNOWN_BUGS -share/doc/${PYPKGPREFIX}-Checker/MAINTAINERS -share/doc/${PYPKGPREFIX}-Checker/README -share/doc/${PYPKGPREFIX}-Checker/TODO -share/doc/${PYPKGPREFIX}-Checker/VERSION @dirrm ${PYSITELIB}/pychecker -@dirrm share/doc/${PYPKGPREFIX}-Checker diff --git a/devel/py-Checker-mixedcase/distinfo b/devel/py-Checker-mixedcase/distinfo index d6674df4b9b..bc5d81323f6 100644 --- a/devel/py-Checker-mixedcase/distinfo +++ b/devel/py-Checker-mixedcase/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/01/29 16:27:53 drochner Exp $ +$NetBSD: distinfo,v 1.1.1.1.2.1 2002/06/23 18:45:01 jlam Exp $ -SHA1 (pychecker-0.8.8.tar.gz) = 144fc8711be9754b645407744d8d36cc2a385611 -Size (pychecker-0.8.8.tar.gz) = 126917 bytes -SHA1 (patch-aa) = 88c2c63aa385b165eb12a6a5f9e055974ed84af4 +SHA1 (pychecker-0.8.10.tar.gz) = 9c259aee00bfb182bbd9d2d348cdb20929945a3c +Size (pychecker-0.8.10.tar.gz) = 91073 bytes +SHA1 (patch-aa) = 5dd07c1495eaf6bb69a0280005044995d053b38e diff --git a/devel/py-Checker-mixedcase/patches/patch-aa b/devel/py-Checker-mixedcase/patches/patch-aa index 33d6ac174b7..8cb88a111bd 100644 --- a/devel/py-Checker-mixedcase/patches/patch-aa +++ b/devel/py-Checker-mixedcase/patches/patch-aa @@ -1,13 +1,7 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/01/29 16:27:53 drochner Exp $ +$NetBSD: patch-aa,v 1.1.1.1.2.1 2002/06/23 18:45:02 jlam Exp $ ---- setup.py.orig Sun Jan 13 17:55:12 2002 -+++ setup.py Tue Jan 29 16:27:22 2002 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/python -+#!/usr/bin/env python - - """To use this setup script to install PyChecker: - +--- setup.py.orig Thu Mar 21 03:13:13 2002 ++++ setup.py Fri Apr 19 18:25:05 2002 @@ -10,7 +10,7 @@ import sys @@ -17,26 +11,23 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/01/29 16:27:53 drochner Exp $ from distutils.core import setup from distutils import sysconfig -@@ -34,10 +34,11 @@ - script_suffix = '' - if sys.platform == 'win32' : +@@ -41,8 +41,8 @@ + script_str = '%s %s %%*\n' % (py_exe, checker_py) script_suffix = '.bat' + - LOCAL_SCRIPT = 'pychecker' + script_suffix - LOCAL_SCRIPT = os.path.join(tempfile.gettempdir(), LOCAL_SCRIPT) -+ LOCAL_SCRIPT = 'pyChecker' + sys.version[:3] ++ LOCAL_SCRIPT = 'pyChecker' + script_suffix + LOCAL_SCRIPT = os.path.join('./', LOCAL_SCRIPT) remove_file(LOCAL_SCRIPT) -+ doc_dir = '@PREFIX@/share/doc/@PYPKGPREFIX@-Checker/' - install_dir = sysconfig.get_python_lib() + os.sep + 'pychecker' - checker_py = install_dir + os.sep + 'checker.py' - py_exe = sys.executable -@@ -64,7 +65,7 @@ + try : +@@ -63,7 +63,7 @@ author_email = "pychecker@metaslash.com", url = "http://pychecker.sourceforge.net/", packages = [ 'pychecker' ], - data_files = [ (install_dir, DOC_FILES) ], -+ data_files = [ (doc_dir, DOC_FILES) ], ++# data_files = [ (install_dir, DOC_FILES) ], scripts = [ LOCAL_SCRIPT, ], long_description = LONG_DESCRIPTION ) diff --git a/devel/py-Optik/Makefile b/devel/py-Optik/Makefile index d63e8da4123..e64bc07f886 100644 --- a/devel/py-Optik/Makefile +++ b/devel/py-Optik/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/01/29 16:17:34 drochner Exp $ +# $NetBSD: Makefile,v 1.1.1.1.2.1 2002/06/23 18:45:02 jlam Exp $ -DISTNAME= Optik-1.2 +DISTNAME= Optik-1.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=optik/} -MAINTAINER= shell@shellhung.org +MAINTAINER= shell@netbsd.org HOMEPAGE= http://optik.sourceforge.net/ COMMENT= command line parsing library for Python diff --git a/devel/py-Optik/distinfo b/devel/py-Optik/distinfo index 00ed238d06f..0ad18b8905b 100644 --- a/devel/py-Optik/distinfo +++ b/devel/py-Optik/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/01/29 16:17:34 drochner Exp $ +$NetBSD: distinfo,v 1.1.1.1.2.1 2002/06/23 18:45:02 jlam Exp $ -SHA1 (Optik-1.2.tar.gz) = ec7494b97c497724914b3625ff7269fb511bc984 -Size (Optik-1.2.tar.gz) = 32322 bytes +SHA1 (Optik-1.3.tar.gz) = 67ee3a7fe0cf366475fa977a4078e0f986990f3f +Size (Optik-1.3.tar.gz) = 38310 bytes diff --git a/devel/py-expect/distinfo b/devel/py-expect/distinfo index 00567794ab3..a50c6f394e0 100644 --- a/devel/py-expect/distinfo +++ b/devel/py-expect/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2002/01/19 15:03:36 drochner Exp $ +$NetBSD: distinfo,v 1.3.2.1 2002/06/23 18:45:03 jlam Exp $ SHA1 (ExpectPy-1.9b1.tar.gz) = f43fcd53901f327dc8acf0650dbfe45b274a8d7d Size (ExpectPy-1.9b1.tar.gz) = 149580 bytes @@ -7,3 +7,4 @@ SHA1 (patch-ab) = 751f56a7a71822dbb93530dd9396bc92f9def05b SHA1 (patch-ac) = 0ff7162129a84fbc913a8b1240209387b922c2a8 SHA1 (patch-ad) = 267c2e93f89f786b415c7fa2645913c40541bc38 SHA1 (patch-ae) = 0f5190724d3b17e7b7f06f6408e1c9e7a3e66868 +SHA1 (patch-af) = 130de0f91370a49db5c9236445d2cb258303b190 diff --git a/devel/py-expect/patches/patch-af b/devel/py-expect/patches/patch-af new file mode 100644 index 00000000000..3c3ecae4e95 --- /dev/null +++ b/devel/py-expect/patches/patch-af @@ -0,0 +1,62 @@ +$NetBSD: patch-af,v 1.1.2.2 2002/06/23 18:45:04 jlam Exp $ +--- expvers.py.~1~ Fri Jun 14 13:09:31 2002 ++++ expvers.py Fri Jun 14 13:36:32 2002 +@@ -2,7 +2,7 @@ + + import sys + import posix +-import strop ++import string + + def exists(path): + try: +@@ -27,12 +27,12 @@ def is_executable(path): + def pathjoin(dir, base): + return '%s/%s' % (dir, base) + def pathsplit(path): +- p = strop.rfind(path, '/') ++ p = string.rfind(path, '/') + if p >= 0: + return (path[:p], path[p+1:]) + return ('', path) + def splitext(path): +- p = strop.rfind(path, '.') ++ p = string.rfind(path, '.') + if p >= 0: + return (path[:p], path[p:]) + return (path, '') +@@ -64,21 +64,21 @@ def ticks(*cmdargs): + wpid = None + while wpid != pid: + (wpid, wstat) = posix.wait() +- v = strop.join(l)[:-1] ++ v = string.join(l)[:-1] + if wstat: + raise RuntimeError, v + return v + + def expect_expr(*args): + global expect_prog +- cmd = 'puts [%s]' % strop.join(map(str, args)) ++ cmd = 'puts [%s]' % string.join(map(str, args)) + result = ticks(expect_prog, '-c', cmd) + return result + + def get_version(prog): + version = expect_expr('exp_version') +- if strop.count(version, '.') > 1: +- p = strop.rfind(version, '.') ++ if string.count(version, '.') > 1: ++ p = string.rfind(version, '.') + return (version[:p], version) + else: + return (version, version) +@@ -115,7 +115,7 @@ else: + elif posix.environ.has_key('EXPECT'): + expect_prog = posix.environ['EXPECT'] + else: +- path = strop.split(posix.environ['PATH'], ':') ++ path = string.split(posix.environ['PATH'], ':') + for dir in path: + f = pathjoin(dir, 'expect') + if is_executable(f): diff --git a/devel/rpc2/Makefile b/devel/rpc2/Makefile index 082113c49ed..691468a344d 100644 --- a/devel/rpc2/Makefile +++ b/devel/rpc2/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2001/06/19 03:28:32 jlam Exp $ +# $NetBSD: Makefile,v 1.10.2.1 2002/06/23 18:45:04 jlam Exp $ # -DISTNAME= rpc2-1.10 +DISTNAME= rpc2-1.13 CATEGORIES= devel MASTER_SITES= ftp://ftp.coda.cs.cmu.edu/pub/rpc2/src/ \ ftp://ftp.wu-wien.ac.at/pub/systems/coda/src/ @@ -17,7 +17,7 @@ USE_LIBTOOL= YES USE_GMAKE= YES USE_BUILDLINK_ONLY= YES -LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig +LIBTOOL_OVERRIDE= ${WRKSRC}/libtool CONFIGURE_ENV+= PERL=${PERL5} .include "../../devel/lwp/buildlink.mk" diff --git a/devel/rpc2/PLIST b/devel/rpc2/PLIST index cff61efea78..2888a5e5237 100644 --- a/devel/rpc2/PLIST +++ b/devel/rpc2/PLIST @@ -1,4 +1,6 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:26:12 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.1.2.1 2002/06/23 18:45:05 jlam Exp $ +bin/filcon +bin/rp2gen include/rpc2/errors.h include/rpc2/errorsdefs.h include/rpc2/fail.h @@ -7,21 +9,19 @@ include/rpc2/multi.h include/rpc2/rpc2.h include/rpc2/se.h include/rpc2/sftp.h -@dirrm include/rpc2 +lib/libfail.a +lib/libfail.la +lib/libfail.so +lib/libfail.so.4 +lib/libfail.so.4.3 lib/librpc2.a lib/librpc2.la lib/librpc2.so lib/librpc2.so.4 -lib/librpc2.so.4.1 +lib/librpc2.so.4.3 lib/libse.a lib/libse.la lib/libse.so lib/libse.so.4 -lib/libse.so.4.1 -lib/libfail.a -lib/libfail.la -lib/libfail.so -lib/libfail.so.4 -lib/libfail.so.4.1 -bin/rp2gen -bin/filcon +lib/libse.so.4.3 +@dirrm include/rpc2 diff --git a/devel/rpc2/distinfo b/devel/rpc2/distinfo index 6b6720e1aa9..8289420be97 100644 --- a/devel/rpc2/distinfo +++ b/devel/rpc2/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.4 2001/05/31 22:52:17 jlam Exp $ +$NetBSD: distinfo,v 1.4.2.1 2002/06/23 18:45:05 jlam Exp $ -SHA1 (rpc2-1.10.tar.gz) = 51872b9c03ef9838de768ffe693d282836e00448 -Size (rpc2-1.10.tar.gz) = 377723 bytes -SHA1 (patch-aa) = 11de3e9740bc749f725347b2d6da85210c8091cd +SHA1 (rpc2-1.13.tar.gz) = b4f13fe3f878c632b66a6a1ac19883c735eeef4d +Size (rpc2-1.13.tar.gz) = 447572 bytes +SHA1 (patch-aa) = dcabf7b6f7afdf8f3e058facfe8a6442177a03bf diff --git a/devel/rpc2/patches/patch-aa b/devel/rpc2/patches/patch-aa index 6fea31c838e..2965ef9095e 100644 --- a/devel/rpc2/patches/patch-aa +++ b/devel/rpc2/patches/patch-aa @@ -1,10 +1,10 @@ -$NetBSD: patch-aa,v 1.1 2001/05/31 22:52:17 jlam Exp $ +$NetBSD: patch-aa,v 1.1.2.1 2002/06/23 18:45:06 jlam Exp $ ---- fail/parser.c.orig Mon Jan 31 17:23:07 2000 -+++ fail/parser.c Wed May 30 14:40:41 2001 -@@ -30,10 +30,7 @@ +--- fail/parser.c.orig Tue May 22 12:31:45 2001 ++++ fail/parser.c +@@ -33,10 +33,7 @@ + #include <assert.h> - #define READLINE_LIBRARY #include <readline/readline.h> - -extern void using_history(); diff --git a/devel/ruby14-readline/DESCR b/devel/ruby14-readline/DESCR deleted file mode 100644 index ca11c0812ce..00000000000 --- a/devel/ruby14-readline/DESCR +++ /dev/null @@ -1,2 +0,0 @@ -This is a Ruby extension to the readline library, which is actually a -part of the Ruby distribution. diff --git a/devel/ruby14-readline/Makefile b/devel/ruby14-readline/Makefile deleted file mode 100644 index 4692cc650a6..00000000000 --- a/devel/ruby14-readline/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/06/30 08:27:40 taca Exp $ -# - -DISTNAME= ${RUBY_DISTNAME} -PKGNAME= ${RUBY_PKGNAMEPREFIX}readline-${RUBY_VERSION} -CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_RUBY} - -MAINTAINER= taca@netbsd.org -HOMEPAGE= http://www.ruby-lang.org/en/ -COMMENT= Ruby 1.4 extension to readline library - -DEPENDS+= readline>=4.0:../../devel/readline - -DIST_SUBDIR= ruby -WRKSRC= ${RUBY_WRKSRC}/ext/readline -EXTRACT_ELEMENTS= ${RUBY_DISTNAME}/ext/readline -USE_RUBY_EXTCONF= yes - -RUBY_VER= 1.4 - -post-install: - ${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/readline/ja - ${INSTALL_DATA} ${RUBY_WRKSRC}/ext/readline/README \ - ${RUBY_DOCDIR}/readline/ja - -.include "../../lang/ruby-base/Makefile.common" -.include "../../mk/bsd.pkg.mk" diff --git a/devel/ruby14-readline/PLIST b/devel/ruby14-readline/PLIST deleted file mode 100644 index fcb6f410f21..00000000000 --- a/devel/ruby14-readline/PLIST +++ /dev/null @@ -1,5 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:26:36 zuntum Exp $ -${RUBY_ARCHLIBDIR}/readline.so -${RUBY_DOCDIR}/readline/ja/README -@dirrm ${RUBY_DOCDIR}/readline/ja -@dirrm ${RUBY_DOCDIR}/readline diff --git a/devel/ruby14-readline/distinfo b/devel/ruby14-readline/distinfo deleted file mode 100644 index 80751783f79..00000000000 --- a/devel/ruby14-readline/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.2 2002/01/22 16:46:59 taca Exp $ - -SHA1 (ruby/ruby-1.4.6.tar.gz) = 662e21cd2f6bf521a77ab179e11b669738579cc5 -Size (ruby/ruby-1.4.6.tar.gz) = 775123 bytes -SHA1 (patch-aa) = 4ccf50dcbcb7ba752f63e548d31d22db7bf01e2d -SHA1 (patch-ab) = 6d530e2aa5e402961f4dae0e15c5b00d039c3d8b diff --git a/devel/ruby14-readline/patches/patch-aa b/devel/ruby14-readline/patches/patch-aa deleted file mode 100644 index 113cc2f9285..00000000000 --- a/devel/ruby14-readline/patches/patch-aa +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2002/01/22 16:47:00 taca Exp $ - ---- extconf.rb.orig Fri Jun 2 22:28:04 2000 -+++ extconf.rb -@@ -2,12 +2,14 @@ - - dir_config("readline") - have_library("user32", nil) if /cygwin/ === RUBY_PLATFORM --have_library("ncurses", "tgetnum") or -- have_library("termcap", "tgetnum") or -+have_library("termcap", "tgetnum") or - have_library("curses", "tgetnum") - - if have_header("readline/readline.h") and - have_header("readline/history.h") and - have_library("readline", "readline") -+ if have_func("rl_filename_completion_function") -+ $CFLAGS += " -DREADLINE_42_OR_LATER" -+ end - create_makefile("readline") - end diff --git a/devel/ruby14-readline/patches/patch-ab b/devel/ruby14-readline/patches/patch-ab deleted file mode 100644 index dea366ac3a0..00000000000 --- a/devel/ruby14-readline/patches/patch-ab +++ /dev/null @@ -1,45 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2002/01/22 16:47:00 taca Exp $ - ---- readline.c.orig Fri Aug 13 14:37:50 1999 -+++ readline.c -@@ -15,11 +15,18 @@ - #define COMPLETION_PROC "completion_proc" - #define COMPLETION_CASE_FOLD "completion_case_fold" - -+#ifndef READLINE_42_OR_LATER -+# define rl_filename_completion_function filename_completion_function -+# define rl_username_completion_function username_completion_function -+# define rl_completion_matches completion_matches -+#endif -+ - static int - readline_event() - { - CHECK_INTS; - rb_thread_schedule(); -+ return 0; - } - - static VALUE -@@ -321,8 +328,8 @@ - char **matches; - int i; - -- matches = completion_matches(STR2CSTR(str), -- filename_completion_function); -+ matches = rl_completion_matches(STR2CSTR(str), -+ rl_filename_completion_function); - if (matches) { - result = rb_ary_new(); - for (i = 0; matches[i]; i++) { -@@ -348,8 +355,8 @@ - char **matches; - int i; - -- matches = completion_matches(STR2CSTR(str), -- username_completion_function); -+ matches = rl_completion_matches(STR2CSTR(str), -+ rl_username_completion_function); - if (matches) { - result = rb_ary_new(); - for (i = 0; matches[i]; i++) { diff --git a/devel/rvm/Makefile b/devel/rvm/Makefile index 6377e70e282..238f21b4a77 100644 --- a/devel/rvm/Makefile +++ b/devel/rvm/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2001/06/19 03:32:40 jlam Exp $ +# $NetBSD: Makefile,v 1.7.2.1 2002/06/23 18:45:08 jlam Exp $ # -DISTNAME= rvm-1.3 +DISTNAME= rvm-1.6 CATEGORIES= devel MASTER_SITES= ftp://ftp.coda.cs.cmu.edu/pub/rvm/src/ \ ftp://ftp.wu-wien.ac.at/pub/systems/coda/src/ @@ -10,15 +10,19 @@ MAINTAINER= phil@cs.wwu.edu HOMEPAGE= http://www.coda.cs.cmu.edu/ COMMENT= Recoverable Virtual Memory -#LICENSE= GPL - GNU_CONFIGURE= YES USE_LIBTOOL= YES USE_GMAKE= YES USE_BUILDLINK_ONLY= YES CONFIGURE_ARGS+= --with-lwp-includes=${BUILDLINK_DIR}/include -LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig +LIBTOOL_OVERRIDE= ${WRKSRC}/libtool + +pre-build: + cd ${WRKSRC}/rvm; \ + for file in *.c; do \ + ${LN} -sf $${file} `${BASENAME} $${file} .c`_lwp.c; \ + done .include "../../devel/lwp/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/rvm/PLIST b/devel/rvm/PLIST index 48bf8a6bf25..8043fdbe1b0 100644 --- a/devel/rvm/PLIST +++ b/devel/rvm/PLIST @@ -1,33 +1,33 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:26:38 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.1.2.1 2002/06/23 18:45:08 jlam Exp $ include/rvm/rds.h include/rvm/rvm.h include/rvm/rvm_segment.h include/rvm/rvm_statistics.h -@dirrm include/rvm lib/librds.a -lib/librvm.a -lib/librdslwp.a -lib/librvmlwp.a lib/librds.la -lib/librvm.la -lib/librdslwp.la -lib/librvmlwp.la lib/librds.so lib/librds.so.2 -lib/librds.so.2.1 -lib/librvm.so -lib/librvm.so.2 -lib/librvm.so.2.1 +lib/librds.so.2.3 +lib/librdslwp.a +lib/librdslwp.la lib/librdslwp.so lib/librdslwp.so.2 -lib/librdslwp.so.2.1 +lib/librdslwp.so.2.3 +lib/librvm.a +lib/librvm.la +lib/librvm.so +lib/librvm.so.2 +lib/librvm.so.2.3 +lib/librvmlwp.a +lib/librvmlwp.la lib/librvmlwp.so lib/librvmlwp.so.2 -lib/librvmlwp.so.2.1 +lib/librvmlwp.so.2.3 lib/libseg.a lib/libseg.la lib/libseg.so lib/libseg.so.2 -lib/libseg.so.2.1 -sbin/rvmutl +lib/libseg.so.2.3 sbin/rdsinit +sbin/rvmutl +@dirrm include/rvm diff --git a/devel/rvm/distinfo b/devel/rvm/distinfo index 00687512d46..ef5e5de6ee9 100644 --- a/devel/rvm/distinfo +++ b/devel/rvm/distinfo @@ -1,4 +1,5 @@ -$NetBSD: distinfo,v 1.3 2001/04/27 19:01:55 phil Exp $ +$NetBSD: distinfo,v 1.3.2.1 2002/06/23 18:45:08 jlam Exp $ -SHA1 (rvm-1.3.tar.gz) = 4d8302d808aa9b5a7118c06eb0d4d106b87a2237 -Size (rvm-1.3.tar.gz) = 340508 bytes +SHA1 (rvm-1.6.tar.gz) = d6b27b37601d5d1666f3956feb6582c3cb6b1d99 +Size (rvm-1.6.tar.gz) = 374944 bytes +SHA1 (patch-aa) = c8faef5459fd5ab06293b8131ec9f41451e63bc5 diff --git a/devel/rvm/patches/patch-aa b/devel/rvm/patches/patch-aa new file mode 100644 index 00000000000..731788ef9b3 --- /dev/null +++ b/devel/rvm/patches/patch-aa @@ -0,0 +1,105 @@ +$NetBSD: patch-aa,v 1.1.2.2 2002/06/23 18:45:09 jlam Exp $ + +--- rvm/Makefile.in.orig Tue Jun 12 12:24:35 2001 ++++ rvm/Makefile.in +@@ -444,76 +444,52 @@ + + + rvm_init.lo: rvm_init.c rvm_init_lwp.lo +-rvm_init_lwp.lo: rvm_init.c +- $(LTCOMPILE) $(LWPFLAGS) -c $< && \ +- mv rvm_init.lo rvm_init_lwp.lo && \ +- mv rvm_init.o rvm_init_lwp.o ++rvm_init_lwp.lo: rvm_init_lwp.c ++ $(LTCOMPILE) $(LWPFLAGS) -c $< + + rvm_map.lo: rvm_map.c rvm_map_lwp.lo +-rvm_map_lwp.lo: rvm_map.c +- $(LTCOMPILE) $(LWPFLAGS) -c $< && \ +- mv rvm_map.lo rvm_map_lwp.lo && \ +- mv rvm_map.o rvm_map_lwp.o ++rvm_map_lwp.lo: rvm_map_lwp.c ++ $(LTCOMPILE) $(LWPFLAGS) -c $< + + rvm_unmap.lo: rvm_unmap.c rvm_unmap_lwp.lo +-rvm_unmap_lwp.lo: rvm_unmap.c +- $(LTCOMPILE) $(LWPFLAGS) -c $< && \ +- mv rvm_unmap.lo rvm_unmap_lwp.lo && \ +- mv rvm_unmap.o rvm_unmap_lwp.o ++rvm_unmap_lwp.lo: rvm_unmap_lwp.c ++ $(LTCOMPILE) $(LWPFLAGS) -c $< + + rvm_trans.lo: rvm_trans.c rvm_trans_lwp.lo +-rvm_trans_lwp.lo: rvm_trans.c +- $(LTCOMPILE) $(LWPFLAGS) -c $< && \ +- mv rvm_trans.lo rvm_trans_lwp.lo && \ +- mv rvm_trans.o rvm_trans_lwp.o ++rvm_trans_lwp.lo: rvm_trans_lwp.c ++ $(LTCOMPILE) $(LWPFLAGS) -c $< + + rvm_logstatus.lo: rvm_logstatus.c rvm_logstatus_lwp.lo +-rvm_logstatus_lwp.lo: rvm_logstatus.c +- $(LTCOMPILE) $(LWPFLAGS) -c $< && \ +- mv rvm_logstatus.lo rvm_logstatus_lwp.lo && \ +- mv rvm_logstatus.o rvm_logstatus_lwp.o ++rvm_logstatus_lwp.lo: rvm_logstatus_lwp.c ++ $(LTCOMPILE) $(LWPFLAGS) -c $< + + rvm_logflush.lo: rvm_logflush.c rvm_logflush_lwp.lo +-rvm_logflush_lwp.lo: rvm_logflush.c +- $(LTCOMPILE) $(LWPFLAGS) -c $< && \ +- mv rvm_logflush.lo rvm_logflush_lwp.lo && \ +- mv rvm_logflush.o rvm_logflush_lwp.o ++rvm_logflush_lwp.lo: rvm_logflush_lwp.c ++ $(LTCOMPILE) $(LWPFLAGS) -c $< + + rvm_logrecovr.lo: rvm_logrecovr.c rvm_logrecovr_lwp.lo +-rvm_logrecovr_lwp.lo: rvm_logrecovr.c +- $(LTCOMPILE) $(LWPFLAGS) -c $< && \ +- mv rvm_logrecovr.lo rvm_logrecovr_lwp.lo && \ +- mv rvm_logrecovr.o rvm_logrecovr_lwp.o ++rvm_logrecovr_lwp.lo: rvm_logrecovr_lwp.c ++ $(LTCOMPILE) $(LWPFLAGS) -c $< + + rvm_utils.lo: rvm_utils.c rvm_utils_lwp.lo +-rvm_utils_lwp.lo: rvm_utils.c +- $(LTCOMPILE) $(LWPFLAGS) -c $< && \ +- mv rvm_utils.lo rvm_utils_lwp.lo && \ +- mv rvm_utils.o rvm_utils_lwp.o ++rvm_utils_lwp.lo: rvm_utils_lwp.c ++ $(LTCOMPILE) $(LWPFLAGS) -c $< + + rvm_io.lo: rvm_io.c rvm_io_lwp.lo +-rvm_io_lwp.lo: rvm_io.c +- $(LTCOMPILE) $(LWPFLAGS) -c $< && \ +- mv rvm_io.lo rvm_io_lwp.lo && \ +- mv rvm_io.o rvm_io_lwp.o ++rvm_io_lwp.lo: rvm_io_lwp.c ++ $(LTCOMPILE) $(LWPFLAGS) -c $< + + rvm_status.lo: rvm_status.c rvm_status_lwp.lo +-rvm_status_lwp.lo: rvm_status.c +- $(LTCOMPILE) $(LWPFLAGS) -c $< && \ +- mv rvm_status.lo rvm_status_lwp.lo && \ +- mv rvm_status.o rvm_status_lwp.o ++rvm_status_lwp.lo: rvm_status_lwp.c ++ $(LTCOMPILE) $(LWPFLAGS) -c $< + + rvm_debug.lo: rvm_debug.c rvm_debug_lwp.lo +-rvm_debug_lwp.lo: rvm_debug.c +- $(LTCOMPILE) $(LWPFLAGS) -c $< && \ +- mv rvm_debug.lo rvm_debug_lwp.lo && \ +- mv rvm_debug.o rvm_debug_lwp.o ++rvm_debug_lwp.lo: rvm_debug_lwp.c ++ $(LTCOMPILE) $(LWPFLAGS) -c $< + + rvm_printers.lo: rvm_printers.c rvm_printers_lwp.lo +-rvm_printers_lwp.lo: rvm_printers.c +- $(LTCOMPILE) $(LWPFLAGS) -c $< && \ +- mv rvm_printers.lo rvm_printers_lwp.lo && \ +- mv rvm_printers.o rvm_printers_lwp.o ++rvm_printers_lwp.lo: rvm_printers_lwp.c ++ $(LTCOMPILE) $(LWPFLAGS) -c $< + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/devel/sdcc/files/md5 b/devel/sdcc/files/md5 new file mode 100644 index 00000000000..d077ce0bf44 --- /dev/null +++ b/devel/sdcc/files/md5 @@ -0,0 +1,3 @@ +$NetBSD: md5,v 1.4.2.1 2002/06/23 18:45:10 jlam Exp $ + +SHA1 (sdcc-2.2.1-src.tar.gz) = c0d448bbdc86620d87b781f62635c51ab44b2235 diff --git a/devel/sdcc/files/patch-sum b/devel/sdcc/files/patch-sum new file mode 100644 index 00000000000..438875ed5fd --- /dev/null +++ b/devel/sdcc/files/patch-sum @@ -0,0 +1,18 @@ +$NetBSD: patch-sum,v 1.3.2.1 2002/06/23 18:45:10 jlam Exp $ + +SHA1 (patch-aa) = f0d229bb5d070f565bdeccd11c45a0395044fbf3 +SHA1 (patch-ab) = 41d6d664da79ba97061d74428dc9cd3d3329901c +SHA1 (patch-ac) = 1f02ed2239cc8c5c8a4286303bf0d6fa87ac42d8 +SHA1 (patch-ad) = 87e80d25073d3e225c2094145df64867c287ad30 +SHA1 (patch-ae) = 3bcea3455bbcdeabde9ab637b6377b1d05bad9cf +SHA1 (patch-af) = 6e4b500fac97e70f963175fea6c9d77d8e670a98 +SHA1 (patch-ag) = 966234636ef78fa4bc46bb959664f27ef386a01d +SHA1 (patch-ah) = cd19f7fa5a3c684eaf8982a4866bb7691f368ffa +SHA1 (patch-ai) = 40df752b589e746d568de5af6e0e589445a57632 +SHA1 (patch-aj) = 9f936132c94b4920df1a276dbebfc1f050ef7ac0 +SHA1 (patch-ak) = 412efd5a8ba3713d0efd7e7fa994deaae5e03507 +SHA1 (patch-al) = 596c86a46bf158603bc3d51825384e7348f8052c +SHA1 (patch-am) = 515c3b35cd07f62dee6ead90f844e058fb4d625c +SHA1 (patch-an) = 07ef83ad0c375e4c1bad32b1511f21438bea7628 +SHA1 (patch-ao) = fb6bb2dc221562ca8a2450532a52ac6f93761e5d +SHA1 (patch-ap) = 96e797c2d5c99c4151ceb3ab6ed6de71e28f8332 diff --git a/devel/stlport/patches/patch-ag b/devel/stlport/patches/patch-ag index 6d8fecbd44e..e8e20d8a177 100644 --- a/devel/stlport/patches/patch-ag +++ b/devel/stlport/patches/patch-ag @@ -1,3 +1,4 @@ +$NetBSD: patch-ag,v 1.1.2.1 2002/06/23 18:45:10 jlam Exp $ --- stlport/typeinfo.orig Sat Nov 10 19:38:11 2001 +++ stlport/typeinfo Sat Nov 10 19:39:12 2001 @@ -23,7 +23,9 @@ diff --git a/devel/stlport/patches/patch-ah b/devel/stlport/patches/patch-ah index cf190302f54..1c69882658a 100644 --- a/devel/stlport/patches/patch-ah +++ b/devel/stlport/patches/patch-ah @@ -1,3 +1,4 @@ +$NetBSD: patch-ah,v 1.1.2.1 2002/06/23 18:45:11 jlam Exp $ --- stlport/stl/_config.h.orig Sat Nov 10 19:51:04 2001 +++ stlport/stl/_config.h Sat Nov 10 19:51:28 2001 @@ -174,7 +174,7 @@ diff --git a/devel/unproven-pthreads/Makefile b/devel/unproven-pthreads/Makefile index f97621783a3..e938d8fa07c 100644 --- a/devel/unproven-pthreads/Makefile +++ b/devel/unproven-pthreads/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2001/11/29 01:12:30 hubertf Exp $ +# $NetBSD: Makefile,v 1.27.2.1 2002/06/23 18:45:11 jlam Exp $ # DISTNAME= unproven-pthreads-0.17 @@ -13,9 +13,9 @@ ONLY_FOR_PLATFORM= NetBSD-*-alpha NetBSD-*-arm32 NetBSD-*-i386 \ NetBSD-*-m68k NetBSD-*-powerpc NetBSD-*-sparc CONFLICTS+= mit-pthreads-[0-9]* -HAS_CONFIGURE= yes +GNU_CONFIGURE= yes +GNU_CONFIGURE_PREFIX= ${PREFIX}/pthreads MAKE_ENV+= NOLINT=1 NOPROFILE=1 OBJECT_FMT=${OBJECT_FMT} -CONFIGURE_ARGS+= --prefix=${PREFIX}/pthreads post-extract: @${RM} ${WRKSRC}/include/pthread/unistd.h diff --git a/devel/w32api/Makefile b/devel/w32api/Makefile index de62cc339ab..e9f9c9a3ac6 100644 --- a/devel/w32api/Makefile +++ b/devel/w32api/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2002/03/18 03:25:46 kent Exp $ +# $NetBSD: Makefile,v 1.9.2.1 2002/06/23 18:45:12 jlam Exp $ # $PEACE: Makefile,v 1.18 2001/12/16 16:23:38 kent Exp $ DISTNAME= w32api-1.2-src @@ -6,7 +6,7 @@ PKGNAME= w32api-1.2 PKGREVISION= 2 WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//} CATEGORIES= devel -MASTER_SITES= http://prdownloads.sourceforge.net/mingw/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mingw/} MAINTAINER= peace-sacrifice@hauN.org HOMEPAGE= http://www.mingw.org/ diff --git a/editors/TeXmacs/Makefile b/editors/TeXmacs/Makefile index 81aaf3e1d23..65fea8a65c1 100644 --- a/editors/TeXmacs/Makefile +++ b/editors/TeXmacs/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.2 2002/04/27 10:27:01 rh Exp $ +# $NetBSD: Makefile,v 1.2.2.1 2002/06/23 18:45:12 jlam Exp $ -DISTNAME= TeXmacs-1.0.0.2-src +DISTNAME= TeXmacs-1.0.0.7-src PKGNAME= ${DISTNAME:S/-src//} CATEGORIES= editors MASTER_SITES= ftp://ftp.texmacs.org/pub/TeXmacs/targz/ @@ -23,6 +23,7 @@ LDFLAGS+= -Wl,-R${LOCALBASE}/libexec/${PKGNAME}/lib pre-configure: cd ${WRKSRC} && autoconf; + ${RM} ${WRKSRC}/misc/scripts/tm_axiom .include "../../mk/x11.buildlink.mk" .include "../../mk/texinfo.mk" diff --git a/editors/TeXmacs/PLIST b/editors/TeXmacs/PLIST index 41a714e56ee..15469f15d70 100644 --- a/editors/TeXmacs/PLIST +++ b/editors/TeXmacs/PLIST @@ -1,473 +1,580 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/04/27 09:53:44 rh Exp $ +@comment $NetBSD: PLIST,v 1.1.1.1.2.1 2002/06/23 18:45:13 jlam Exp $ bin/fig2ps bin/texmacs include/TeXmacs.h -libexec/TeXmacs-1.0.0.2/bin/maxima_filter -libexec/TeXmacs-1.0.0.2/bin/mupad_filter -libexec/TeXmacs-1.0.0.2/bin/qcl_filter -libexec/TeXmacs-1.0.0.2/bin/reduce_filter -libexec/TeXmacs-1.0.0.2/bin/reduce_setup -libexec/TeXmacs-1.0.0.2/bin/texmacs.bin -libexec/TeXmacs-1.0.0.2/bin/tm_maple -libexec/TeXmacs-1.0.0.2/bin/tm_maxima -libexec/TeXmacs-1.0.0.2/bin/tm_mupad -libexec/TeXmacs-1.0.0.2/bin/tm_mupad_help -libexec/TeXmacs-1.0.0.2/bin/tm_qcl -libexec/TeXmacs-1.0.0.2/bin/tm_reduce -libexec/TeXmacs-1.0.0.2/lib/libbasic.so -libexec/TeXmacs-1.0.0.2/lib/libconvert.so -libexec/TeXmacs-1.0.0.2/lib/libedit.so -libexec/TeXmacs-1.0.0.2/lib/libglue.so -libexec/TeXmacs-1.0.0.2/lib/libresource.so -libexec/TeXmacs-1.0.0.2/lib/libserver.so -libexec/TeXmacs-1.0.0.2/lib/libtypeset.so -libexec/TeXmacs-1.0.0.2/lib/libwindow.so -man/man1/fig2ps.1.gz -man/man1/texmacs.1.gz -share/TeXmacs-1.0.0.2/LICENSE -share/TeXmacs-1.0.0.2/doc/dvi/texmacs.dvi -share/TeXmacs-1.0.0.2/doc/dvi/texmacs.tex -share/TeXmacs-1.0.0.2/doc/english/help/about.tex -share/TeXmacs-1.0.0.2/doc/english/help/advanced.tex -share/TeXmacs-1.0.0.2/doc/english/help/compatibility.tex -share/TeXmacs-1.0.0.2/doc/english/help/interface.tex -share/TeXmacs-1.0.0.2/doc/english/help/introduction.tex -share/TeXmacs-1.0.0.2/doc/english/help/keyboard.tex -share/TeXmacs-1.0.0.2/doc/english/help/russian.tm -share/TeXmacs-1.0.0.2/doc/english/help/scheme.tex -share/TeXmacs-1.0.0.2/doc/english/help/styles.tex -share/TeXmacs-1.0.0.2/doc/english/help/tables.tex -share/TeXmacs-1.0.0.2/doc/english/help/welcome.tex -share/TeXmacs-1.0.0.2/doc/english/projects/changes.tex -share/TeXmacs-1.0.0.2/doc/english/projects/helpme.tex -share/TeXmacs-1.0.0.2/doc/english/projects/projects.tex -share/TeXmacs-1.0.0.2/doc/english/projects/tochange.tex -share/TeXmacs-1.0.0.2/doc/english/source/basic.tex -share/TeXmacs-1.0.0.2/doc/english/source/boxes.tex -share/TeXmacs-1.0.0.2/doc/english/source/buffer.tex -share/TeXmacs-1.0.0.2/doc/english/source/bugs.tex -share/TeXmacs-1.0.0.2/doc/english/source/compiler.tex -share/TeXmacs-1.0.0.2/doc/english/source/convert.tex -share/TeXmacs-1.0.0.2/doc/english/source/data.tex -share/TeXmacs-1.0.0.2/doc/english/source/fonts.tex -share/TeXmacs-1.0.0.2/doc/english/source/general.tex -share/TeXmacs-1.0.0.2/doc/english/source/math.tex -share/TeXmacs-1.0.0.2/doc/english/source/window.tex -share/TeXmacs-1.0.0.2/doc/english/startup/readme.tex -share/TeXmacs-1.0.0.2/doc/english/startup/upgrade-0.tex -share/TeXmacs-1.0.0.2/doc/english/startup/upgrade-1.tex -share/TeXmacs-1.0.0.2/doc/english/startup/upgrade-2.tex -share/TeXmacs-1.0.0.2/doc/english/startup/upgrade-3.tex -share/TeXmacs-1.0.0.2/doc/romanian/help/introduction.tm -share/TeXmacs-1.0.0.2/doc/romanian/help/keyboard.tm -share/TeXmacs-1.0.0.2/doc/romanian/help/styles.tm -share/TeXmacs-1.0.0.2/fonts/enc/adobe-math.enc -share/TeXmacs-1.0.0.2/fonts/enc/cmmi.enc -share/TeXmacs-1.0.0.2/fonts/enc/cmr.enc -share/TeXmacs-1.0.0.2/fonts/enc/cmsy.enc -share/TeXmacs-1.0.0.2/fonts/enc/italic.enc -share/TeXmacs-1.0.0.2/fonts/enc/line.enc -share/TeXmacs-1.0.0.2/fonts/enc/math.enc -share/TeXmacs-1.0.0.2/fonts/enc/msam.enc -share/TeXmacs-1.0.0.2/fonts/enc/msbm.enc -share/TeXmacs-1.0.0.2/fonts/enc/rpsyr.enc -share/TeXmacs-1.0.0.2/fonts/enc/rpsyro.enc -share/TeXmacs-1.0.0.2/fonts/enc/rptmr.enc -share/TeXmacs-1.0.0.2/fonts/enc/rubber-cmex.enc -share/TeXmacs-1.0.0.2/fonts/enc/rubber-dummy.enc -share/TeXmacs-1.0.0.2/fonts/enc/rubber-stmary.enc -share/TeXmacs-1.0.0.2/fonts/enc/rubber-wasy.enc -share/TeXmacs-1.0.0.2/fonts/enc/rubber.enc -share/TeXmacs-1.0.0.2/fonts/enc/stmary.enc -share/TeXmacs-1.0.0.2/fonts/enc/var-math.enc -share/TeXmacs-1.0.0.2/fonts/enc/wasy.enc -share/TeXmacs-1.0.0.2/fonts/pk/cmex10.600pk -share/TeXmacs-1.0.0.2/fonts/pk/cmmi10.600pk -share/TeXmacs-1.0.0.2/fonts/pk/cmr10.600pk -share/TeXmacs-1.0.0.2/fonts/pk/cmr17.600pk -share/TeXmacs-1.0.0.2/fonts/pk/cmr7.600pk -share/TeXmacs-1.0.0.2/fonts/pk/cmsy10.600pk -share/TeXmacs-1.0.0.2/fonts/pk/ecbx10.600pk -share/TeXmacs-1.0.0.2/fonts/pk/ecbx17.600pk -share/TeXmacs-1.0.0.2/fonts/pk/eccc10.600pk -share/TeXmacs-1.0.0.2/fonts/pk/eccc7.600pk -share/TeXmacs-1.0.0.2/fonts/pk/ecrm10.600pk -share/TeXmacs-1.0.0.2/fonts/pk/ecrm11.300pk -share/TeXmacs-1.0.0.2/fonts/pk/ecrm7.600pk -share/TeXmacs-1.0.0.2/fonts/pk/ecss10.600pk -share/TeXmacs-1.0.0.2/fonts/pk/ectt10.600pk -share/TeXmacs-1.0.0.2/fonts/pk/ectt11.300pk -share/TeXmacs-1.0.0.2/fonts/pk/larm1000.600pk -share/TeXmacs-1.0.0.2/fonts/pk/larm1100.300pk -share/TeXmacs-1.0.0.2/fonts/pk/latt1100.300pk -share/TeXmacs-1.0.0.2/fonts/pk/msam10.600pk -share/TeXmacs-1.0.0.2/fonts/pk/msbm10.600pk -share/TeXmacs-1.0.0.2/fonts/pk/stmary10.600pk -share/TeXmacs-1.0.0.2/fonts/pk/wasy10.600pk -share/TeXmacs-1.0.0.2/fonts/tfm/cmex10.tfm -share/TeXmacs-1.0.0.2/fonts/tfm/cmmi10.tfm -share/TeXmacs-1.0.0.2/fonts/tfm/cmr10.tfm -share/TeXmacs-1.0.0.2/fonts/tfm/cmr17.tfm -share/TeXmacs-1.0.0.2/fonts/tfm/cmr7.tfm -share/TeXmacs-1.0.0.2/fonts/tfm/cmsy10.tfm -share/TeXmacs-1.0.0.2/fonts/tfm/ecbx10.tfm -share/TeXmacs-1.0.0.2/fonts/tfm/ecbx17.tfm -share/TeXmacs-1.0.0.2/fonts/tfm/eccc10.tfm -share/TeXmacs-1.0.0.2/fonts/tfm/eccc7.tfm -share/TeXmacs-1.0.0.2/fonts/tfm/ecrm10.tfm -share/TeXmacs-1.0.0.2/fonts/tfm/ecrm11.tfm -share/TeXmacs-1.0.0.2/fonts/tfm/ecrm7.tfm -share/TeXmacs-1.0.0.2/fonts/tfm/ecss10.tfm -share/TeXmacs-1.0.0.2/fonts/tfm/ectt10.tfm -share/TeXmacs-1.0.0.2/fonts/tfm/ectt11.tfm -share/TeXmacs-1.0.0.2/fonts/tfm/larm1000.tfm -share/TeXmacs-1.0.0.2/fonts/tfm/larm1100.tfm -share/TeXmacs-1.0.0.2/fonts/tfm/latt1000.tfm -share/TeXmacs-1.0.0.2/fonts/tfm/msam10.tfm -share/TeXmacs-1.0.0.2/fonts/tfm/msbm10.tfm -share/TeXmacs-1.0.0.2/fonts/tfm/stmary10.tfm -share/TeXmacs-1.0.0.2/fonts/tfm/wasy10.tfm -share/TeXmacs-1.0.0.2/fonts/virtual/long.vfn -share/TeXmacs-1.0.0.2/fonts/virtual/misc.vfn -share/TeXmacs-1.0.0.2/fonts/virtual/negate.vfn -share/TeXmacs-1.0.0.2/langs/mathematical/syntax/texmath.syx -share/TeXmacs-1.0.0.2/langs/natural/dic/english-british.scm -share/TeXmacs-1.0.0.2/langs/natural/dic/english-czech.scm -share/TeXmacs-1.0.0.2/langs/natural/dic/english-dutch.scm -share/TeXmacs-1.0.0.2/langs/natural/dic/english-french.scm -share/TeXmacs-1.0.0.2/langs/natural/dic/english-german.scm -share/TeXmacs-1.0.0.2/langs/natural/dic/english-hungarian.scm -share/TeXmacs-1.0.0.2/langs/natural/dic/english-new.scm -share/TeXmacs-1.0.0.2/langs/natural/dic/english-polish.scm -share/TeXmacs-1.0.0.2/langs/natural/dic/english-portuguese.scm -share/TeXmacs-1.0.0.2/langs/natural/dic/english-romanian.scm -share/TeXmacs-1.0.0.2/langs/natural/dic/english-russian.scm -share/TeXmacs-1.0.0.2/langs/natural/dic/english-spanish.scm -share/TeXmacs-1.0.0.2/langs/natural/dic/english-swedish.scm -share/TeXmacs-1.0.0.2/langs/natural/dic/english-ukrainian.scm -share/TeXmacs-1.0.0.2/langs/natural/hyphen/hyphen.czech -share/TeXmacs-1.0.0.2/langs/natural/hyphen/hyphen.dutch -share/TeXmacs-1.0.0.2/langs/natural/hyphen/hyphen.finnish -share/TeXmacs-1.0.0.2/langs/natural/hyphen/hyphen.french -share/TeXmacs-1.0.0.2/langs/natural/hyphen/hyphen.german -share/TeXmacs-1.0.0.2/langs/natural/hyphen/hyphen.hungarian -share/TeXmacs-1.0.0.2/langs/natural/hyphen/hyphen.polish -share/TeXmacs-1.0.0.2/langs/natural/hyphen/hyphen.portuguese -share/TeXmacs-1.0.0.2/langs/natural/hyphen/hyphen.romanian -share/TeXmacs-1.0.0.2/langs/natural/hyphen/hyphen.russian -share/TeXmacs-1.0.0.2/langs/natural/hyphen/hyphen.spanish -share/TeXmacs-1.0.0.2/langs/natural/hyphen/hyphen.swedish -share/TeXmacs-1.0.0.2/langs/natural/hyphen/hyphen.ukenglish -share/TeXmacs-1.0.0.2/langs/natural/hyphen/hyphen.ukrainian -share/TeXmacs-1.0.0.2/langs/natural/hyphen/hyphen.us -share/TeXmacs-1.0.0.2/langs/natural/hyphen/lppl.txt -share/TeXmacs-1.0.0.2/langs/natural/miss/english-polish-miss.scm -share/TeXmacs-1.0.0.2/langs/natural/miss/english-romanian-miss.scm -share/TeXmacs-1.0.0.2/langs/natural/miss/english-swedish-miss.scm -share/TeXmacs-1.0.0.2/misc/convert/color.pro -share/TeXmacs-1.0.0.2/misc/convert/html_commands -share/TeXmacs-1.0.0.2/misc/convert/latex_commands -share/TeXmacs-1.0.0.2/misc/convert/special.pro -share/TeXmacs-1.0.0.2/misc/convert/tex.pro -share/TeXmacs-1.0.0.2/misc/latex/TeXmacs.sty -share/TeXmacs-1.0.0.2/misc/latex/f2pspost.tex -share/TeXmacs-1.0.0.2/misc/maxima/texmacs.lisp -share/TeXmacs-1.0.0.2/misc/mime/texmacs.applications -share/TeXmacs-1.0.0.2/misc/mime/texmacs.desktop -share/TeXmacs-1.0.0.2/misc/mime/texmacs.keys -share/TeXmacs-1.0.0.2/misc/mime/texmacs.mime -share/TeXmacs-1.0.0.2/misc/mupad/COPYRIGHT -share/TeXmacs-1.0.0.2/misc/mupad/README -share/TeXmacs-1.0.0.2/misc/mupad/patchlib.tar -share/TeXmacs-1.0.0.2/misc/mupad/patchlib.toc -share/TeXmacs-1.0.0.2/misc/mupad/texmacs.mu -share/TeXmacs-1.0.0.2/misc/mycas/mycas.cc -share/TeXmacs-1.0.0.2/misc/pixmaps/TeXmacs-old.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/TeXmacs-solid.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/TeXmacs.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_abstract.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_acute.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_arrow.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_bar.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_bbb.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_bigleft.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_bigop.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_bigright.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_bigsep.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_binop.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_binrel.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_bold.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_books.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_breve.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_cal.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_cancel.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_cas_input.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_cell_background.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_cell_border.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_cell_bottom.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_cell_by_cell.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_cell_by_column.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_cell_by_row.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_cell_by_table.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_cell_cell.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_cell_column.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_cell_hbase.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_cell_hcenter.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_cell_height.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_cell_hexact.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_cell_hmax.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_cell_hmin.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_cell_hsep.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_cell_left.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_cell_pos.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_cell_right.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_cell_row.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_cell_size.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_cell_span.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_cell_special.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_cell_subtable.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_cell_table.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_cell_top.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_cell_vbase.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_cell_vcenter.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_cell_vexact.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_cell_vmax.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_cell_vmin.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_cell_vsep.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_cell_width.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_center.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_chapter.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_check.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_clsession.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_color.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_copy.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_cut.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_ddot.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_dead.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_decorate_down.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_decorate_left.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_decorate_right.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_decorate_up.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_description.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_dot.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_emphasize.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_empty.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_enumerate.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_exit.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_find.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_find_next.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_floating.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_floatpos.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_footnote.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_fraction.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_frak.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_grave.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_greek.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_hat.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_help.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_image.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_index.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_italic.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_item.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_itemize.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_justify.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_language.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_left.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_link.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_margin.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_math.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_mathbold.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_miscsymb.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_multicol.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_name.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_new.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_open.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_pageins.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_parindent.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_parstyle.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_paste.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_print.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_redo.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_replace.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_right.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_root.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_sansserif.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_save.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_section.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_shell.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_smallcaps.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_spell.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_sqrt.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_stop.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_strong.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_style.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_sub.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_sup.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_table.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_table_arow.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_table_bbottom.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_table_bhcenter.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_table_bleft.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_table_bottom.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_table_bright.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_table_brow.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_table_btop.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_table_bvcenter.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_table_dcol.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_table_drow.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_table_hbase.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_table_hcenter.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_table_insert.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_table_lcol.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_table_left.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_table_pos.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_table_rcol.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_table_right.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_table_special.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_table_top.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_table_vbase.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_table_vcenter.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_table_vfrac.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_test.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_theorem.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_tilda.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_title.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_typewriter.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_undo.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_vect.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/tm_verbatim.xpm -share/TeXmacs-1.0.0.2/misc/pixmaps/unknown.ps -share/TeXmacs-1.0.0.2/misc/reduce/README -share/TeXmacs-1.0.0.2/misc/reduce/patch -share/TeXmacs-1.0.0.2/misc/reduce/reducerc -share/TeXmacs-1.0.0.2/progs/boot/base.scm -share/TeXmacs-1.0.0.2/progs/boot/general.scm -share/TeXmacs-1.0.0.2/progs/boot/modify.scm -share/TeXmacs-1.0.0.2/progs/boot/style.scm -share/TeXmacs-1.0.0.2/progs/boot/table.scm -share/TeXmacs-1.0.0.2/progs/cas/convert.scm -share/TeXmacs-1.0.0.2/progs/cas/giac.scm -share/TeXmacs-1.0.0.2/progs/cas/gtybalt.scm -share/TeXmacs-1.0.0.2/progs/cas/macaulay2.scm -share/TeXmacs-1.0.0.2/progs/cas/maple.scm -share/TeXmacs-1.0.0.2/progs/cas/mathemagix.scm -share/TeXmacs-1.0.0.2/progs/cas/maxima.scm -share/TeXmacs-1.0.0.2/progs/cas/mupad.scm -share/TeXmacs-1.0.0.2/progs/cas/mycas.scm -share/TeXmacs-1.0.0.2/progs/cas/pari.scm -share/TeXmacs-1.0.0.2/progs/cas/qcl.scm -share/TeXmacs-1.0.0.2/progs/cas/reduce.scm -share/TeXmacs-1.0.0.2/progs/cas/scilab.scm -share/TeXmacs-1.0.0.2/progs/cas/yacas.scm -share/TeXmacs-1.0.0.2/progs/convert/htmlout.scm -share/TeXmacs-1.0.0.2/progs/convert/htmltest.scm -share/TeXmacs-1.0.0.2/progs/convert/output.scm -share/TeXmacs-1.0.0.2/progs/convert/texout.scm -share/TeXmacs-1.0.0.2/progs/convert/textest.scm -share/TeXmacs-1.0.0.2/progs/convert/tmpre.scm -share/TeXmacs-1.0.0.2/progs/convert/tmtex.scm -share/TeXmacs-1.0.0.2/progs/fonts/adobe-fonts.scm -share/TeXmacs-1.0.0.2/progs/fonts/cm-fonts.scm -share/TeXmacs-1.0.0.2/progs/fonts/ec-fonts.scm -share/TeXmacs-1.0.0.2/progs/fonts/foreign-fonts.scm -share/TeXmacs-1.0.0.2/progs/fonts/math-fonts.scm -share/TeXmacs-1.0.0.2/progs/fonts/misc-fonts.scm -share/TeXmacs-1.0.0.2/progs/fonts/x-fonts.scm -share/TeXmacs-1.0.0.2/progs/init-buffer.scm -share/TeXmacs-1.0.0.2/progs/init-texmacs.scm -share/TeXmacs-1.0.0.2/progs/keyboard/accents.scm -share/TeXmacs-1.0.0.2/progs/keyboard/emacs.scm -share/TeXmacs-1.0.0.2/progs/keyboard/keymaps.scm -share/TeXmacs-1.0.0.2/progs/keyboard/latex.scm -share/TeXmacs-1.0.0.2/progs/keyboard/russian/cp1251.scm -share/TeXmacs-1.0.0.2/progs/keyboard/russian/jcuken.scm -share/TeXmacs-1.0.0.2/progs/keyboard/russian/koi8.scm -share/TeXmacs-1.0.0.2/progs/keyboard/russian/translit.scm -share/TeXmacs-1.0.0.2/progs/keyboard/russian/yawerty.scm -share/TeXmacs-1.0.0.2/progs/keyboard/shorthands.scm -share/TeXmacs-1.0.0.2/progs/menu/icon-menu.scm -share/TeXmacs-1.0.0.2/progs/menu/main-menu.scm -share/TeXmacs-1.0.0.2/progs/menu/preferences.scm -share/TeXmacs-1.0.0.2/progs/menu/symbol-menu.scm -share/TeXmacs-1.0.0.2/styles/article.ts -share/TeXmacs-1.0.0.2/styles/book.ts -share/TeXmacs-1.0.0.2/styles/browser.ts -share/TeXmacs-1.0.0.2/styles/documentation/help.ts -share/TeXmacs-1.0.0.2/styles/documentation/manual.ts -share/TeXmacs-1.0.0.2/styles/documentation/tmdoc.ts -share/TeXmacs-1.0.0.2/styles/letter.ts -share/TeXmacs-1.0.0.2/styles/mathematics/acmconf.ts -share/TeXmacs-1.0.0.2/styles/obsolete/ln.ts -share/TeXmacs-1.0.0.2/styles/obsolete/project.ts -share/TeXmacs-1.0.0.2/styles/seminar.ts -share/TeXmacs-1.0.0.2/texts/examples/arg_func.tm -share/TeXmacs-1.0.0.2/texts/examples/font-test.tm -share/TeXmacs-1.0.0.2/texts/tutorial/fonts-2.tm -share/TeXmacs-1.0.0.2/texts/tutorial/fonts-3.tm -share/TeXmacs-1.0.0.2/texts/tutorial/fonts.tm -share/TeXmacs-1.0.0.2/texts/tutorial/overview.tm -@dirrm share/TeXmacs-1.0.0.2/texts/tutorial -@dirrm share/TeXmacs-1.0.0.2/texts/examples -@dirrm share/TeXmacs-1.0.0.2/texts -@exec ${MKDIR} %D/share/TeXmacs-1.0.0.2/styles/test -@dirrm share/TeXmacs-1.0.0.2/styles/test -@dirrm share/TeXmacs-1.0.0.2/styles/obsolete -@dirrm share/TeXmacs-1.0.0.2/styles/mathematics -@dirrm share/TeXmacs-1.0.0.2/styles/documentation -@dirrm share/TeXmacs-1.0.0.2/styles -@dirrm share/TeXmacs-1.0.0.2/progs/menu -@dirrm share/TeXmacs-1.0.0.2/progs/keyboard/russian -@dirrm share/TeXmacs-1.0.0.2/progs/keyboard -@dirrm share/TeXmacs-1.0.0.2/progs/fonts -@exec ${MKDIR} %D/share/TeXmacs-1.0.0.2/progs/examples -@dirrm share/TeXmacs-1.0.0.2/progs/examples -@dirrm share/TeXmacs-1.0.0.2/progs/convert -@dirrm share/TeXmacs-1.0.0.2/progs/cas -@dirrm share/TeXmacs-1.0.0.2/progs/boot -@dirrm share/TeXmacs-1.0.0.2/progs -@exec ${MKDIR} %D/share/TeXmacs-1.0.0.2/misc/tex -@dirrm share/TeXmacs-1.0.0.2/misc/tex -@dirrm share/TeXmacs-1.0.0.2/misc/reduce -@dirrm share/TeXmacs-1.0.0.2/misc/pixmaps -@dirrm share/TeXmacs-1.0.0.2/misc/mycas -@dirrm share/TeXmacs-1.0.0.2/misc/mupad -@dirrm share/TeXmacs-1.0.0.2/misc/mime -@dirrm share/TeXmacs-1.0.0.2/misc/maxima -@dirrm share/TeXmacs-1.0.0.2/misc/latex -@dirrm share/TeXmacs-1.0.0.2/misc/convert -@dirrm share/TeXmacs-1.0.0.2/misc -@exec ${MKDIR} %D/share/TeXmacs-1.0.0.2/langs/programming -@dirrm share/TeXmacs-1.0.0.2/langs/programming -@dirrm share/TeXmacs-1.0.0.2/langs/natural/miss -@dirrm share/TeXmacs-1.0.0.2/langs/natural/hyphen -@dirrm share/TeXmacs-1.0.0.2/langs/natural/dic -@dirrm share/TeXmacs-1.0.0.2/langs/natural -@dirrm share/TeXmacs-1.0.0.2/langs/mathematical/syntax -@dirrm share/TeXmacs-1.0.0.2/langs/mathematical -@dirrm share/TeXmacs-1.0.0.2/langs -@dirrm share/TeXmacs-1.0.0.2/fonts/virtual -@dirrm share/TeXmacs-1.0.0.2/fonts/tfm -@dirrm share/TeXmacs-1.0.0.2/fonts/pk -@exec ${MKDIR} %D/share/TeXmacs-1.0.0.2/fonts/error -@dirrm share/TeXmacs-1.0.0.2/fonts/error -@dirrm share/TeXmacs-1.0.0.2/fonts/enc -@dirrm share/TeXmacs-1.0.0.2/fonts -@exec ${MKDIR} %D/share/TeXmacs-1.0.0.2/doc/romanian/source -@dirrm share/TeXmacs-1.0.0.2/doc/romanian/source -@exec ${MKDIR} %D/share/TeXmacs-1.0.0.2/doc/romanian/projects -@dirrm share/TeXmacs-1.0.0.2/doc/romanian/projects -@dirrm share/TeXmacs-1.0.0.2/doc/romanian/help -@exec ${MKDIR} %D/share/TeXmacs-1.0.0.2/doc/romanian/dvi -@dirrm share/TeXmacs-1.0.0.2/doc/romanian/dvi -@dirrm share/TeXmacs-1.0.0.2/doc/romanian -@dirrm share/TeXmacs-1.0.0.2/doc/english/startup -@dirrm share/TeXmacs-1.0.0.2/doc/english/source -@dirrm share/TeXmacs-1.0.0.2/doc/english/projects -@dirrm share/TeXmacs-1.0.0.2/doc/english/help -@dirrm share/TeXmacs-1.0.0.2/doc/english -@dirrm share/TeXmacs-1.0.0.2/doc/dvi -@dirrm share/TeXmacs-1.0.0.2/doc -@dirrm share/TeXmacs-1.0.0.2 -@dirrm libexec/TeXmacs-1.0.0.2/lib -@dirrm libexec/TeXmacs-1.0.0.2/bin -@dirrm libexec/TeXmacs-1.0.0.2 +libexec/${PKGNAME}/bin/maxima_filter +libexec/${PKGNAME}/bin/mupad_filter +libexec/${PKGNAME}/bin/reduce_filter +libexec/${PKGNAME}/bin/reduce_setup +libexec/${PKGNAME}/bin/texmacs.bin +libexec/${PKGNAME}/bin/tm_axiom +libexec/${PKGNAME}/bin/tm_maple +libexec/${PKGNAME}/bin/tm_maxima +libexec/${PKGNAME}/bin/tm_mupad +libexec/${PKGNAME}/bin/tm_mupad_help +libexec/${PKGNAME}/bin/tm_reduce +libexec/${PKGNAME}/lib/libbasic.so +libexec/${PKGNAME}/lib/libconvert.so +libexec/${PKGNAME}/lib/libedit.so +libexec/${PKGNAME}/lib/libglue.so +libexec/${PKGNAME}/lib/libresource.so +libexec/${PKGNAME}/lib/libserver.so +libexec/${PKGNAME}/lib/libtypeset.so +libexec/${PKGNAME}/lib/libwindow.so +man/man1/fig2ps.1 +man/man1/texmacs.1 +share/${PKGNAME}/LICENSE +share/${PKGNAME}/doc/dvi/texmacs.dvi +share/${PKGNAME}/doc/dvi/texmacs.tex +share/${PKGNAME}/doc/english/help/about.tex +share/${PKGNAME}/doc/english/help/advanced.tex +share/${PKGNAME}/doc/english/help/compatibility.tex +share/${PKGNAME}/doc/english/help/interface.tex +share/${PKGNAME}/doc/english/help/introduction.tex +share/${PKGNAME}/doc/english/help/itf_customize.tex +share/${PKGNAME}/doc/english/help/itf_example.tex +share/${PKGNAME}/doc/english/help/itf_first.tex +share/${PKGNAME}/doc/english/help/itf_include.tex +share/${PKGNAME}/doc/english/help/itf_projects.tex +share/${PKGNAME}/doc/english/help/itf_protocol.tex +share/${PKGNAME}/doc/english/help/keyboard.tex +share/${PKGNAME}/doc/english/help/russian.tm +share/${PKGNAME}/doc/english/help/scheme.tex +share/${PKGNAME}/doc/english/help/session.tex +share/${PKGNAME}/doc/english/help/styles.tex +share/${PKGNAME}/doc/english/help/tables.tex +share/${PKGNAME}/doc/english/help/welcome.tex +share/${PKGNAME}/doc/english/projects/changes.tex +share/${PKGNAME}/doc/english/projects/helpme.tex +share/${PKGNAME}/doc/english/projects/projects.tex +share/${PKGNAME}/doc/english/projects/tochange.tex +share/${PKGNAME}/doc/english/source/basic.tex +share/${PKGNAME}/doc/english/source/boxes.tex +share/${PKGNAME}/doc/english/source/buffer.tex +share/${PKGNAME}/doc/english/source/bugs.tex +share/${PKGNAME}/doc/english/source/compiler.tex +share/${PKGNAME}/doc/english/source/convert.tex +share/${PKGNAME}/doc/english/source/data.tex +share/${PKGNAME}/doc/english/source/fonts.tex +share/${PKGNAME}/doc/english/source/general.tex +share/${PKGNAME}/doc/english/source/math.tex +share/${PKGNAME}/doc/english/source/window.tex +share/${PKGNAME}/doc/english/startup/readme.tex +share/${PKGNAME}/doc/english/startup/upgrade-0.tex +share/${PKGNAME}/doc/english/startup/upgrade-1.tex +share/${PKGNAME}/doc/english/startup/upgrade-2.tex +share/${PKGNAME}/doc/english/startup/upgrade-3.tex +share/${PKGNAME}/doc/english/startup/upgrade-4.tex +share/${PKGNAME}/doc/english/startup/upgrade-5.tex +share/${PKGNAME}/doc/romanian/help/introduction.tm +share/${PKGNAME}/doc/romanian/help/keyboard.tm +share/${PKGNAME}/doc/romanian/help/styles.tm +share/${PKGNAME}/doc/spanish/help/advanced.tm +share/${PKGNAME}/doc/spanish/help/compatibility.tm +share/${PKGNAME}/doc/spanish/help/introduction.tm +share/${PKGNAME}/doc/spanish/help/keyboard.tm +share/${PKGNAME}/doc/spanish/help/styles.tm +share/${PKGNAME}/doc/spanish/help/tables.tm +share/${PKGNAME}/doc/spanish/help/welcome.tm +share/${PKGNAME}/fonts/enc/adobe-math.enc +share/${PKGNAME}/fonts/enc/alphanum-math.enc +share/${PKGNAME}/fonts/enc/alphanum.enc +share/${PKGNAME}/fonts/enc/bold-rpsyr.enc +share/${PKGNAME}/fonts/enc/bold-rpsyro.enc +share/${PKGNAME}/fonts/enc/bold-rptmr.enc +share/${PKGNAME}/fonts/enc/capital-math.enc +share/${PKGNAME}/fonts/enc/capital.enc +share/${PKGNAME}/fonts/enc/cmmi.enc +share/${PKGNAME}/fonts/enc/cmr.enc +share/${PKGNAME}/fonts/enc/cmsy.enc +share/${PKGNAME}/fonts/enc/enr-math.enc +share/${PKGNAME}/fonts/enc/enr.enc +share/${PKGNAME}/fonts/enc/italic.enc +share/${PKGNAME}/fonts/enc/line.enc +share/${PKGNAME}/fonts/enc/math-bbb.enc +share/${PKGNAME}/fonts/enc/math-bold-1.enc +share/${PKGNAME}/fonts/enc/math-bold-2.enc +share/${PKGNAME}/fonts/enc/math-bold-cal.enc +share/${PKGNAME}/fonts/enc/math-cal.enc +share/${PKGNAME}/fonts/enc/math-frak.enc +share/${PKGNAME}/fonts/enc/math.enc +share/${PKGNAME}/fonts/enc/msam.enc +share/${PKGNAME}/fonts/enc/msbm.enc +share/${PKGNAME}/fonts/enc/rpsyr.enc +share/${PKGNAME}/fonts/enc/rpsyro.enc +share/${PKGNAME}/fonts/enc/rptmr.enc +share/${PKGNAME}/fonts/enc/rubber-cmex.enc +share/${PKGNAME}/fonts/enc/rubber-dummy.enc +share/${PKGNAME}/fonts/enc/rubber-stmary.enc +share/${PKGNAME}/fonts/enc/rubber-wasy.enc +share/${PKGNAME}/fonts/enc/rubber.enc +share/${PKGNAME}/fonts/enc/stmary.enc +share/${PKGNAME}/fonts/enc/var-math.enc +share/${PKGNAME}/fonts/enc/wasy.enc +share/${PKGNAME}/fonts/pk/cmex10.600pk +share/${PKGNAME}/fonts/pk/cmmi10.600pk +share/${PKGNAME}/fonts/pk/cmr10.600pk +share/${PKGNAME}/fonts/pk/cmr17.600pk +share/${PKGNAME}/fonts/pk/cmr7.600pk +share/${PKGNAME}/fonts/pk/cmsy10.600pk +share/${PKGNAME}/fonts/pk/ecbx10.600pk +share/${PKGNAME}/fonts/pk/ecbx17.600pk +share/${PKGNAME}/fonts/pk/eccc10.600pk +share/${PKGNAME}/fonts/pk/eccc7.600pk +share/${PKGNAME}/fonts/pk/ecrm10.600pk +share/${PKGNAME}/fonts/pk/ecrm11.300pk +share/${PKGNAME}/fonts/pk/ecrm7.600pk +share/${PKGNAME}/fonts/pk/ecss10.600pk +share/${PKGNAME}/fonts/pk/ectt10.600pk +share/${PKGNAME}/fonts/pk/ectt11.300pk +share/${PKGNAME}/fonts/pk/larm1000.600pk +share/${PKGNAME}/fonts/pk/larm1100.300pk +share/${PKGNAME}/fonts/pk/latt1100.300pk +share/${PKGNAME}/fonts/pk/msam10.600pk +share/${PKGNAME}/fonts/pk/msbm10.600pk +share/${PKGNAME}/fonts/pk/stmary10.600pk +share/${PKGNAME}/fonts/pk/wasy10.600pk +share/${PKGNAME}/fonts/tfm/cmex10.tfm +share/${PKGNAME}/fonts/tfm/cmmi10.tfm +share/${PKGNAME}/fonts/tfm/cmr10.tfm +share/${PKGNAME}/fonts/tfm/cmr17.tfm +share/${PKGNAME}/fonts/tfm/cmr7.tfm +share/${PKGNAME}/fonts/tfm/cmsy10.tfm +share/${PKGNAME}/fonts/tfm/ecbx10.tfm +share/${PKGNAME}/fonts/tfm/ecbx17.tfm +share/${PKGNAME}/fonts/tfm/eccc10.tfm +share/${PKGNAME}/fonts/tfm/eccc7.tfm +share/${PKGNAME}/fonts/tfm/ecrm10.tfm +share/${PKGNAME}/fonts/tfm/ecrm11.tfm +share/${PKGNAME}/fonts/tfm/ecrm7.tfm +share/${PKGNAME}/fonts/tfm/ecss10.tfm +share/${PKGNAME}/fonts/tfm/ectt10.tfm +share/${PKGNAME}/fonts/tfm/ectt11.tfm +share/${PKGNAME}/fonts/tfm/larm1000.tfm +share/${PKGNAME}/fonts/tfm/larm1100.tfm +share/${PKGNAME}/fonts/tfm/latt1000.tfm +share/${PKGNAME}/fonts/tfm/msam10.tfm +share/${PKGNAME}/fonts/tfm/msbm10.tfm +share/${PKGNAME}/fonts/tfm/stmary10.tfm +share/${PKGNAME}/fonts/tfm/wasy10.tfm +share/${PKGNAME}/fonts/virtual/long.vfn +share/${PKGNAME}/fonts/virtual/misc.vfn +share/${PKGNAME}/fonts/virtual/negate.vfn +share/${PKGNAME}/langs/mathematical/syntax/texmath.syx +share/${PKGNAME}/langs/natural/dic/english-british.scm +share/${PKGNAME}/langs/natural/dic/english-czech.scm +share/${PKGNAME}/langs/natural/dic/english-dutch.scm +share/${PKGNAME}/langs/natural/dic/english-french.scm +share/${PKGNAME}/langs/natural/dic/english-german.scm +share/${PKGNAME}/langs/natural/dic/english-hungarian.scm +share/${PKGNAME}/langs/natural/dic/english-italian.scm +share/${PKGNAME}/langs/natural/dic/english-new.scm +share/${PKGNAME}/langs/natural/dic/english-polish.scm +share/${PKGNAME}/langs/natural/dic/english-portuguese.scm +share/${PKGNAME}/langs/natural/dic/english-romanian.scm +share/${PKGNAME}/langs/natural/dic/english-russian.scm +share/${PKGNAME}/langs/natural/dic/english-spanish.scm +share/${PKGNAME}/langs/natural/dic/english-swedish.scm +share/${PKGNAME}/langs/natural/dic/english-ukrainian.scm +share/${PKGNAME}/langs/natural/hyphen/hyphen.czech +share/${PKGNAME}/langs/natural/hyphen/hyphen.dutch +share/${PKGNAME}/langs/natural/hyphen/hyphen.finnish +share/${PKGNAME}/langs/natural/hyphen/hyphen.french +share/${PKGNAME}/langs/natural/hyphen/hyphen.german +share/${PKGNAME}/langs/natural/hyphen/hyphen.hungarian +share/${PKGNAME}/langs/natural/hyphen/hyphen.italian +share/${PKGNAME}/langs/natural/hyphen/hyphen.polish +share/${PKGNAME}/langs/natural/hyphen/hyphen.portuguese +share/${PKGNAME}/langs/natural/hyphen/hyphen.romanian +share/${PKGNAME}/langs/natural/hyphen/hyphen.russian +share/${PKGNAME}/langs/natural/hyphen/hyphen.spanish +share/${PKGNAME}/langs/natural/hyphen/hyphen.swedish +share/${PKGNAME}/langs/natural/hyphen/hyphen.ukenglish +share/${PKGNAME}/langs/natural/hyphen/hyphen.ukrainian +share/${PKGNAME}/langs/natural/hyphen/hyphen.us +share/${PKGNAME}/langs/natural/hyphen/lppl.txt +share/${PKGNAME}/langs/natural/miss/english-italian-miss.scm +share/${PKGNAME}/langs/natural/miss/english-polish-miss.scm +share/${PKGNAME}/langs/natural/miss/english-romanian-miss.scm +share/${PKGNAME}/langs/natural/miss/english-swedish-miss.scm +share/${PKGNAME}/misc/convert/color.pro +share/${PKGNAME}/misc/convert/html_commands +share/${PKGNAME}/misc/convert/latex_commands +share/${PKGNAME}/misc/convert/special.pro +share/${PKGNAME}/misc/convert/tex.pro +share/${PKGNAME}/misc/latex/TeXmacs.sty +share/${PKGNAME}/misc/latex/f2pspost.tex +share/${PKGNAME}/misc/maxima/texmacs.lisp +share/${PKGNAME}/misc/mime/texmacs.applications +share/${PKGNAME}/misc/mime/texmacs.desktop +share/${PKGNAME}/misc/mime/texmacs.keys +share/${PKGNAME}/misc/mime/texmacs.mime +share/${PKGNAME}/misc/mupad/texmacs.mu +share/${PKGNAME}/misc/mycas/mycas.cc +share/${PKGNAME}/misc/pixmaps/TeXmacs-old.xpm +share/${PKGNAME}/misc/pixmaps/TeXmacs-solid.xpm +share/${PKGNAME}/misc/pixmaps/TeXmacs.xpm +share/${PKGNAME}/misc/pixmaps/tm_abstract.xpm +share/${PKGNAME}/misc/pixmaps/tm_acute.xpm +share/${PKGNAME}/misc/pixmaps/tm_arrow.xpm +share/${PKGNAME}/misc/pixmaps/tm_bar.xpm +share/${PKGNAME}/misc/pixmaps/tm_bbb.xpm +share/${PKGNAME}/misc/pixmaps/tm_bigleft.xpm +share/${PKGNAME}/misc/pixmaps/tm_bigop.xpm +share/${PKGNAME}/misc/pixmaps/tm_bigright.xpm +share/${PKGNAME}/misc/pixmaps/tm_bigsep.xpm +share/${PKGNAME}/misc/pixmaps/tm_binop.xpm +share/${PKGNAME}/misc/pixmaps/tm_binrel.xpm +share/${PKGNAME}/misc/pixmaps/tm_bold.xpm +share/${PKGNAME}/misc/pixmaps/tm_books.xpm +share/${PKGNAME}/misc/pixmaps/tm_breve.xpm +share/${PKGNAME}/misc/pixmaps/tm_cal.xpm +share/${PKGNAME}/misc/pixmaps/tm_cancel.xpm +share/${PKGNAME}/misc/pixmaps/tm_cas_input.xpm +share/${PKGNAME}/misc/pixmaps/tm_cell_background.xpm +share/${PKGNAME}/misc/pixmaps/tm_cell_border.xpm +share/${PKGNAME}/misc/pixmaps/tm_cell_bottom.xpm +share/${PKGNAME}/misc/pixmaps/tm_cell_by_cell.xpm +share/${PKGNAME}/misc/pixmaps/tm_cell_by_column.xpm +share/${PKGNAME}/misc/pixmaps/tm_cell_by_row.xpm +share/${PKGNAME}/misc/pixmaps/tm_cell_by_table.xpm +share/${PKGNAME}/misc/pixmaps/tm_cell_cell.xpm +share/${PKGNAME}/misc/pixmaps/tm_cell_column.xpm +share/${PKGNAME}/misc/pixmaps/tm_cell_hbase.xpm +share/${PKGNAME}/misc/pixmaps/tm_cell_hcenter.xpm +share/${PKGNAME}/misc/pixmaps/tm_cell_height.xpm +share/${PKGNAME}/misc/pixmaps/tm_cell_hexact.xpm +share/${PKGNAME}/misc/pixmaps/tm_cell_hmax.xpm +share/${PKGNAME}/misc/pixmaps/tm_cell_hmin.xpm +share/${PKGNAME}/misc/pixmaps/tm_cell_hsep.xpm +share/${PKGNAME}/misc/pixmaps/tm_cell_left.xpm +share/${PKGNAME}/misc/pixmaps/tm_cell_pos.xpm +share/${PKGNAME}/misc/pixmaps/tm_cell_right.xpm +share/${PKGNAME}/misc/pixmaps/tm_cell_row.xpm +share/${PKGNAME}/misc/pixmaps/tm_cell_size.xpm +share/${PKGNAME}/misc/pixmaps/tm_cell_span.xpm +share/${PKGNAME}/misc/pixmaps/tm_cell_special.xpm +share/${PKGNAME}/misc/pixmaps/tm_cell_subtable.xpm +share/${PKGNAME}/misc/pixmaps/tm_cell_table.xpm +share/${PKGNAME}/misc/pixmaps/tm_cell_top.xpm +share/${PKGNAME}/misc/pixmaps/tm_cell_vbase.xpm +share/${PKGNAME}/misc/pixmaps/tm_cell_vcenter.xpm +share/${PKGNAME}/misc/pixmaps/tm_cell_vexact.xpm +share/${PKGNAME}/misc/pixmaps/tm_cell_vmax.xpm +share/${PKGNAME}/misc/pixmaps/tm_cell_vmin.xpm +share/${PKGNAME}/misc/pixmaps/tm_cell_vsep.xpm +share/${PKGNAME}/misc/pixmaps/tm_cell_width.xpm +share/${PKGNAME}/misc/pixmaps/tm_center.xpm +share/${PKGNAME}/misc/pixmaps/tm_chapter.xpm +share/${PKGNAME}/misc/pixmaps/tm_check.xpm +share/${PKGNAME}/misc/pixmaps/tm_clsession.xpm +share/${PKGNAME}/misc/pixmaps/tm_color.xpm +share/${PKGNAME}/misc/pixmaps/tm_copy.xpm +share/${PKGNAME}/misc/pixmaps/tm_cut.xpm +share/${PKGNAME}/misc/pixmaps/tm_ddot.xpm +share/${PKGNAME}/misc/pixmaps/tm_dead.xpm +share/${PKGNAME}/misc/pixmaps/tm_decorate_down.xpm +share/${PKGNAME}/misc/pixmaps/tm_decorate_left.xpm +share/${PKGNAME}/misc/pixmaps/tm_decorate_right.xpm +share/${PKGNAME}/misc/pixmaps/tm_decorate_up.xpm +share/${PKGNAME}/misc/pixmaps/tm_description.xpm +share/${PKGNAME}/misc/pixmaps/tm_dot.xpm +share/${PKGNAME}/misc/pixmaps/tm_emphasize.xpm +share/${PKGNAME}/misc/pixmaps/tm_empty.xpm +share/${PKGNAME}/misc/pixmaps/tm_enumerate.xpm +share/${PKGNAME}/misc/pixmaps/tm_exit.xpm +share/${PKGNAME}/misc/pixmaps/tm_find.xpm +share/${PKGNAME}/misc/pixmaps/tm_find_next.xpm +share/${PKGNAME}/misc/pixmaps/tm_floating.xpm +share/${PKGNAME}/misc/pixmaps/tm_floatpos.xpm +share/${PKGNAME}/misc/pixmaps/tm_footnote.xpm +share/${PKGNAME}/misc/pixmaps/tm_fraction.xpm +share/${PKGNAME}/misc/pixmaps/tm_frak.xpm +share/${PKGNAME}/misc/pixmaps/tm_grave.xpm +share/${PKGNAME}/misc/pixmaps/tm_greek.xpm +share/${PKGNAME}/misc/pixmaps/tm_hat.xpm +share/${PKGNAME}/misc/pixmaps/tm_help.xpm +share/${PKGNAME}/misc/pixmaps/tm_image.xpm +share/${PKGNAME}/misc/pixmaps/tm_index.xpm +share/${PKGNAME}/misc/pixmaps/tm_italic.xpm +share/${PKGNAME}/misc/pixmaps/tm_item.xpm +share/${PKGNAME}/misc/pixmaps/tm_itemize.xpm +share/${PKGNAME}/misc/pixmaps/tm_justify.xpm +share/${PKGNAME}/misc/pixmaps/tm_language.xpm +share/${PKGNAME}/misc/pixmaps/tm_left.xpm +share/${PKGNAME}/misc/pixmaps/tm_link.xpm +share/${PKGNAME}/misc/pixmaps/tm_margin.xpm +share/${PKGNAME}/misc/pixmaps/tm_math.xpm +share/${PKGNAME}/misc/pixmaps/tm_mathbold.xpm +share/${PKGNAME}/misc/pixmaps/tm_miscsymb.xpm +share/${PKGNAME}/misc/pixmaps/tm_multicol.xpm +share/${PKGNAME}/misc/pixmaps/tm_name.xpm +share/${PKGNAME}/misc/pixmaps/tm_new.xpm +share/${PKGNAME}/misc/pixmaps/tm_open.xpm +share/${PKGNAME}/misc/pixmaps/tm_pageins.xpm +share/${PKGNAME}/misc/pixmaps/tm_parindent.xpm +share/${PKGNAME}/misc/pixmaps/tm_parstyle.xpm +share/${PKGNAME}/misc/pixmaps/tm_paste.xpm +share/${PKGNAME}/misc/pixmaps/tm_print.xpm +share/${PKGNAME}/misc/pixmaps/tm_redo.xpm +share/${PKGNAME}/misc/pixmaps/tm_replace.xpm +share/${PKGNAME}/misc/pixmaps/tm_right.xpm +share/${PKGNAME}/misc/pixmaps/tm_root.xpm +share/${PKGNAME}/misc/pixmaps/tm_sansserif.xpm +share/${PKGNAME}/misc/pixmaps/tm_save.xpm +share/${PKGNAME}/misc/pixmaps/tm_section.xpm +share/${PKGNAME}/misc/pixmaps/tm_shell.xpm +share/${PKGNAME}/misc/pixmaps/tm_smallcaps.xpm +share/${PKGNAME}/misc/pixmaps/tm_spell.xpm +share/${PKGNAME}/misc/pixmaps/tm_sqrt.xpm +share/${PKGNAME}/misc/pixmaps/tm_stop.xpm +share/${PKGNAME}/misc/pixmaps/tm_strong.xpm +share/${PKGNAME}/misc/pixmaps/tm_style.xpm +share/${PKGNAME}/misc/pixmaps/tm_sub.xpm +share/${PKGNAME}/misc/pixmaps/tm_sup.xpm +share/${PKGNAME}/misc/pixmaps/tm_switch.xpm +share/${PKGNAME}/misc/pixmaps/tm_table.xpm +share/${PKGNAME}/misc/pixmaps/tm_table_arow.xpm +share/${PKGNAME}/misc/pixmaps/tm_table_bbottom.xpm +share/${PKGNAME}/misc/pixmaps/tm_table_bhcenter.xpm +share/${PKGNAME}/misc/pixmaps/tm_table_bleft.xpm +share/${PKGNAME}/misc/pixmaps/tm_table_bottom.xpm +share/${PKGNAME}/misc/pixmaps/tm_table_bright.xpm +share/${PKGNAME}/misc/pixmaps/tm_table_brow.xpm +share/${PKGNAME}/misc/pixmaps/tm_table_btop.xpm +share/${PKGNAME}/misc/pixmaps/tm_table_bvcenter.xpm +share/${PKGNAME}/misc/pixmaps/tm_table_dcol.xpm +share/${PKGNAME}/misc/pixmaps/tm_table_drow.xpm +share/${PKGNAME}/misc/pixmaps/tm_table_hbase.xpm +share/${PKGNAME}/misc/pixmaps/tm_table_hcenter.xpm +share/${PKGNAME}/misc/pixmaps/tm_table_insert.xpm +share/${PKGNAME}/misc/pixmaps/tm_table_lcol.xpm +share/${PKGNAME}/misc/pixmaps/tm_table_left.xpm +share/${PKGNAME}/misc/pixmaps/tm_table_pos.xpm +share/${PKGNAME}/misc/pixmaps/tm_table_rcol.xpm +share/${PKGNAME}/misc/pixmaps/tm_table_right.xpm +share/${PKGNAME}/misc/pixmaps/tm_table_special.xpm +share/${PKGNAME}/misc/pixmaps/tm_table_top.xpm +share/${PKGNAME}/misc/pixmaps/tm_table_vbase.xpm +share/${PKGNAME}/misc/pixmaps/tm_table_vcenter.xpm +share/${PKGNAME}/misc/pixmaps/tm_table_vfrac.xpm +share/${PKGNAME}/misc/pixmaps/tm_test.xpm +share/${PKGNAME}/misc/pixmaps/tm_theorem.xpm +share/${PKGNAME}/misc/pixmaps/tm_tilda.xpm +share/${PKGNAME}/misc/pixmaps/tm_title.xpm +share/${PKGNAME}/misc/pixmaps/tm_typewriter.xpm +share/${PKGNAME}/misc/pixmaps/tm_undo.xpm +share/${PKGNAME}/misc/pixmaps/tm_vect.xpm +share/${PKGNAME}/misc/pixmaps/tm_verbatim.xpm +share/${PKGNAME}/misc/pixmaps/unknown.ps +share/${PKGNAME}/misc/reduce/README +share/${PKGNAME}/misc/reduce/patch +share/${PKGNAME}/misc/reduce/reducerc +share/${PKGNAME}/packages/common-base.ts +share/${PKGNAME}/packages/environment/env-default.ts +share/${PKGNAME}/packages/environment/env-europe.ts +share/${PKGNAME}/packages/environment/env-float.ts +share/${PKGNAME}/packages/environment/env-math.ts +share/${PKGNAME}/packages/environment/env-theorem.ts +share/${PKGNAME}/packages/environment/env-us.ts +share/${PKGNAME}/packages/example/allouche.ts +share/${PKGNAME}/packages/example/vdh.ts +share/${PKGNAME}/packages/header/header-article.ts +share/${PKGNAME}/packages/header/header-book.ts +share/${PKGNAME}/packages/header/header-exam.ts +share/${PKGNAME}/packages/header/header-generic.ts +share/${PKGNAME}/packages/header/header-letter.ts +share/${PKGNAME}/packages/header/header-seminar.ts +share/${PKGNAME}/packages/header/mathematics/header-acmconf.ts +share/${PKGNAME}/packages/header/mathematics/header-amsart.ts +share/${PKGNAME}/packages/header/mathematics/header-jsc.ts +share/${PKGNAME}/packages/number/number-article.ts +share/${PKGNAME}/packages/number/number-book.ts +share/${PKGNAME}/packages/number/number-europe.ts +share/${PKGNAME}/packages/number/number-trivial.ts +share/${PKGNAME}/packages/number/number-us.ts +share/${PKGNAME}/packages/program/program.ts +share/${PKGNAME}/packages/section/mathematics/section-acmconf.ts +share/${PKGNAME}/packages/section/mathematics/section-amsart.ts +share/${PKGNAME}/packages/section/mathematics/section-jsc.ts +share/${PKGNAME}/packages/section/section-article.ts +share/${PKGNAME}/packages/section/section-automatic-long.ts +share/${PKGNAME}/packages/section/section-automatic-short.ts +share/${PKGNAME}/packages/section/section-book.ts +share/${PKGNAME}/packages/section/section-generic.ts +share/${PKGNAME}/packages/section/section-seminar.ts +share/${PKGNAME}/packages/session/axiom.ts +share/${PKGNAME}/packages/session/giac.ts +share/${PKGNAME}/packages/session/gtybalt.ts +share/${PKGNAME}/packages/session/macaulay2.ts +share/${PKGNAME}/packages/session/maple.ts +share/${PKGNAME}/packages/session/mathemagix.ts +share/${PKGNAME}/packages/session/maxima.ts +share/${PKGNAME}/packages/session/mupad.ts +share/${PKGNAME}/packages/session/mycas.ts +share/${PKGNAME}/packages/session/pari.ts +share/${PKGNAME}/packages/session/qcl.ts +share/${PKGNAME}/packages/session/reduce.ts +share/${PKGNAME}/packages/session/scilab.ts +share/${PKGNAME}/packages/session/yacas.ts +share/${PKGNAME}/packages/standard/std-automatic.ts +share/${PKGNAME}/packages/standard/std-list.ts +share/${PKGNAME}/packages/standard/std-markup.ts +share/${PKGNAME}/packages/standard/std-math.ts +share/${PKGNAME}/packages/standard/std-symbol.ts +share/${PKGNAME}/packages/test/algo.ts +share/${PKGNAME}/progs/boot/base.scm +share/${PKGNAME}/progs/boot/fold.scm +share/${PKGNAME}/progs/boot/general.scm +share/${PKGNAME}/progs/boot/modify.scm +share/${PKGNAME}/progs/boot/preferences.scm +share/${PKGNAME}/progs/boot/style.scm +share/${PKGNAME}/progs/boot/table.scm +share/${PKGNAME}/progs/cas/axiom.scm +share/${PKGNAME}/progs/cas/convert.scm +share/${PKGNAME}/progs/cas/giac.scm +share/${PKGNAME}/progs/cas/gtybalt.scm +share/${PKGNAME}/progs/cas/macaulay2.scm +share/${PKGNAME}/progs/cas/maple.scm +share/${PKGNAME}/progs/cas/mathemagix.scm +share/${PKGNAME}/progs/cas/maxima.scm +share/${PKGNAME}/progs/cas/mupad.scm +share/${PKGNAME}/progs/cas/mycas.scm +share/${PKGNAME}/progs/cas/pari.scm +share/${PKGNAME}/progs/cas/qcl.scm +share/${PKGNAME}/progs/cas/reduce.scm +share/${PKGNAME}/progs/cas/scilab.scm +share/${PKGNAME}/progs/cas/yacas.scm +share/${PKGNAME}/progs/convert/htmlout.scm +share/${PKGNAME}/progs/convert/htmltest.scm +share/${PKGNAME}/progs/convert/output.scm +share/${PKGNAME}/progs/convert/texout.scm +share/${PKGNAME}/progs/convert/textest.scm +share/${PKGNAME}/progs/convert/tmpre.scm +share/${PKGNAME}/progs/convert/tmtex.scm +share/${PKGNAME}/progs/fonts/adobe-fonts.scm +share/${PKGNAME}/progs/fonts/cm-fonts.scm +share/${PKGNAME}/progs/fonts/ec-fonts.scm +share/${PKGNAME}/progs/fonts/foreign-fonts.scm +share/${PKGNAME}/progs/fonts/math-fonts.scm +share/${PKGNAME}/progs/fonts/misc-fonts.scm +share/${PKGNAME}/progs/fonts/x-fonts.scm +share/${PKGNAME}/progs/init-buffer.scm +share/${PKGNAME}/progs/init-texmacs.scm +share/${PKGNAME}/progs/keyboard/accents.scm +share/${PKGNAME}/progs/keyboard/emacs.scm +share/${PKGNAME}/progs/keyboard/keymaps.scm +share/${PKGNAME}/progs/keyboard/latex.scm +share/${PKGNAME}/progs/keyboard/russian/cp1251.scm +share/${PKGNAME}/progs/keyboard/russian/jcuken.scm +share/${PKGNAME}/progs/keyboard/russian/koi8.scm +share/${PKGNAME}/progs/keyboard/russian/translit.scm +share/${PKGNAME}/progs/keyboard/russian/yawerty.scm +share/${PKGNAME}/progs/keyboard/shorthands.scm +share/${PKGNAME}/progs/menu/icon-menu.scm +share/${PKGNAME}/progs/menu/main-menu.scm +share/${PKGNAME}/progs/menu/symbol-menu.scm +share/${PKGNAME}/styles/article.ts +share/${PKGNAME}/styles/book.ts +share/${PKGNAME}/styles/documentation/browser.ts +share/${PKGNAME}/styles/documentation/help.ts +share/${PKGNAME}/styles/documentation/manual.ts +share/${PKGNAME}/styles/documentation/tmdoc.ts +share/${PKGNAME}/styles/exam.ts +share/${PKGNAME}/styles/generic.ts +share/${PKGNAME}/styles/letter.ts +share/${PKGNAME}/styles/mathematics/acmconf.ts +share/${PKGNAME}/styles/mathematics/amsart.ts +share/${PKGNAME}/styles/mathematics/jsc.ts +share/${PKGNAME}/styles/obsolete/project.ts +share/${PKGNAME}/styles/seminar.ts +share/${PKGNAME}/styles/test/tmarticle.ts +share/${PKGNAME}/styles/test/tmbook.ts +share/${PKGNAME}/texts/examples/arg_func.tm +share/${PKGNAME}/texts/examples/font-test.tm +share/${PKGNAME}/texts/tutorial/fonts-2.tm +share/${PKGNAME}/texts/tutorial/fonts-3.tm +share/${PKGNAME}/texts/tutorial/fonts.tm +share/${PKGNAME}/texts/tutorial/overview.tm +@dirrm share/${PKGNAME}/texts/tutorial +@dirrm share/${PKGNAME}/texts/examples +@dirrm share/${PKGNAME}/texts +@dirrm share/${PKGNAME}/styles/test +@dirrm share/${PKGNAME}/styles/obsolete +@dirrm share/${PKGNAME}/styles/mathematics +@dirrm share/${PKGNAME}/styles/documentation +@dirrm share/${PKGNAME}/styles +@dirrm share/${PKGNAME}/progs/menu +@dirrm share/${PKGNAME}/progs/keyboard/russian +@dirrm share/${PKGNAME}/progs/keyboard +@dirrm share/${PKGNAME}/progs/fonts +@exec ${MKDIR} %D/share/${PKGNAME}/progs/examples +@dirrm share/${PKGNAME}/progs/examples +@dirrm share/${PKGNAME}/progs/convert +@dirrm share/${PKGNAME}/progs/cas +@dirrm share/${PKGNAME}/progs/boot +@dirrm share/${PKGNAME}/progs +@dirrm share/${PKGNAME}/packages/test +@dirrm share/${PKGNAME}/packages/standard +@dirrm share/${PKGNAME}/packages/session +@dirrm share/${PKGNAME}/packages/section/mathematics +@dirrm share/${PKGNAME}/packages/section +@dirrm share/${PKGNAME}/packages/program +@dirrm share/${PKGNAME}/packages/number +@dirrm share/${PKGNAME}/packages/header/mathematics +@dirrm share/${PKGNAME}/packages/header +@dirrm share/${PKGNAME}/packages/example +@dirrm share/${PKGNAME}/packages/environment +@exec ${MKDIR} %D/share/${PKGNAME}/packages/documentation +@dirrm share/${PKGNAME}/packages/documentation +@dirrm share/${PKGNAME}/packages +@exec ${MKDIR} %D/share/${PKGNAME}/misc/tex +@dirrm share/${PKGNAME}/misc/tex +@dirrm share/${PKGNAME}/misc/reduce +@dirrm share/${PKGNAME}/misc/pixmaps +@dirrm share/${PKGNAME}/misc/mycas +@dirrm share/${PKGNAME}/misc/mupad +@dirrm share/${PKGNAME}/misc/mime +@dirrm share/${PKGNAME}/misc/maxima +@dirrm share/${PKGNAME}/misc/latex +@dirrm share/${PKGNAME}/misc/convert +@dirrm share/${PKGNAME}/misc +@exec ${MKDIR} %D/share/${PKGNAME}/langs/programming +@dirrm share/${PKGNAME}/langs/programming +@dirrm share/${PKGNAME}/langs/natural/miss +@dirrm share/${PKGNAME}/langs/natural/hyphen +@dirrm share/${PKGNAME}/langs/natural/dic +@dirrm share/${PKGNAME}/langs/natural +@dirrm share/${PKGNAME}/langs/mathematical/syntax +@dirrm share/${PKGNAME}/langs/mathematical +@dirrm share/${PKGNAME}/langs +@dirrm share/${PKGNAME}/fonts/virtual +@dirrm share/${PKGNAME}/fonts/tfm +@dirrm share/${PKGNAME}/fonts/pk +@exec ${MKDIR} %D/share/${PKGNAME}/fonts/error +@dirrm share/${PKGNAME}/fonts/error +@dirrm share/${PKGNAME}/fonts/enc +@dirrm share/${PKGNAME}/fonts +@exec ${MKDIR} %D/share/${PKGNAME}/doc/spanish/source +@dirrm share/${PKGNAME}/doc/spanish/source +@exec ${MKDIR} %D/share/${PKGNAME}/doc/spanish/projects +@dirrm share/${PKGNAME}/doc/spanish/projects +@dirrm share/${PKGNAME}/doc/spanish/help +@dirrm share/${PKGNAME}/doc/spanish +@exec ${MKDIR} %D/share/${PKGNAME}/doc/romanian/source +@dirrm share/${PKGNAME}/doc/romanian/source +@exec ${MKDIR} %D/share/${PKGNAME}/doc/romanian/projects +@dirrm share/${PKGNAME}/doc/romanian/projects +@dirrm share/${PKGNAME}/doc/romanian/help +@dirrm share/${PKGNAME}/doc/romanian +@dirrm share/${PKGNAME}/doc/english/startup +@dirrm share/${PKGNAME}/doc/english/source +@dirrm share/${PKGNAME}/doc/english/projects +@dirrm share/${PKGNAME}/doc/english/help +@dirrm share/${PKGNAME}/doc/english +@dirrm share/${PKGNAME}/doc/dvi +@dirrm share/${PKGNAME}/doc +@dirrm share/${PKGNAME} +@dirrm libexec/${PKGNAME}/lib +@dirrm libexec/${PKGNAME}/bin +@dirrm libexec/${PKGNAME} diff --git a/editors/TeXmacs/distinfo b/editors/TeXmacs/distinfo index d80b1f3f45c..fee2dacac7b 100644 --- a/editors/TeXmacs/distinfo +++ b/editors/TeXmacs/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/04/27 09:53:43 rh Exp $ +$NetBSD: distinfo,v 1.1.1.1.2.1 2002/06/23 18:45:15 jlam Exp $ -SHA1 (TeXmacs-1.0.0.2-src.tar.gz) = 4ddd46cf3cbc7626e5e9b12c5378d024d2d46385 -Size (TeXmacs-1.0.0.2-src.tar.gz) = 1461023 bytes +SHA1 (TeXmacs-1.0.0.7-src.tar.gz) = de0644849580da3349f57e9c540a3a92e3a9e798 +Size (TeXmacs-1.0.0.7-src.tar.gz) = 1541321 bytes SHA1 (patch-aa) = 986663798e72d6bcebf67a146503ce6904f13c5d diff --git a/editors/bvi/Makefile b/editors/bvi/Makefile index 8600c4e13f6..4273496d0a6 100644 --- a/editors/bvi/Makefile +++ b/editors/bvi/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.9 2001/10/24 07:05:37 cjs Exp $ +# $NetBSD: Makefile,v 1.9.2.1 2002/06/23 18:45:15 jlam Exp $ # DISTNAME= bvi-1.3.0.src PKGNAME= bvi-1.3.0 WRKSRC= ${WRKDIR}/${PKGNAME} CATEGORIES= editors -MASTER_SITES= http://prdownloads.sourceforge.net/bvi/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bvi/} MAINTAINER= sakamoto@netbsd.org HOMEPAGE= http://bvi.sourceforge.net/ diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index d9a1ab9f6e6..0c3541e911d 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2002/02/18 15:14:17 seb Exp $ +# $NetBSD: Makefile,v 1.45.2.1 2002/06/23 18:45:16 jlam Exp $ # FreeBSD Id: Makefile,v 1.30 1997/12/14 02:03:53 asami Exp DISTNAME= emacs-20.7 @@ -35,7 +35,7 @@ CONFIGURE_ARGS+=--without-ipv6 .else CONFIGURE_ARGS+=--with-ipv6 .endif -MAKE_ENV+= INSTALL_STRIP=${STRIPFLAG} +MAKE_ENV+= INSTALL_STRIP=${_STRIPFLAG_INSTALL} INFO_FILES= emacs vip viper forms gnus mh-e cl sc dired-x ediff \ ccmode message widget reftex forms diff --git a/editors/emacs/patches/patch-ac b/editors/emacs/patches/patch-ac index dd5103a2d22..ded46f3d6e8 100644 --- a/editors/emacs/patches/patch-ac +++ b/editors/emacs/patches/patch-ac @@ -1,3 +1,4 @@ +$NetBSD: patch-ac,v 1.11.2.1 2002/06/23 18:45:16 jlam Exp $ --- config.sub.orig Sat Oct 6 22:14:24 2001 +++ config.sub Sat Oct 6 22:15:18 2001 @@ -168,7 +168,7 @@ diff --git a/editors/mule/Makefile b/editors/mule/Makefile index 7ff77260cd5..f3683065551 100644 --- a/editors/mule/Makefile +++ b/editors/mule/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2002/04/05 23:44:41 wiz Exp $ +# $NetBSD: Makefile,v 1.10.2.1 2002/06/23 18:45:17 jlam Exp $ DISTNAME= mule-2.3 CATEGORIES= editors @@ -13,10 +13,10 @@ CONFLICTS= emacs-[0-9]* .include "../../mk/bsd.prefs.mk" .if !defined(USE_WNN4) || ${USE_WNN4} == YES -DEPENDS+= ja-FreeWnn-lib-1.10:../../japanese/freewnn-lib +.include "../../inputmethod/ja-freewnn-lib/buildlink.mk" .endif .if !defined(USE_CANNA) || ${USE_CANNA} == YES -DEPENDS+= Canna-lib>=3.5.2:../../japanese/canna-lib +.include "../../inputmethod/canna-lib/buildlink.mk" .endif WRKSRC= ${WRKDIR}/mule @@ -30,11 +30,11 @@ CONFIGURE_ARGS+= --valbits=26 .endif .if !defined(USE_WNN4) || ${USE_WNN4} == YES -CONFIGURE_ARGS+= --with-wnn4 --wnn-includes=${LOCALBASE}/include/wnn --wnn-libraries=${LOCALBASE}/lib +CONFIGURE_ARGS+= --with-wnn4 --wnn-includes=${BUILDLINK_DIR}/include/wnn --wnn-libraries=${BUILDLINK_DIR}/lib .endif .if !defined(USE_CANNA) || ${USE_CANNA} == YES -CONFIGURE_ARGS+= --canna --canna-includes=${LOCALBASE}/include --canna-libraries=${LOCALBASE}/lib +CONFIGURE_ARGS+= --canna --canna-includes=${BUILDLINK_DIR}/include --canna-libraries=${BUILDLINK_DIR}/lib .endif INFO_FILES= antenews-jp canna-jp cl dired-x egg-jp emacs forms gnus mule \ diff --git a/editors/ng/Makefile b/editors/ng/Makefile index 800d6339130..bf50463cf20 100644 --- a/editors/ng/Makefile +++ b/editors/ng/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2002/04/14 15:10:04 jlam Exp $ +# $NetBSD: Makefile,v 1.9.2.1 2002/06/23 18:45:17 jlam Exp $ DISTNAME= ng-1.4.3 CATEGORIES= editors japanese @@ -15,8 +15,7 @@ USE_CANNA= YES .endif .if ${USE_CANNA} == "YES" -DEPENDS= Canna-lib>=3.5.2:../../japanese/canna-lib -USE_X11= YES +.include "../../inputmethod/canna-lib/buildlink.mk" .endif WRKSRC= ${WRKDIR}/ng diff --git a/editors/ng/distinfo b/editors/ng/distinfo index a8061bd2671..5e8836f3ace 100644 --- a/editors/ng/distinfo +++ b/editors/ng/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.3 2002/04/14 15:07:16 jlam Exp $ +$NetBSD: distinfo,v 1.3.2.1 2002/06/23 18:45:18 jlam Exp $ SHA1 (ng-1.4.3.tar.gz) = b5200da6c41f0e4d1d232a1a0c9548f8a37a96e2 Size (ng-1.4.3.tar.gz) = 586587 bytes -SHA1 (patch-aa) = c7a0417f222b5fbfd5664ebce5ed33bd11a532de +SHA1 (patch-aa) = 0df9627b2dc337df879d982fe51a8293b65f3155 diff --git a/editors/ng/patches/patch-aa b/editors/ng/patches/patch-aa index 711af363784..477b76aa894 100644 --- a/editors/ng/patches/patch-aa +++ b/editors/ng/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.4 2002/04/14 15:07:18 jlam Exp $ +$NetBSD: patch-aa,v 1.4.2.1 2002/06/23 18:45:18 jlam Exp $ --- sys/bsd/Makefile.orig Sun Oct 1 00:59:42 2000 +++ sys/bsd/Makefile Thu Feb 15 18:28:30 2001 @@ -11,8 +11,8 @@ $NetBSD: patch-aa,v 1.4 2002/04/14 15:07:18 jlam Exp $ -#CANNAINC = -I/usr/pkg/include +.if ${USE_CANNA} == "YES" +CANNADEF = -DCANNA -+CANNALIB = -Wl,-R${X11PREFIX}/lib -L${X11PREFIX}/lib -lcanna -+CANNAINC = -I${X11PREFIX}/include ++CANNALIB = ${LDFLAGS} -lcanna ++CANNAINC = ${CPPFLAGS} +.else CANNADEF = CANNALIB = diff --git a/editors/nvi-m17n/Makefile b/editors/nvi-m17n/Makefile index 82b99fc141e..1f99e7ad434 100644 --- a/editors/nvi-m17n/Makefile +++ b/editors/nvi-m17n/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2002/04/14 15:13:59 jlam Exp $ +# $NetBSD: Makefile,v 1.16.2.1 2002/06/23 18:45:19 jlam Exp $ # FreeBSD Id: Makefile,v 1.11 1999/04/17 10:51:03 itojun Exp DISTNAME= nvi-1.79 @@ -14,7 +14,7 @@ PATCHFILES= nvi-1.79.m17n-19991117.diff.gz MAINTAINER= itojun@itojun.org COMMENT= Clone of vi/ex, with multilingual patch -CONFLICTS= vigor-[0-9]* +CONFLICTS= vigor-[0-9]* nvi-[0-9]* WRKSRC= ${WRKDIR}/${DISTNAME}/build GNU_CONFIGURE= YES @@ -27,9 +27,8 @@ CONFIGURE_ARGS+=--enable-multibyte --program-prefix=n PATCH_FUZZ_FACTOR= -F1 .if !defined(USE_CANNA) || ${USE_CANNA} == YES -DEPENDS+= Canna-lib>=3.5.2:../../japanese/canna-lib -USE_X11= YES -CONFIGURE_ARGS+=--enable-canna=${X11PREFIX} +.include "../../inputmethod/canna-lib/buildlink.mk" +CONFIGURE_ARGS+=--enable-canna=${BUILDLINK_DIR} CANNA_OPT.euc-jp=canna cannactrl cannakey= CANNA_OPT.sjis=${CANNA_OPT.euc-jp} CANNA_OPT.iso-2022-jp=${CANNA_OPT.euc-jp} diff --git a/editors/nvi/Makefile b/editors/nvi/Makefile index fb2dedddaba..76d2a49a854 100644 --- a/editors/nvi/Makefile +++ b/editors/nvi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2002/02/07 12:39:12 seb Exp $ +# $NetBSD: Makefile,v 1.3.2.1 2002/06/23 18:45:18 jlam Exp $ # DISTNAME= nvi-1.81.5 @@ -15,7 +15,7 @@ CONFIGURE_SCRIPT= ../dist/configure CONFIGURE_ARGS+= --with-db3=${BUILDLINK_DIR} CONFIGURE_ARGS+= --program-transform-name='s,^,n,' USE_LIBTOOL= YES -LTCONFIG_OVERRIDE= ${WRKSRC}/../dist/ltconfig +LIBTOOL_OVERRIDE= ${WRKSRC}/libtool USE_BUILDLINK_ONLY= YES diff --git a/editors/pico/Makefile b/editors/pico/Makefile index c3207c957dd..f344a134410 100644 --- a/editors/pico/Makefile +++ b/editors/pico/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2002/01/13 21:52:31 hubertf Exp $ +# $NetBSD: Makefile,v 1.29.2.1 2002/06/23 18:45:20 jlam Exp $ # DISTNAME= pine4.44 @@ -23,7 +23,7 @@ BUILDNAME= so5 BUILDNAME= neb .endif -MAKE_ENV+= STRIPFLAG= # debug... +MAKE_ENV+= _STRIPFLAG_INSTALL= # debug... do-build: cd ${WRKSRC} && ./build ${BUILDNAME} CC="${LIBTOOL} ${CC}" \ diff --git a/editors/tamago/Makefile b/editors/tamago/Makefile index 4606ae0b3e2..51cc683ef49 100644 --- a/editors/tamago/Makefile +++ b/editors/tamago/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/02/16 14:40:53 wiz Exp $ +# $NetBSD: Makefile,v 1.3.2.1 2002/06/23 18:45:20 jlam Exp $ DISTNAME= tamago-4.0.6 CATEGORIES= editors @@ -8,8 +8,8 @@ MAINTAINER= tech-pkg-ja@jp.netbsd.org HOMEPAGE= http://www.m17n.org/tamago/ COMMENT= CJK characters inputting system for emacs-20+leim -DEPENDS+= emacs-20.*:../../editors/emacs -DEPENDS+= leim-20.*:../../editors/leim +DEPENDS+= emacs>=20.2:../../editors/emacs +DEPENDS+= leim>=20.2:../../editors/leim GNU_CONFIGURE= yes diff --git a/editors/ted/patches/patch-ab b/editors/ted/patches/patch-ab index 1f3e1b7c61b..b1e69400b14 100644 --- a/editors/ted/patches/patch-ab +++ b/editors/ted/patches/patch-ab @@ -1,3 +1,4 @@ +$NetBSD: patch-ab,v 1.4.2.1 2002/06/23 18:45:21 jlam Exp $ --- Ted/configure.orig Sun Mar 3 23:24:16 2002 +++ Ted/configure Tue Apr 9 12:13:32 2002 @@ -1946,7 +1946,6 @@ diff --git a/editors/ted/patches/patch-ac b/editors/ted/patches/patch-ac index e6d77891a3b..275624107fb 100644 --- a/editors/ted/patches/patch-ac +++ b/editors/ted/patches/patch-ac @@ -1,3 +1,4 @@ +$NetBSD: patch-ac,v 1.1.2.1 2002/06/23 18:45:21 jlam Exp $ --- appUtil/configure.orig Sun Mar 3 23:24:16 2002 +++ appUtil/configure Tue Apr 9 12:13:56 2002 @@ -787,7 +787,6 @@ diff --git a/editors/ted/patches/patch-ad b/editors/ted/patches/patch-ad index af3e614e17e..684496f27a3 100644 --- a/editors/ted/patches/patch-ad +++ b/editors/ted/patches/patch-ad @@ -1,3 +1,4 @@ +$NetBSD: patch-ad,v 1.1.2.1 2002/06/23 18:45:21 jlam Exp $ --- bitmap/configure.orig Sun Mar 3 23:24:16 2002 +++ bitmap/configure Tue Apr 9 12:14:17 2002 @@ -1825,7 +1825,6 @@ diff --git a/editors/ted/patches/patch-ae b/editors/ted/patches/patch-ae index d46794f26f1..d2ba7e0f608 100644 --- a/editors/ted/patches/patch-ae +++ b/editors/ted/patches/patch-ae @@ -1,3 +1,4 @@ +$NetBSD: patch-ae,v 1.1.2.1 2002/06/23 18:45:22 jlam Exp $ --- appFrame/appFrameConfig.h.in.orig Sun Mar 3 23:24:16 2002 +++ appFrame/appFrameConfig.h.in Mon Apr 22 10:32:15 2002 @@ -29,12 +29,6 @@ diff --git a/editors/ted/patches/patch-af b/editors/ted/patches/patch-af index 1267464d0bc..e45010136d9 100644 --- a/editors/ted/patches/patch-af +++ b/editors/ted/patches/patch-af @@ -1,3 +1,4 @@ +$NetBSD: patch-af,v 1.1.2.1 2002/06/23 18:45:22 jlam Exp $ --- Ted/tedConfig.h.in.orig Sun Mar 3 23:24:16 2002 +++ Ted/tedConfig.h.in Mon Apr 22 11:06:41 2002 @@ -38,12 +38,6 @@ diff --git a/editors/vile/Makefile b/editors/vile/Makefile index 8d9a9a1b621..39d65ccde27 100644 --- a/editors/vile/Makefile +++ b/editors/vile/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.24 2001/12/07 00:36:26 wiz Exp $ +# $NetBSD: Makefile,v 1.24.2.1 2002/06/23 18:45:23 jlam Exp $ # FreeBSD Id: Makefile,v 1.13 1997/09/06 19:55:09 gj Exp DISTNAME= vile-9.0 CATEGORIES= editors MASTER_SITES= ftp://ftp.clark.net/pub/dickey/vile/ \ - ftp://ftp.uni-trier.de/pub/unix/editor/vile/ \ ftp://ftp.phred.org/pub/vile/ EXTRACT_SUFX= .tgz diff --git a/editors/xemacs-current/Makefile b/editors/xemacs-current/Makefile index 0262808ac1b..894bdd41a09 100644 --- a/editors/xemacs-current/Makefile +++ b/editors/xemacs-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2002/04/05 18:44:01 magick Exp $ +# $NetBSD: Makefile,v 1.6.2.1 2002/06/23 18:45:24 jlam Exp $ DISTNAME= xemacs-21.5.5 CATEGORIES= editors @@ -17,6 +17,10 @@ HAS_CONFIGURE= YES PLIST_SUBST+= EMACSVER=xemacs-21.5-b5 MESSAGE_SUBST+= EMACSVER=xemacs-21.5-b5 +.if (${MACHINE_ARCH} == "arm32") +.include "../../lang/gcc/Makefile.gcc" +.endif + .include "../../mk/bsd.prefs.mk" XEMACS_WIDGETS?= lucid @@ -52,8 +56,8 @@ WITH_XFACE= --with-xface=no .endif .if defined(EMACS_CANNA) && ${EMACS_CANNA} == YES +.include "../../inputmethod/canna-lib/buildlink.mk" WITH_CANNA= --with-canna=yes -DEPENDS+= Canna-lib-3*:../../japanese/canna-lib .else WITH_CANNA= --with-canna=no .endif diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile index b3e39235e82..3727bcec56b 100644 --- a/editors/xemacs/Makefile +++ b/editors/xemacs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2002/04/05 18:39:18 magick Exp $ +# $NetBSD: Makefile,v 1.47.2.1 2002/06/23 18:45:23 jlam Exp $ DISTNAME= xemacs-21.1.14 PKGREVISION= 2 @@ -15,10 +15,10 @@ MAINTAINER= magick@netbsd.org HOMEPAGE= http://www.xemacs.org/ COMMENT= XEmacs text editor version 21 -DEPENDS+= gdbm>=1.7.3:../../databases/gdbm -DEPENDS+= png>=1.2.1:../../graphics/png -DEPENDS+= tiff-[0-9]*:../../graphics/tiff -DEPENDS+= jpeg-[0-9]*:../../graphics/jpeg +.include "../../databases/gdbm/buildlink.mk" +.include "../../graphics/png/buildlink.mk" +.include "../../graphics/tiff/buildlink.mk" +.include "../../graphics/jpeg/buildlink.mk" NOT_FOR_PLATFORM= *-*-mips* #fails purespace dumping @@ -45,21 +45,21 @@ WITH_DIALOGS= --with-dialogs=motif .if defined(USE_LDAP) && ${USE_LDAP} == YES WITH_LDAP= --with-ldap=yes -DEPENDS+= openldap-[0-9]*:../../databases/openldap +.include "../../databases/openldap/buildlink.mk" .else WITH_LDAP= --with-ldap=no .endif .if defined(USE_XFACE) && ${USE_XFACE} == YES WITH_XFACE= --with-xface=yes -DEPENDS+= faces>=1.6.1:../../mail/faces +.include "../../mail/faces/buildlink.mk" .else WITH_XFACE= --with-xface=no .endif .if defined(EMACS_CANNA) && ${EMACS_CANNA} == YES +.include "../../inputmethod/canna-lib/buildlink.mk" WITH_CANNA= --with-canna=yes -DEPENDS+= Canna-lib-3*:../../japanese/canna-lib .else WITH_CANNA= --with-canna=no .endif diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile index 3928565f704..f71c8676c66 100644 --- a/editors/xvile/Makefile +++ b/editors/xvile/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2001/08/23 04:26:53 jlam Exp $ +# $NetBSD: Makefile,v 1.31.2.1 2002/06/23 18:45:24 jlam Exp $ # FreeBSD Id: Makefile,v 1.13 1997/09/06 19:58:03 gj Exp # @@ -6,7 +6,6 @@ DISTNAME= vile-9.0 PKGNAME= xvile-9.0 CATEGORIES= editors MASTER_SITES= ftp://ftp.clark.net/pub/dickey/vile/ \ - ftp://ftp.uni-trier.de/pub/unix/editor/vile/ \ ftp://ftp.phred.org/pub/vile/ EXTRACT_SUFX= .tgz diff --git a/emulators/BasiliskII/Makefile b/emulators/BasiliskII/Makefile index 692d41b4aaf..de2f728bdfe 100644 --- a/emulators/BasiliskII/Makefile +++ b/emulators/BasiliskII/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/12/29 00:22:02 abs Exp $ +# $NetBSD: Makefile,v 1.1.1.1.2.1 2002/06/23 18:45:26 jlam Exp $ # DISTNAME= BasiliskII_src_31052001 @@ -14,10 +14,10 @@ WRKSRC= ${WRKDIR}/BasiliskII-0.9/src/Unix GNU_CONFIGURE= yes USE_GMAKE= yes +USE_PTHREAD= native pth -.include "../../devel/pth/buildlink.mk" -.include "../../x11/gtk/buildlink.mk" -.include "../../audio/esound/buildlink.mk" -.include "../../mk/x11.buildlink.mk" - +.include "../../mk/pthread.buildlink.mk" +.include "../../x11/gtk/buildlink.mk" +.include "../../audio/esound/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/Makefile b/emulators/Makefile index 12b488665cd..780135392d3 100644 --- a/emulators/Makefile +++ b/emulators/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.67 2002/04/20 08:11:57 rh Exp $ +# $NetBSD: Makefile,v 1.67.2.1 2002/06/23 18:45:25 jlam Exp $ # COMMENT= Emulators for other operating systems @@ -14,6 +14,7 @@ SUBDIR+= darcnes SUBDIR+= doscmd SUBDIR+= fmsx SUBDIR+= freebsd_lib +SUBDIR+= generator SUBDIR+= gnuboy SUBDIR+= gpsim SUBDIR+= hercules @@ -25,6 +26,7 @@ SUBDIR+= mmix SUBDIR+= netbsd32_compat14 SUBDIR+= netbsd32_compat15 SUBDIR+= osf1_lib +SUBDIR+= p11 SUBDIR+= pcemu SUBDIR+= plex86 SUBDIR+= rewind diff --git a/emulators/atari800/Makefile b/emulators/atari800/Makefile index a93afcc8312..a79659939a4 100644 --- a/emulators/atari800/Makefile +++ b/emulators/atari800/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.13 2002/02/18 10:40:50 jmc Exp $ +# $NetBSD: Makefile,v 1.13.2.1 2002/06/23 18:45:26 jlam Exp $ DISTNAME= Atari800-0.9.9a PKGNAME= atari800-0.9.9a CATEGORIES= emulators -MASTER_SITES= http://prdownloads.sourceforge.net/atari800/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=atari800/} DISTFILES= a800s099a.zip xf25.zip MAINTAINER= packages@netbsd.org diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile index c4c1dc7c1c1..43fc2db8a3d 100644 --- a/emulators/bochs/Makefile +++ b/emulators/bochs/Makefile @@ -1,12 +1,13 @@ -# $NetBSD: Makefile,v 1.16 2001/12/13 18:03:52 fredb Exp $ +# $NetBSD: Makefile,v 1.16.2.1 2002/06/23 18:45:26 jlam Exp $ -DISTNAME= bochs-1.3 +DISTNAME= bochs-1.4 +PKGREVISION= 1 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bochs/} MAINTAINER= packages@netbsd.org HOMEPAGE= http://bochs.sourceforge.net/ -COMMENT= I386 machine emulator capable of running dos/windows +COMMENT= i386 machine emulator capable of running DOS/Windows GNU_CONFIGURE= yes USE_GMAKE= yes @@ -14,6 +15,10 @@ USE_GMAKE= yes # performance. The number of processors can be either 1 (default), 2, or 4. #CONFIGURE_ARGS+= --enable-debugger --enable-disasm #CONFIGURE_ARGS+= --enable-processors=2 +CONFIGURE_ARGS+= --enable-cdrom +CONFIGURE_ARGS+= --enable-ne2000 +CONFIGURE_ARGS+= --enable-sb16=dummy +CONFIGURE_ENV+= CXXFLAGS="-I${X11BASE}/include ${CXXFLAGS}" USE_X11= yes BOCHS_MAINDIR= ${PREFIX}/share/bochs @@ -35,18 +40,21 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/bios/BIOS-bochs-latest ${BOCHS_BIOSDIR} ${INSTALL_DATA} ${WRKSRC}/bios/VGABIOS-elpin-2.40 ${BOCHS_BIOSDIR} ${INSTALL_DATA} ${WRKSRC}/bios/VGABIOS-elpin-LICENSE ${BOCHS_BIOSDIR} - ${INSTALL_DATA} ${WRKSRC}/bios/VGABIOS-cbothamy-0.2a ${BOCHS_BIOSDIR} - ${INSTALL_DATA} ${WRKSRC}/bios/VGABIOS-cbothamy-0.2a-README ${BOCHS_BIOSDIR} + ${INSTALL_DATA} ${WRKSRC}/bios/VGABIOS-lgpl-0.3a ${BOCHS_BIOSDIR} + ${INSTALL_DATA} ${WRKSRC}/bios/VGABIOS-lgpl-README ${BOCHS_BIOSDIR} ${INSTALL_DATA_DIR} ${BOCHS_DOCDIR} ${INSTALL_DATA} ${WRKSRC}/docs-html/00README ${BOCHS_DOCDIR} ${INSTALL_DATA} ${WRKSRC}/docs-html/*.gif ${BOCHS_DOCDIR} ${INSTALL_DATA} ${WRKSRC}/docs-html/*.html ${BOCHS_DOCDIR} + ${INSTALL_DATA} ${WRKSRC}/docs-html/*.txt ${BOCHS_DOCDIR} ${INSTALL_DATA_DIR} ${BOCHS_FONTDIR} ${INSTALL_DATA} ${WRKSRC}/font/hercules.bdf ${BOCHS_FONTDIR} ${INSTALL_DATA} ${WRKSRC}/font/vga.bdf ${BOCHS_FONTDIR} ${INSTALL_DATA} ${WRKSRC}/font/vga.pcf ${BOCHS_FONTDIR} ${INSTALL_PROGRAM} ${WRKSRC}/bochs ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/bximage ${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/bochsrc ${PREFIX}/share/bochs + ${INSTALL_MAN} ${WRKSRC}/doc/man/*.1 ${PREFIX}/man/man1 ${X11BASE}/bin/mkfontdir ${PREFIX}/share/bochs/xfonts .include "../../mk/bsd.pkg.mk" diff --git a/emulators/bochs/PLIST b/emulators/bochs/PLIST index d0d6df471d1..ceab11ab340 100644 --- a/emulators/bochs/PLIST +++ b/emulators/bochs/PLIST @@ -1,5 +1,22 @@ -@comment $NetBSD: PLIST,v 1.2 2001/12/13 18:03:52 fredb Exp $ +@comment $NetBSD: PLIST,v 1.2.2.1 2002/06/23 18:45:27 jlam Exp $ bin/bochs +bin/bximage +man/man1/bochs-dlx.1 +man/man1/bochs.1 +man/man1/bochsrc.1 +man/man1/bximage.1 +share/bochs/bios/BIOS-bochs-2-processors +share/bochs/bios/BIOS-bochs-4-processors +share/bochs/bios/BIOS-bochs-latest +share/bochs/bios/VGABIOS-elpin-2.40 +share/bochs/bios/VGABIOS-elpin-LICENSE +share/bochs/bios/VGABIOS-lgpl-0.3a +share/bochs/bios/VGABIOS-lgpl-README +share/bochs/bochsrc +share/bochs/xfonts/fonts.dir +share/bochs/xfonts/hercules.bdf +share/bochs/xfonts/vga.bdf +share/bochs/xfonts/vga.pcf share/doc/html/bochs/00README share/doc/html/bochs/3rdparty.license.html share/doc/html/bochs/Linux.html @@ -12,6 +29,7 @@ share/doc/html/bochs/configure.html share/doc/html/bochs/construction.html share/doc/html/bochs/cosimulation.html share/doc/html/bochs/cvs-status.html +share/doc/html/bochs/cvs-structure.txt share/doc/html/bochs/debugger.html share/doc/html/bochs/developers.html share/doc/html/bochs/faq.html @@ -23,24 +41,14 @@ share/doc/html/bochs/install.html share/doc/html/bochs/instrumentation.html share/doc/html/bochs/iodebug.html share/doc/html/bochs/mtools.html +share/doc/html/bochs/random.txt +share/doc/html/bochs/release-prep.txt share/doc/html/bochs/smp-simulation.html share/doc/html/bochs/sound.html share/doc/html/bochs/undercon.gif share/doc/html/bochs/whatisbochs.html share/doc/html/bochs/win32.html -share/bochs/bios/BIOS-bochs-2-processors -share/bochs/bios/BIOS-bochs-4-processors -share/bochs/bios/BIOS-bochs-latest -share/bochs/bios/VGABIOS-cbothamy-0.2a -share/bochs/bios/VGABIOS-cbothamy-0.2a-README -share/bochs/bios/VGABIOS-elpin-2.40 -share/bochs/bios/VGABIOS-elpin-LICENSE -share/bochs/xfonts/fonts.dir -share/bochs/xfonts/hercules.bdf -share/bochs/xfonts/vga.bdf -share/bochs/xfonts/vga.pcf -share/bochs/bochsrc @dirrm share/doc/html/bochs -@dirrm share/bochs/bios @dirrm share/bochs/xfonts +@dirrm share/bochs/bios @dirrm share/bochs diff --git a/emulators/bochs/distinfo b/emulators/bochs/distinfo index 83ea4f6a084..988a7d816f4 100644 --- a/emulators/bochs/distinfo +++ b/emulators/bochs/distinfo @@ -1,8 +1,11 @@ -$NetBSD: distinfo,v 1.5 2001/12/13 18:03:52 fredb Exp $ +$NetBSD: distinfo,v 1.5.2.1 2002/06/23 18:45:27 jlam Exp $ -SHA1 (bochs-1.3.tar.gz) = cbec3868d6f99d0813c3d82344967647d498339f -Size (bochs-1.3.tar.gz) = 1147490 bytes -SHA1 (patch-aa) = d97c2b6e814d876e9cf164b5977ee4608bed4305 -SHA1 (patch-ab) = 340261dc14c65626b44abd2f7665cf2a87b233b4 -SHA1 (patch-ac) = 1dab10b3236022a41e529a9244bd23943094df56 +SHA1 (bochs-1.4.tar.gz) = db5f1763c8d048831daad34fa81b0f3b15e5e0a8 +Size (bochs-1.4.tar.gz) = 1389919 bytes +SHA1 (patch-aa) = 8c65fa102f606dc7d34611cfc5e5b7ab8542cfb6 +SHA1 (patch-ab) = 13ef85883d8f66862194f3ee3ffc577a3676fb3a +SHA1 (patch-ac) = 1536b5a110c05452aa423f1581cd09c8f4a486f4 +SHA1 (patch-ad) = 941d696a9556ddf8575362e1128463fadcd8c1af SHA1 (patch-ae) = 05b4d7663735594f427a236428d6cea9510c080e +SHA1 (patch-af) = b76fa463ade0d95e3aa9f1c4f8759e8361d51d57 +SHA1 (patch-ag) = a22ca6f8abf0db67de714f53e3db94cb06e33db6 diff --git a/emulators/bochs/patches/patch-aa b/emulators/bochs/patches/patch-aa index af0f8853335..688816b0eae 100644 --- a/emulators/bochs/patches/patch-aa +++ b/emulators/bochs/patches/patch-aa @@ -1,41 +1,41 @@ -$NetBSD: patch-aa,v 1.5 2001/12/13 18:03:53 fredb Exp $ +$NetBSD: patch-aa,v 1.5.2.1 2002/06/23 18:45:27 jlam Exp $ ---- .bochsrc.orig Mon Nov 19 08:36:26 2001 +--- .bochsrc.orig Thu Mar 28 01:49:52 2002 +++ .bochsrc -@@ -9,10 +9,11 @@ +@@ -9,9 +9,9 @@ # directory, named BIOS-bochs-yymmdd. Use the latest one in there. #======================================================================= #romimage: bios/BIOS-bochs-970717a -romimage: file=bios/BIOS-bochs-latest, address=0xf0000 -+#romimage: file=bios/BIOS-bochs-latest, address=0xf0000 - #romimage: file=bios/BIOS-bochs-2-processors, address=0xf0000 - #romimage: file=bios/BIOS-bochs-4-processors, address=0xf0000 - #romimage: file=bios/rombios.bin, address=0xf0000 +-#romimage: file=bios/BIOS-bochs-2-processors, address=0xf0000 +-#romimage: file=bios/BIOS-bochs-4-processors, address=0xf0000 +romimage: file=XXXPREFIXXXX/share/bochs/bios/BIOS-bochs-latest, address=0xf0000 ++#romimage: file=XXXPREFIXXXX/share/bios/BIOS-bochs-2-processors, address=0xf0000 ++#romimage: file=XXXPREFIXXXX/share/bios/BIOS-bochs-4-processors, address=0xf0000 + #romimage: file=bios/rombios.bin, address=0xf0000 #======================================================================= - # MEGS -@@ -33,7 +34,8 @@ +@@ -32,8 +32,8 @@ + # VGAROMIMAGE # You now need to load a VGA ROM BIOS into C0000. #======================================================================= - #vgaromimage: bios/VGABIOS-cbothamy-0.2a +-#vgaromimage: bios/VGABIOS-lgpl-0.3a -vgaromimage: bios/VGABIOS-elpin-2.40 -+#vgaromimage: bios/VGABIOS-elpin-2.40 ++#vgaromimage: XXXPREFIXXXX/share/bios/VGABIOS-lgpl-0.3a +vgaromimage: XXXPREFIXXXX/share/bochs/bios/VGABIOS-elpin-2.40 #======================================================================= # FLOPPYA: -@@ -57,7 +59,8 @@ - #floppya: file=../1.44, status=ejected - #floppya: 1_44=/dev/fd0H1440, status=ejected - #floppya: 1_2=../1_2, status=ejected --floppya: 1_44=a.img, status=inserted -+#floppya: 1_44=a.img, status=inserted -+floppya: 1_44=/dev/rfd0a, status=inserted - +@@ -52,7 +52,7 @@ + # drive letters such as a: or b: as the path. Raw floppy access is not + # supported on Windows 95 and 98. #======================================================================= - # FLOPPYB: -@@ -78,7 +81,7 @@ +-floppya: 1_44=/dev/fd0, status=inserted ++floppya: 1_44=/dev/rfd0a, status=inserted + #floppya: file=../1.44, status=inserted + #floppya: 1_44=/dev/fd0H1440, status=inserted + #floppya: 1_2=../1_2, status=inserted +@@ -84,7 +84,7 @@ # diskc: file=112M.sample, cyl=900, heads=15, spt=17 # diskc: file=483M.sample, cyl=1024, heads=15, spt=63 #======================================================================= @@ -44,9 +44,18 @@ $NetBSD: patch-aa,v 1.5 2001/12/13 18:03:53 fredb Exp $ #======================================================================= # DISKD: -@@ -109,8 +112,8 @@ - # boot: c +@@ -108,7 +108,7 @@ + # NOTE: diskd and cdromd must not be used together! + #======================================================================= + #cdromd: dev=D:, status=inserted # for win32 +-#cdromd: dev=/dev/cdrom, status=inserted ++cdromd: dev=/dev/rcd0d, status=ejected + + #======================================================================= + # NEWHARDDRIVESUPPORT: enabled=[0|1] +@@ -125,8 +125,8 @@ # boot: a + # boot: cdrom #======================================================================= -#boot: a -boot: c diff --git a/emulators/bochs/patches/patch-ab b/emulators/bochs/patches/patch-ab index bec68e63b7a..cb36a88d3c8 100644 --- a/emulators/bochs/patches/patch-ab +++ b/emulators/bochs/patches/patch-ab @@ -1,7 +1,8 @@ -$NetBSD: patch-ab,v 1.2 1999/10/25 16:05:38 drochner Exp $ ---- Makefile.in.orig Sat Oct 23 21:34:14 1999 -+++ Makefile.in Sat Oct 23 21:35:39 1999 -@@ -101,7 +101,7 @@ +$NetBSD: patch-ab,v 1.2.2.1 2002/06/23 18:45:28 jlam Exp $ + +--- Makefile.in.orig Thu Mar 28 01:28:42 2002 ++++ Makefile.in +@@ -164,7 +164,7 @@ @DISASM_VAR@ @INSTRUMENT_VAR@ @DYNAMIC_VAR@ $(BX_OBJS) \ $(SIMX86_OBJS) \ $(FPU_LIB) diff --git a/emulators/bochs/patches/patch-ac b/emulators/bochs/patches/patch-ac index 56b80285400..978386675d2 100644 --- a/emulators/bochs/patches/patch-ac +++ b/emulators/bochs/patches/patch-ac @@ -1,16 +1,14 @@ -$NetBSD: patch-ac,v 1.3 2001/12/13 18:03:53 fredb Exp $ +$NetBSD: patch-ac,v 1.3.2.1 2002/06/23 18:45:28 jlam Exp $ ---- iodev/keyboard.cc.orig Sat Dec 8 08:02:57 2001 -+++ iodev/keyboard.cc -@@ -973,6 +973,11 @@ - kbd_enQ(0xEE); // return same byte (EEh) as echo diagnostic - return; - break; -+ -+ case 0xf0: // set scancode - let OS time out -+ //bx_printf("KBD: set scancode command received\n"); -+ return; -+ break; +--- gui/Makefile.in.orig Sun May 12 23:47:32 2002 ++++ gui/Makefile.in +@@ -82,6 +82,9 @@ + beos.o: beos.@CPP_SUFFIX@ + $(CXX) -c $(CXXFLAGS) $(LOCAL_CXXFLAGS) $(BX_INCDIRS) $(BEOS_CFLAGS) $< + ++gui.o: gui.@CPP_SUFFIX@ ++ $(CXX) -c $(CXXFLAGS) $(LOCAL_CXXFLAGS) $(BX_INCDIRS) $(X_CFLAGS) $< ++ + x.o: x.@CPP_SUFFIX@ + $(CXX) -c $(CXXFLAGS) $(LOCAL_CXXFLAGS) $(BX_INCDIRS) $(X_CFLAGS) $< - case 0xf2: // identify keyboard - BX_INFO(("identify keyboard command received")); diff --git a/emulators/bochs/patches/patch-ad b/emulators/bochs/patches/patch-ad new file mode 100644 index 00000000000..b7949deaba0 --- /dev/null +++ b/emulators/bochs/patches/patch-ad @@ -0,0 +1,54 @@ +$NetBSD: patch-ad,v 1.3.2.2 2002/06/23 18:45:28 jlam Exp $ + +--- iodev/cdrom.cc.orig Tue Mar 19 19:24:16 2002 ++++ iodev/cdrom.cc +@@ -65,7 +65,7 @@ + #define BX_CD_FRAMESIZE 2048 + #endif + +-#if (defined(__OpenBSD__) || defined(__FreeBSD__)) ++#if (defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)) + // OpenBSD pre version 2.7 may require extern "C" { } structure around + // all the includes, because the i386 sys/disklabel.h contains code which + // c++ considers invalid. +@@ -357,6 +357,22 @@ + return(true); + } + ++ int ++cdrom_interface::start_cdrom() ++{ ++ // Spin up the cdrom drive. ++ ++ if (fd >= 0) { ++#if defined(__NetBSD__) ++ if (ioctl (fd, CDIOCSTART) < 0) ++ BX_DEBUG(( "start_cdrom: start returns error: %s", strerror (errno) )); ++ return(true); ++#else ++ BX_INFO(("start_cdrom: your OS is not supported yet.")); ++ return(false); // OS not supported yet, return false always. ++#endif ++ } ++} + + void + cdrom_interface::eject_cdrom() +@@ -365,7 +381,7 @@ + // some ioctl() calls to really eject the CD as well. + + if (fd >= 0) { +-#if (defined(__OpenBSD__) || defined(__FreeBSD__)) ++#if (defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)) + (void) ioctl (fd, CDIOCALLOW); + if (ioctl (fd, CDIOCEJECT) < 0) + BX_DEBUG(( "eject_cdrom: eject returns error." )); +@@ -495,7 +511,7 @@ + + return true; + } +-#elif (defined(__OpenBSD__) || defined(__FreeBSD__)) ++#elif (defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)) + { + struct ioc_toc_header h; + struct ioc_read_toc_entry t; diff --git a/emulators/bochs/patches/patch-af b/emulators/bochs/patches/patch-af new file mode 100644 index 00000000000..a7dc5f0aedf --- /dev/null +++ b/emulators/bochs/patches/patch-af @@ -0,0 +1,15 @@ +$NetBSD: patch-af,v 1.3.2.2 2002/06/23 18:45:29 jlam Exp $ + +--- iodev/harddrv.cc.orig Sun Mar 24 19:47:14 2002 ++++ iodev/harddrv.cc +@@ -1000,8 +1000,8 @@ + + if (!LoEj && !Start) { // stop the disc + BX_PANIC(("Stop disc not implemented")); +- } else if (!LoEj && Start) { // start the disc and read the TOC +- BX_PANIC(("Start disc not implemented")); ++ } else if (!LoEj && Start) { // Start (spin up) the disc. ++ BX_HD_THIS s[1].cdrom.cd->start_cdrom(); + } else if (LoEj && !Start) { // Eject the disc + atapi_cmd_nop(); + if (BX_HD_THIS s[1].cdrom.ready) { diff --git a/emulators/bochs/patches/patch-ag b/emulators/bochs/patches/patch-ag new file mode 100644 index 00000000000..7ee3dc44ac3 --- /dev/null +++ b/emulators/bochs/patches/patch-ag @@ -0,0 +1,14 @@ +$NetBSD: patch-ag,v 1.3.2.2 2002/06/23 18:45:29 jlam Exp $ + +--- iodev/cdrom.h.orig Fri Feb 1 10:46:28 2002 ++++ iodev/cdrom.h +@@ -49,6 +49,9 @@ + // Read a single block from the CD + void read_block(uint8* buf, int lba); + ++ // Start (spin up) the CD. ++ int start_cdrom(); ++ + private: + int fd; + char *path; diff --git a/emulators/compat11/Makefile b/emulators/compat11/Makefile index 2c5ed1caae0..c32a1710068 100644 --- a/emulators/compat11/Makefile +++ b/emulators/compat11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 1999/12/18 13:41:29 abs Exp $ +# $NetBSD: Makefile,v 1.12.2.1 2002/06/23 18:45:30 jlam Exp $ # DISTNAME= compat11 diff --git a/emulators/darcnes/Makefile b/emulators/darcnes/Makefile index fba438ae70a..42c5bd44a8a 100644 --- a/emulators/darcnes/Makefile +++ b/emulators/darcnes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2002/02/08 14:42:53 wiz Exp $ +# $NetBSD: Makefile,v 1.15.2.1 2002/06/23 18:45:30 jlam Exp $ DISTNAME= dn9b0401 PKGNAME= darcnes-20010401 @@ -25,6 +25,7 @@ do-install: .if ( ${OBJECT_FMT} == "a.out" ) MAKE_FLAGS+= ASM_FLAGS=-DASM_UNDERBARS +MAKE_FLAGS+= NO_MULTIPLE_COMMON_WARNING=-DNO_MULTIPLE_COMMON_WARNING .endif .if ( ${MACHINE_ARCH} == "i386" ) diff --git a/emulators/generator/DESCR b/emulators/generator/DESCR new file mode 100644 index 00000000000..7d4dc2f6e2b --- /dev/null +++ b/emulators/generator/DESCR @@ -0,0 +1,22 @@ +Generator is an open source emulator designed to emulate the Sega +Genesis / Mega Drive console, a popular games machine produced in the +early 1990s. It is a portable program written in C and has been +ported to the Amiga, Macintosh, Windows and even pocket PCs such as +the iPAQ and Cassiopeia. Natively it compiles under unix for X +Windows with either tcl/tk or gtk/SDL, for svgalib and even +cross-compiles to DOS with djgpp/allegro. + +Generator uses its own custom 68000 processor emulation which is +designed for dynamic recompilation, and uses techniques from this such +as block-marking, flag calculation removal, operand pre-calculation, +endian pre-conversion etc. There are approximately 1600 C routines +generated by the first stage of compilation to cope with the 67 +instruction families. These routines are used as a 'backup' when +dynamic recompilation isn't supported on your platform or the +recompiler doesn't support a particular instruction. The CPU engine +is by all accounts very fast, whatever the mode. + +There is a 'test' recompiler written for the ARM processor, but it is +no longer supported. If someone with assembler knowledge wants to put +the effort into writing a recompiling back-end for a processor (and it +really is major effort), let me know - particularly if you know i386. diff --git a/emulators/generator/Makefile b/emulators/generator/Makefile new file mode 100644 index 00000000000..a6cd27a6aa9 --- /dev/null +++ b/emulators/generator/Makefile @@ -0,0 +1,19 @@ +# $NetBSD: Makefile,v 1.2.2.2 2002/06/23 18:45:31 jlam Exp $ +# + +DISTNAME= generator-0.34 +PKGREVISION= 1 +CATEGORIES= emulators +MASTER_SITES= http://www.squish.net/generator/files/ + +MAINTAINER= packages@netbsd.org +HOMEPAGE= http://www.sqish.net/generator/ +COMMENT= Sega Mega drive genesis emulator + +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --with-gtk --with-raze + +.include "../../devel/SDL/buildlink.mk" +.include "../../x11/gtk/buildlink.mk" +.include "../../mk/x11.buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/emulators/generator/PLIST b/emulators/generator/PLIST new file mode 100644 index 00000000000..2049a42a5cd --- /dev/null +++ b/emulators/generator/PLIST @@ -0,0 +1,2 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.50.2 2002/06/23 18:45:31 jlam Exp $ +bin/generator-gtk diff --git a/emulators/generator/distinfo b/emulators/generator/distinfo new file mode 100644 index 00000000000..309ee1aaca7 --- /dev/null +++ b/emulators/generator/distinfo @@ -0,0 +1,6 @@ +$NetBSD: distinfo,v 1.2.2.2 2002/06/23 18:45:32 jlam Exp $ + +SHA1 (generator-0.34.tar.gz) = abf57875c60f63c9ffb97894f4ce9c638f60054f +Size (generator-0.34.tar.gz) = 442852 bytes +SHA1 (patch-aa) = 0878709485d884c1e4956b5ac4659024e31ef3ac +SHA1 (patch-ab) = 4c03632abd9a02cc2a616c2de7601223886334e4 diff --git a/emulators/generator/patches/patch-aa b/emulators/generator/patches/patch-aa new file mode 100644 index 00000000000..4ad10f6c350 --- /dev/null +++ b/emulators/generator/patches/patch-aa @@ -0,0 +1,20 @@ +$NetBSD: patch-aa,v 1.1.1.1.12.2 2002/06/23 18:45:33 jlam Exp $ + +--- main/gensoundp-unix.c 2002/05/09 19:02:00 1.1 ++++ main/gensoundp-unix.c 2002/05/09 19:02:56 +@@ -22,9 +22,15 @@ + # include "fm.h" + #endif + ++#if defined(__NetBSD__) ++#include <soundcard.h> ++ ++#define SOUND_DEVICE "/dev/sound" ++#else + #include <sys/soundcard.h> + + #define SOUND_DEVICE "/dev/dsp" ++#endif + + /*** variables externed ***/ + diff --git a/emulators/generator/patches/patch-ab b/emulators/generator/patches/patch-ab new file mode 100644 index 00000000000..8a98cf452ca --- /dev/null +++ b/emulators/generator/patches/patch-ab @@ -0,0 +1,74 @@ +$NetBSD: patch-ab,v 1.1.2.2 2002/06/23 18:45:33 jlam Exp $ + +--- main/generator.c 2002/05/09 21:34:29 1.1 ++++ main/generator.c 2002/05/09 21:34:34 +@@ -3,9 +3,9 @@ + #include <stdlib.h> + #include <stdio.h> + #include <string.h> +-#include <sys/stat.h> + #include <unistd.h> + #include <sys/types.h> ++#include <sys/stat.h> + #include <fcntl.h> + #include <ctype.h> + #include <signal.h> +@@ -147,7 +147,7 @@ + char *gen_loadimage(const char *filename) + { + int file, imagetype, bytes, bytesleft; +- struct stat statbuf; ++ off_t filesize; + const char *extension; + uint8 *buffer; + unsigned int blocks, x, i; +@@ -162,20 +162,6 @@ + } + + /* Load file */ +- if (stat(filename, &statbuf) != 0) +- return ("Unable to stat file."); +- cpu68k_romlen = statbuf.st_size; +- if (cpu68k_romlen < 0x200) +- return ("File is too small"); +- +- /* allocate enough memory plus 16 bytes for disassembler to cope +- with the last instruction */ +- if ((cpu68k_rom = malloc(cpu68k_romlen + 16)) == NULL) { +- cpu68k_romlen = 0; +- return ("Out of memory!"); +- } +- gen_freerom = 1; +- memset(cpu68k_rom, 0, cpu68k_romlen + 16); + #ifdef ALLEGRO + if ((file = open(filename, O_RDONLY | O_BINARY, 0)) == -1) { + #else +@@ -186,6 +172,28 @@ + cpu68k_romlen = 0; + return ("Unable to open file."); + } ++ if ( (filesize = lseek(file, 0, SEEK_END)) == -1 || // get size ++ lseek(file, 0, SEEK_SET) == -1) // then seek to start ++ { ++ perror ("lseek failed"); ++ close (file); ++ return ("Error accessing file"); ++ } ++ ++ cpu68k_romlen = filesize; ++ if (cpu68k_romlen < 0x200) { ++ (void) close(file); ++ return ("File is too small"); ++ } ++ ++ /* allocate enough memory plus 16 bytes for disassembler to cope ++ with the last instruction */ ++ if ((cpu68k_rom = malloc(cpu68k_romlen + 16)) == NULL) { ++ cpu68k_romlen = 0; ++ return ("Out of memory!"); ++ } ++ gen_freerom = 1; ++ memset(cpu68k_rom, 0, cpu68k_romlen + 16); + buffer = cpu68k_rom; + bytesleft = cpu68k_romlen; + do { diff --git a/emulators/gpsim/distinfo b/emulators/gpsim/distinfo index 473c8917eb3..4ef685fc9f4 100644 --- a/emulators/gpsim/distinfo +++ b/emulators/gpsim/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2001/04/27 14:43:55 agc Exp $ +$NetBSD: distinfo,v 1.1.1.1.2.1 2002/06/23 18:45:33 jlam Exp $ SHA1 (gpsim-0.20.7.tar.gz) = c3f76c4b8e4756ca1542a2529f44ace799b1d8ee Size (gpsim-0.20.7.tar.gz) = 448581 bytes @@ -6,3 +6,4 @@ SHA1 (patch-aa) = b01dc8b18a2718b1c9f440bd743e703bf8eecd5d SHA1 (patch-ab) = d8848b2bf5394f8b41e7b3359096df2e592c9bf3 SHA1 (patch-ac) = f4225db4c5d8ee02f7322912bb8197f22c83a94e SHA1 (patch-ad) = ca6d5c469df91a278d594cf239424c8d9f88b305 +SHA1 (patch-ae) = 5a5d673fe7948cd29ebce729312595bc9f0af223 diff --git a/emulators/gpsim/patches/patch-ae b/emulators/gpsim/patches/patch-ae new file mode 100644 index 00000000000..a470cea3326 --- /dev/null +++ b/emulators/gpsim/patches/patch-ae @@ -0,0 +1,13 @@ +$NetBSD: patch-ae,v 1.1.2.2 2002/06/23 18:45:34 jlam Exp $ + +--- gpsim/main.cc.orig Mon Nov 20 07:20:43 2000 ++++ gpsim/main.cc +@@ -147,7 +147,7 @@ + poptContext optCon; /* context for parsing command-line options */ + + +- optCon = poptGetContext(NULL, argc, argv, optionsTable, 0); ++ optCon = poptGetContext(NULL, argc, (const char **)argv, optionsTable, 0); + poptSetOtherOptionHelp(optCon, "[-h] [-p <device> [<hex_file>]] [-c <stc_file>]"); + + diff --git a/emulators/p11/DESCR b/emulators/p11/DESCR new file mode 100644 index 00000000000..a93db4b7299 --- /dev/null +++ b/emulators/p11/DESCR @@ -0,0 +1,18 @@ +P11 s a PDP11 emulator, which currently emulates the following configuration: + - a KDJ11A processor (including fpp) + - one or more RL-controllers (RLV12) with up to 4 RL02 each + - one or more RHV?? controllers with up to 8 RP06 each + - an RK11-controller with 22-bit addressing (hey ever saw one?) + - a MRV12 option (boot-rom/maintenance and display register) + - one or more KL11A controllers with up to 4 serial lines each + - a standard printer interface + - a read only TM11 tape + - a DEQNA ethernet adapter + - a toy clock + +On a 900MHz Athlon under FreeBSD 5.0 a 'make build; make installsrc' of +2.11BSD takes around 2:24 hours - this is several times faster than +a real KDJ11A (if /usr is mounted async,noaccesstime). +Floating point speed is in the order of 10 times the original. + +P11 successfully runs RSX11M-PLUS, UN*X Version 5/6/7, 2.11BSD, RT-4 and XXDP. diff --git a/emulators/p11/Makefile b/emulators/p11/Makefile new file mode 100644 index 00000000000..f853f0ac6a9 --- /dev/null +++ b/emulators/p11/Makefile @@ -0,0 +1,27 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:45:35 jlam Exp $ +# + +DISTNAME= p11-2.10a +CATEGORIES= emulators +MASTER_SITES= ftp://ftp.fokus.gmd.de/pub/cats/usr/harti/p11/ + +MAINTAINER= packages@netbsd.org +#HOMEPAGE= +COMMENT= PDP11 emulator + +DEPENDS+= libbegemot-[0-9]*:../../devel/libbegemot + +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --with-begemot=${PREFIX} +USE_LIBTOOL= yes +LIBTOOL_OVERRIDE= ${WRKSRC}/libtool +USE_GMAKE= yes + +# override MAKEFLAGS in the build and install stages +do-build: + cd ${WRKSRC} && ${GMAKE} ${ALL_TARGET} MAKEFLAGS= + +do-install: + cd ${WRKSRC} && ${GMAKE} ${INSTALL_TARGET} MAKEFLAGS= + +.include "../../mk/bsd.pkg.mk" diff --git a/emulators/p11/PLIST b/emulators/p11/PLIST new file mode 100644 index 00000000000..28b1d0d8fb6 --- /dev/null +++ b/emulators/p11/PLIST @@ -0,0 +1,19 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.22.2 2002/06/23 18:45:35 jlam Exp $ +bin/p11 +libexec/p11/epp_bpf +libexec/p11/epp_fifo +libexec/p11/epp_tun +libexec/p11/fmt +libexec/p11/lp_file +libexec/p11/tty_fifo +libexec/p11/tty_file +libexec/p11/tty_net +libexec/p11/tty_pty +libexec/p11/tty_tty +libexec/p11/tty_xterm +share/p11/COPYRIGHT +share/p11/boot.rom +share/p11/mon.help +share/p11/p11conf +@dirrm share/p11 +@dirrm libexec/p11 diff --git a/emulators/p11/distinfo b/emulators/p11/distinfo new file mode 100644 index 00000000000..1a6c5881374 --- /dev/null +++ b/emulators/p11/distinfo @@ -0,0 +1,4 @@ +$NetBSD: distinfo,v 1.1.1.1.12.2 2002/06/23 18:45:36 jlam Exp $ + +SHA1 (p11-2.10a.tar.gz) = 2d3b7860d9df1136c192d94220693dcc1a4e461b +Size (p11-2.10a.tar.gz) = 303572 bytes diff --git a/emulators/snes9x/Makefile b/emulators/snes9x/Makefile index d4644952695..09062baf407 100644 --- a/emulators/snes9x/Makefile +++ b/emulators/snes9x/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/07/17 15:31:24 wiz Exp $ +# $NetBSD: Makefile,v 1.7.2.1 2002/06/23 18:45:36 jlam Exp $ DISTNAME= s9xs137c PKGNAME= snes9x-1.37.3 @@ -13,8 +13,9 @@ COMMENT= Super Nintendo Entertainment System (SNES) emulator BUILD_DEPENDS+= nasm>=0.98:../../devel/nasm -USE_X11= yes USE_GMAKE= yes +USE_PTHREAD= native pth +USE_X11= yes do-install: ${INSTALL_PROGRAM} ${WRKSRC}/snes9x ${PREFIX}/bin @@ -52,5 +53,5 @@ MAKE_ENV+= ASMKREED=1 MAKE_ENV+= NETBSD_USE_DGA=1 .endif -.include "../../devel/pth/buildlink.mk" +.include "../../mk/pthread.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/stella/Makefile b/emulators/stella/Makefile index e510a06a8c2..d328563fe9c 100644 --- a/emulators/stella/Makefile +++ b/emulators/stella/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2002/03/30 13:01:54 cjep Exp $ +# $NetBSD: Makefile,v 1.4.2.1 2002/06/23 18:45:37 jlam Exp $ DISTNAME= stella-1.1-src PKGNAME= stella-1.1 @@ -14,12 +14,15 @@ USE_X11= yes WRKSRC= ${WRKDIR}/${PKGNAME}/src/build MAKEFILE= makefile ALL_TARGET= unix-x -MAKE_ENV= CXXFLAGS="${CXXFLAGS} -fno-rtti" -.if (${MACHINE_ARCH} == arm32) - MAKE_ENV= CXXFLAGS="-fno-rtti" +.if (${MACHINE_ARCH} == arm32 || ${MACHINE_ARCH} == arm) +.if (${CXXFLAGS:M-O2} == "-O2") +CXXFLAGS:= ${CXXFLAGS:S/-O2/-O0/} +.endif .endif +MAKE_ENV= CXXFLAGS="${CXXFLAGS} -fno-rtti" + post-build: @cd ${WRKSRC}/../ui/sound && ${MAKE} oss diff --git a/emulators/xm7/Makefile b/emulators/xm7/Makefile index e35ca897ad8..abe659073e3 100644 --- a/emulators/xm7/Makefile +++ b/emulators/xm7/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2002/01/24 12:16:14 wiz Exp $ +# $NetBSD: Makefile,v 1.6.2.1 2002/06/23 18:45:37 jlam Exp $ # DISTNAME= xm71010s @@ -11,7 +11,7 @@ MAINTAINER= tech-pkg-ja@jp.NetBSD.org HOMEPAGE= http://www.ipc-tokai.or.jp/~ytanaka/fm7/xm7.shtml COMMENT= X11-based FM-7 emulator -BUILD_DEPENDS+= nkf-1.7:../../japanese/nkf +BUILD_DEPENDS+= nkf-1.7:../../converters/nkf WRKSRC= ${WRKDIR}/vm RESTRICTED= source archive is not redistributable diff --git a/emulators/xm7/distinfo b/emulators/xm7/distinfo index 14376c154db..878e438c42c 100644 --- a/emulators/xm7/distinfo +++ b/emulators/xm7/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.5 2002/01/24 12:16:14 wiz Exp $ +$NetBSD: distinfo,v 1.5.2.1 2002/06/23 18:45:38 jlam Exp $ SHA1 (xm71010s.lzh) = 1afad6f530e05545505582d47bb0aa92965e6f71 Size (xm71010s.lzh) = 273065 bytes -SHA1 (patch-aa) = 599288e3e3d1598b1f3371f1bfc3705a61a39e39 +SHA1 (patch-aa) = fbff0be72f42200299bd11dae215955860eceed5 SHA1 (patch-ab) = 09529a433f5ae6ebf2dedee1d4c29bee27819f75 SHA1 (patch-ac) = f35662d6c8b794b5a1c052cebd53a9b96ad32c37 SHA1 (patch-ad) = dfeb6e5f824b99f5464c719e8a658a7c501ff8fc diff --git a/emulators/xm7/patches/patch-aa b/emulators/xm7/patches/patch-aa index b0418355622..1ff8d37dc6b 100644 --- a/emulators/xm7/patches/patch-aa +++ b/emulators/xm7/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.4 2002/01/24 12:16:15 wiz Exp $ +$NetBSD: patch-aa,v 1.4.2.1 2002/06/23 18:45:38 jlam Exp $ --- makefile.x11.orig Thu Mar 23 01:01:00 2000 +++ makefile.x11 Sat Aug 12 12:54:54 2000 @@ -39,7 +39,7 @@ $NetBSD: patch-aa,v 1.4 2002/01/24 12:16:15 wiz Exp $ OBJS = ${COMMONOBJ} ${LOCALOBJ} #LIBS = -L/usr/X11R6/lib -lX11 -lXt -lXext -lm -lc -LIBS = -L/usr/X11R6/lib -lX11 -lXt -lXext -lm -lc -lstdc++ -+LIBS = -L/usr/X11R6/lib -R/usr/X11R6/lib -lX11 -lXt -lXext -lm -lc -lstdc++ \ ++LIBS = -L/usr/X11R6/lib -Wl,-R/usr/X11R6/lib -lX11 -lXt -lXext -lm -lc -lstdc++ \ + -lossaudio #CFLAGS = -D_XWIN -DNDEBUG -O3 -funroll-loops -I/usr/X11R6/include -I. diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile index aefdb899937..46ccce61442 100644 --- a/emulators/xmame/Makefile +++ b/emulators/xmame/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.73 2002/05/07 15:56:24 kristerw Exp $ +# $NetBSD: Makefile,v 1.73.2.1 2002/06/23 18:45:39 jlam Exp $ # DISTNAME= xmame-0.60.1 CATEGORIES= emulators games x11 -MASTER_SITES= http://x.mame.net/download/ +MASTER_SITES= http://x.mame.net/download/ \ + http://roms2.mame.dk/emu/ EXTRACT_SUFX= .tar.bz2 MAINTAINER= kristerw@netbsd.org @@ -22,6 +23,12 @@ UNLIMIT_RESOURCES= datasize .include "../../mk/bsd.prefs.mk" +.if (${MACHINE_ARCH} == "arm32" || ${MACHINE_ARCH} == "arm") +.if (${CFLAGS:M-O2} == "-O2") +CFLAGS= ${CFLAGS:S/-O2/-O0/} +.endif +.endif + ROMPATH= ${PREFIX}/share/${TARGET} SPOOLDIR= /var/games/${TARGET} diff --git a/emulators/xmess/Makefile b/emulators/xmess/Makefile index 008c68f9fc3..31be16377e9 100644 --- a/emulators/xmess/Makefile +++ b/emulators/xmess/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2002/04/22 02:49:27 jlam Exp $ +# $NetBSD: Makefile,v 1.20.2.1 2002/06/23 18:45:40 jlam Exp $ # DISTNAME= xmame-0.56.2 @@ -23,6 +23,13 @@ UNLIMIT_RESOURCES= datasize .include "../../mk/bsd.prefs.mk" +# XXX On arm(32), the src/unix/video_drivers/x11_window.c causes problems +.if (${MACHINE_ARCH} == "arm32" || ${MACHINE_ARCH} == "arm") +.if (${CFLAGS:M-O2} == "-O2") +CFLAGS= ${CFLAGS:S/-O2/-O0/} +.endif +.endif + ROMPATH= ${PREFIX}/share/${TARGET} SPOOLDIR= /var/games/${TARGET} diff --git a/emulators/zsnes/Makefile b/emulators/zsnes/Makefile index 9e1f9b325c9..075b1737d39 100644 --- a/emulators/zsnes/Makefile +++ b/emulators/zsnes/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.5 2002/03/13 17:36:56 fredb Exp $ +# $NetBSD: Makefile,v 1.5.2.1 2002/06/23 18:45:40 jlam Exp $ # DISTNAME= zsnes1337src PKGNAME= zsnes-1.337 PKGREVISION= 2 CATEGORIES= emulators -MASTER_SITES= http://prdownloads.sourceforge.net/zsnes/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=zsnes/} MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.zsnes.com/sourceforge.php diff --git a/fonts/Makefile b/fonts/Makefile index 7d0cdc96b43..c09f65cf9e5 100644 --- a/fonts/Makefile +++ b/fonts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2002/04/09 13:18:07 wiz Exp $ +# $NetBSD: Makefile,v 1.20.2.1 2002/06/23 18:45:41 jlam Exp $ # COMMENT= Fonts @@ -9,8 +9,9 @@ SUBDIR+= acroread-chtfont SUBDIR+= acroread-font-share SUBDIR+= acroread-jpnfont SUBDIR+= acroread-korfont -SUBDIR+= arphicttf +SUBDIR+= arphic-ttf SUBDIR+= bakoma-fonts +SUBDIR+= dbz-ttf SUBDIR+= freefonts SUBDIR+= ghostscript-fonts SUBDIR+= intlfonts @@ -24,10 +25,12 @@ SUBDIR+= ko-kaist SUBDIR+= ko-mizi SUBDIR+= ko-x11fonts SUBDIR+= mglfonts -SUBDIR+= mkttfdir +SUBDIR+= mkfontalias +SUBDIR+= mkfontscale SUBDIR+= monafonts SUBDIR+= mozilla-fonts SUBDIR+= ms-ttf +SUBDIR+= p5-Font-TTF SUBDIR+= watanabe_vfont .include "../mk/bsd.pkg.subdir.mk" diff --git a/fonts/arphic-ttf/DESCR b/fonts/arphic-ttf/DESCR new file mode 100644 index 00000000000..14dfb4ab10c --- /dev/null +++ b/fonts/arphic-ttf/DESCR @@ -0,0 +1,3 @@ +Four high-quality Chinese TrueType fonts generously provided by Arphic +Technology to the Free Software community under the "Arphic Public License". +See ARPHICPL.TXT for details. diff --git a/fonts/arphic-ttf/Makefile b/fonts/arphic-ttf/Makefile new file mode 100644 index 00000000000..a07d2ad15a2 --- /dev/null +++ b/fonts/arphic-ttf/Makefile @@ -0,0 +1,42 @@ +# $NetBSD: Makefile,v 1.2.2.2 2002/06/23 18:45:42 jlam Exp $ +# + +DISTNAME= arphic-ttf-2.11 +CATEGORIES= fonts +MASTER_SITES= ftp://linux.cis.nctu.edu.tw/chinese/fonts/arphic/font/ \ + ftp://linux.cis.nctu.edu.tw/chinese/fonts/arphic/license/ENGLISH/ \ + ftp://linux.cis.nctu.edu.tw/chinese/fonts/arphic/ +DISTFILES= ${FONT_FILES} ${MISC_FILES} + +MAINTAINER= rxg@ms25.url.com.tw +COMMENT= Chinese TrueType fonts from Arphic Technology + +FONT_FILES= bkai00mp.ttf.gz bsmi00lp.ttf.gz gbsn00lp.ttf.gz gkai00mp.ttf.gz +MISC_FILES= ARPHICPL.TXT logo.gif release.txt + +DIST_SUBDIR= arphic-ttf + +CONFLICTS= arphicttf-* + +EXTRACT_ONLY= # empty +WRKSRC= ${WRKDIR} +NO_PATCH= yes +NO_CONFIGURE= yes +NO_BUILD= yes + +USE_X11BASE= yes +FONTDIR= ${PREFIX}/lib/X11/fonts/TrueType +DOCDIR= ${PREFIX}/share/doc/arphic-ttf + +do-install: + ${INSTALL_DATA_DIR} ${FONTDIR} + for f in ${FONT_FILES}; do \ + ${INSTALL_DATA} ${_DISTDIR}/$$f ${FONTDIR}; \ + ${GUNZIP_CMD} ${FONTDIR}/$$f; \ + done + ${INSTALL_DATA_DIR} ${DOCDIR} + for f in ${MISC_FILES}; do \ + ${INSTALL_DATA} ${_DISTDIR}/$$f ${DOCDIR}; \ + done + +.include "../../mk/bsd.pkg.mk" diff --git a/fonts/arphic-ttf/PLIST b/fonts/arphic-ttf/PLIST new file mode 100644 index 00000000000..eeb68b239b1 --- /dev/null +++ b/fonts/arphic-ttf/PLIST @@ -0,0 +1,10 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.2.2 2002/06/23 18:45:42 jlam Exp $ +lib/X11/fonts/TrueType/bkai00mp.ttf +lib/X11/fonts/TrueType/bsmi00lp.ttf +lib/X11/fonts/TrueType/gbsn00lp.ttf +lib/X11/fonts/TrueType/gkai00mp.ttf +share/doc/arphic-ttf/ARPHICPL.TXT +share/doc/arphic-ttf/logo.gif +share/doc/arphic-ttf/release.txt +@dirrm share/doc/arphic-ttf +@unexec ${RMDIR} -p %D/lib/X11/fonts/TrueType 2> /dev/null || true diff --git a/fonts/arphic-ttf/distinfo b/fonts/arphic-ttf/distinfo new file mode 100644 index 00000000000..c0c5de568a1 --- /dev/null +++ b/fonts/arphic-ttf/distinfo @@ -0,0 +1,16 @@ +$NetBSD: distinfo,v 1.1.1.1.12.2 2002/06/23 18:45:42 jlam Exp $ + +SHA1 (arphic-ttf/bkai00mp.ttf.gz) = 5f11d05dc56f0ee39fe664b65916d2c7dcdf422d +Size (arphic-ttf/bkai00mp.ttf.gz) = 6013768 bytes +SHA1 (arphic-ttf/bsmi00lp.ttf.gz) = e4b47551a270f2f5bdf5164d49b3365b620f79ea +Size (arphic-ttf/bsmi00lp.ttf.gz) = 5653466 bytes +SHA1 (arphic-ttf/gbsn00lp.ttf.gz) = 404e4e056126b12664764085798b85437dacaa16 +Size (arphic-ttf/gbsn00lp.ttf.gz) = 2345803 bytes +SHA1 (arphic-ttf/gkai00mp.ttf.gz) = a225ecb56ffc6239c3b91540b0047c1f07ccbe41 +Size (arphic-ttf/gkai00mp.ttf.gz) = 2698942 bytes +SHA1 (arphic-ttf/ARPHICPL.TXT) = 5792ecf0a79455f74e59ba6409e8b5b54db6b097 +Size (arphic-ttf/ARPHICPL.TXT) = 6959 bytes +SHA1 (arphic-ttf/logo.gif) = 5b746dca261030c1fa889741cd5a3b22f082302a +Size (arphic-ttf/logo.gif) = 2606 bytes +SHA1 (arphic-ttf/release.txt) = d9ea255c625c7537b179e1fdc243debb930e878d +Size (arphic-ttf/release.txt) = 749 bytes diff --git a/fonts/arphicttf/DESCR b/fonts/arphicttf/DESCR deleted file mode 100644 index d361884989d..00000000000 --- a/fonts/arphicttf/DESCR +++ /dev/null @@ -1,5 +0,0 @@ -This package installs four Chinese Big5/GB TrueType fonts, includes -Kaiti/Mingti(Big5) and Kaiti/Sungti(GB). It then can be used along -with X Window System or typesetting software like CJK. Thanks to -Arphic Technology, you may freely distribute these high-quality -fonts under a GPL-based license. See LICENSE for details. diff --git a/fonts/arphicttf/Makefile b/fonts/arphicttf/Makefile deleted file mode 100644 index ba7b1efe7b8..00000000000 --- a/fonts/arphicttf/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -# $NetBSD: Makefile,v 1.4 2002/02/18 11:23:54 rxg Exp $ -# - -DISTNAME= arphicttf-2.11 -CATEGORIES= chinese fonts -MASTER_SITES= ftp://linux.cis.nctu.edu.tw/chinese/fonts/arphic/font/ \ - ftp://linux.cis.nctu.edu.tw/chinese/fonts/arphic/license/ENGLISH/ \ - ftp://linux.cis.nctu.edu.tw/chinese/fonts/arphic/ -DISTFILES= ${FONT_SETS} ${MISC_FILES} - -MAINTAINER= rxg@ms25.url.com.tw -COMMENT= Chinese Big5/GB TrueType fonts made by Arphic Technology - -DEPENDS+= mkttfdir>=1.2:../../fonts/mkttfdir - -FONT_SETS= bkai00mp.ttf.gz \ - bsmi00lp.ttf.gz \ - gbsn00lp.ttf.gz \ - gkai00mp.ttf.gz - -MISC_FILES= ARPHICPL.TXT logo.gif release.txt - -DIST_SUBDIR= ${PKGNAME} - -EXTRACT_ONLY= # empty -WRKSRC= ${WRKDIR} -NO_PATCH= yes -NO_CONFIGURE= yes -NO_BUILD= yes - -USE_X11BASE= yes -FONTDIR= ${PREFIX}/lib/X11/fonts/TrueType - -.include "../../mk/bsd.prefs.mk" - -do-install: - ${INSTALL_DATA_DIR} ${FONTDIR} - for f in ${FONT_SETS}; do \ - ${INSTALL_DATA} ${_DISTDIR}/$$f ${FONTDIR}; \ - ${GUNZIP_CMD} ${FONTDIR}/$$f; \ - done - -post-install: -.if defined(TTF_TYPE) && (${TTF_TYPE} == "freetype") - ${SH} ${LOCALBASE}/bin/mkttfdir --freetype ${FONTDIR} -.else - ${SH} ${LOCALBASE}/bin/mkttfdir ${FONTDIR} -.endif - -.include "../../mk/bsd.pkg.mk" diff --git a/fonts/arphicttf/PLIST b/fonts/arphicttf/PLIST deleted file mode 100644 index 79ec2112f81..00000000000 --- a/fonts/arphicttf/PLIST +++ /dev/null @@ -1,8 +0,0 @@ -@comment $NetBSD: PLIST,v 1.3 2002/02/15 10:12:38 skrll Exp $ -lib/X11/fonts/TrueType/bkai00mp.ttf -lib/X11/fonts/TrueType/bsmi00lp.ttf -lib/X11/fonts/TrueType/gbsn00lp.ttf -lib/X11/fonts/TrueType/gkai00mp.ttf -@exec mkttfdir %D/lib/X11/fonts/TrueType -@unexec mkttfdir %D/lib/X11/fonts/TrueType -@unexec ${RMDIR} %D/lib/X11/fonts/TrueType diff --git a/fonts/arphicttf/distinfo b/fonts/arphicttf/distinfo deleted file mode 100644 index b3a51ba4cfd..00000000000 --- a/fonts/arphicttf/distinfo +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: distinfo,v 1.1.1.1 2001/06/29 18:17:19 wiz Exp $ - -SHA1 (arphicttf-2.11/bkai00mp.ttf.gz) = 5f11d05dc56f0ee39fe664b65916d2c7dcdf422d -Size (arphicttf-2.11/bkai00mp.ttf.gz) = 6013768 bytes -SHA1 (arphicttf-2.11/bsmi00lp.ttf.gz) = e4b47551a270f2f5bdf5164d49b3365b620f79ea -Size (arphicttf-2.11/bsmi00lp.ttf.gz) = 5653466 bytes -SHA1 (arphicttf-2.11/gbsn00lp.ttf.gz) = 404e4e056126b12664764085798b85437dacaa16 -Size (arphicttf-2.11/gbsn00lp.ttf.gz) = 2345803 bytes -SHA1 (arphicttf-2.11/gkai00mp.ttf.gz) = a225ecb56ffc6239c3b91540b0047c1f07ccbe41 -Size (arphicttf-2.11/gkai00mp.ttf.gz) = 2698942 bytes -SHA1 (arphicttf-2.11/ARPHICPL.TXT) = 5792ecf0a79455f74e59ba6409e8b5b54db6b097 -Size (arphicttf-2.11/ARPHICPL.TXT) = 6959 bytes -SHA1 (arphicttf-2.11/logo.gif) = 5b746dca261030c1fa889741cd5a3b22f082302a -Size (arphicttf-2.11/logo.gif) = 2606 bytes -SHA1 (arphicttf-2.11/release.txt) = d9ea255c625c7537b179e1fdc243debb930e878d -Size (arphicttf-2.11/release.txt) = 749 bytes diff --git a/fonts/dbz-ttf/DESCR b/fonts/dbz-ttf/DESCR new file mode 100644 index 00000000000..f14406552af --- /dev/null +++ b/fonts/dbz-ttf/DESCR @@ -0,0 +1,4 @@ +This is a collection of TrueType fonts which be created for fun. You can +use them for free to do anything you want, you just can't take the fonts +and resell them (on a CD, for instance). Read the readme.txt if you're not +sure what this means. diff --git a/fonts/dbz-ttf/Makefile b/fonts/dbz-ttf/Makefile new file mode 100644 index 00000000000..2e8f2fa9ff5 --- /dev/null +++ b/fonts/dbz-ttf/Makefile @@ -0,0 +1,30 @@ +# $NetBSD: Makefile,v 1.3.2.2 2002/06/23 18:45:45 jlam Exp $ +# + +DISTNAME= dbz +PKGNAME= dbz-ttf-20020507 +CATEGORIES= fonts +MASTER_SITES= http://www.andrew.cmu.edu/~twm/fonts/ +EXTRACT_SUFX= .zip +DIST_SUBDIR= ${PKGNAME} + +MAINTAINER= packages@netbsd.org +HOMEPAGE= http://fonts.tom7.com/ +COMMENT= Divide By Zero TrueType fonts created by Tom Murphy 7 + +LICENSE= limited-redistribution + +WRKSRC= ${WRKDIR} +NO_BUILD= yes + +USE_X11BASE= yes +FONTDIR= ${PREFIX}/lib/X11/fonts/TrueType +DOCDIR= ${PREFIX}/share/doc/dbz-ttf + +do-install: + ${INSTALL_DATA_DIR} ${FONTDIR} + ${INSTALL_DATA} ${WRKSRC}/*.ttf ${FONTDIR} + ${INSTALL_DATA_DIR} ${DOCDIR} + ${INSTALL_DATA} ${WRKSRC}/readme.txt ${DOCDIR} + +.include "../../mk/bsd.pkg.mk" diff --git a/fonts/dbz-ttf/PLIST b/fonts/dbz-ttf/PLIST new file mode 100644 index 00000000000..6db8b28b328 --- /dev/null +++ b/fonts/dbz-ttf/PLIST @@ -0,0 +1,78 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.2.2 2002/06/23 18:45:46 jlam Exp $ +lib/X11/fonts/TrueType/32768no.ttf +lib/X11/fonts/TrueType/7hours.ttf +lib/X11/fonts/TrueType/actionj.ttf +lib/X11/fonts/TrueType/angstrom.ttf +lib/X11/fonts/TrueType/antelope.ttf +lib/X11/fonts/TrueType/antiblue.ttf +lib/X11/fonts/TrueType/bboron.ttf +lib/X11/fonts/TrueType/bttsoief.ttf +lib/X11/fonts/TrueType/codon.ttf +lib/X11/fonts/TrueType/colophon.ttf +lib/X11/fonts/TrueType/constant.ttf +lib/X11/fonts/TrueType/cosinek.ttf +lib/X11/fonts/TrueType/cwisdom.ttf +lib/X11/fonts/TrueType/davis.ttf +lib/X11/fonts/TrueType/dis.ttf +lib/X11/fonts/TrueType/dnahand.ttf +lib/X11/fonts/TrueType/doctoraz.ttf +lib/X11/fonts/TrueType/donner.ttf +lib/X11/fonts/TrueType/doves.ttf +lib/X11/fonts/TrueType/dyspro.ttf +lib/X11/fonts/TrueType/epilog.ttf +lib/X11/fonts/TrueType/faraday.ttf +lib/X11/fonts/TrueType/fresnel.ttf +lib/X11/fonts/TrueType/gauss.ttf +lib/X11/fonts/TrueType/geodesic.ttf +lib/X11/fonts/TrueType/germs.ttf +lib/X11/fonts/TrueType/gmt.ttf +lib/X11/fonts/TrueType/guildof.ttf +lib/X11/fonts/TrueType/headache.ttf +lib/X11/fonts/TrueType/hydrogen.ttf +lib/X11/fonts/TrueType/initial.ttf +lib/X11/fonts/TrueType/levity.ttf +lib/X11/fonts/TrueType/lexo.ttf +lib/X11/fonts/TrueType/linear.ttf +lib/X11/fonts/TrueType/mayqueen.ttf +lib/X11/fonts/TrueType/melanie.ttf +lib/X11/fonts/TrueType/metalang.ttf +lib/X11/fonts/TrueType/musicdbz.ttf +lib/X11/fonts/TrueType/natlog.ttf +lib/X11/fonts/TrueType/nonblock.ttf +lib/X11/fonts/TrueType/nullp.ttf +lib/X11/fonts/TrueType/opticbot.ttf +lib/X11/fonts/TrueType/pinball.ttf +lib/X11/fonts/TrueType/prefix.ttf +lib/X11/fonts/TrueType/progbot.ttf +lib/X11/fonts/TrueType/proteron.ttf +lib/X11/fonts/TrueType/px10.ttf +lib/X11/fonts/TrueType/ransom.ttf +lib/X11/fonts/TrueType/resurgen.ttf +lib/X11/fonts/TrueType/robot.ttf +lib/X11/fonts/TrueType/scandal.ttf +lib/X11/fonts/TrueType/secret.ttf +lib/X11/fonts/TrueType/signal.ttf +lib/X11/fonts/TrueType/submergd.ttf +lib/X11/fonts/TrueType/suckgolf.ttf +lib/X11/fonts/TrueType/technet.ttf +lib/X11/fonts/TrueType/tetanus.ttf +lib/X11/fonts/TrueType/thisprty.ttf +lib/X11/fonts/TrueType/toast.ttf +lib/X11/fonts/TrueType/tombats1.ttf +lib/X11/fonts/TrueType/tombats3.ttf +lib/X11/fonts/TrueType/tombats4.ttf +lib/X11/fonts/TrueType/tombats6.ttf +lib/X11/fonts/TrueType/tombats7.ttf +lib/X11/fonts/TrueType/tombots.ttf +lib/X11/fonts/TrueType/tomhand.ttf +lib/X11/fonts/TrueType/tommys.ttf +lib/X11/fonts/TrueType/tomnr.ttf +lib/X11/fonts/TrueType/tsmiles.ttf +lib/X11/fonts/TrueType/tuesday.ttf +lib/X11/fonts/TrueType/valium.ttf +lib/X11/fonts/TrueType/wolves.ttf +lib/X11/fonts/TrueType/yikatu.ttf +lib/X11/fonts/TrueType/zincboom.ttf +share/doc/dbz-ttf/readme.txt +@dirrm share/doc/dbz-ttf +@unexec ${RMDIR} -p %D/lib/X11/fonts/TrueType 2> /dev/null || true diff --git a/fonts/dbz-ttf/distinfo b/fonts/dbz-ttf/distinfo new file mode 100644 index 00000000000..c406c8c14d3 --- /dev/null +++ b/fonts/dbz-ttf/distinfo @@ -0,0 +1,4 @@ +$NetBSD: distinfo,v 1.2.2.2 2002/06/23 18:45:46 jlam Exp $ + +SHA1 (dbz-ttf-20020507/dbz.zip) = 4960bed869a806c9319f28d586cbdb55faa7c366 +Size (dbz-ttf-20020507/dbz.zip) = 1595906 bytes diff --git a/fonts/mkfontalias/DESCR b/fonts/mkfontalias/DESCR new file mode 100644 index 00000000000..1559dac7486 --- /dev/null +++ b/fonts/mkfontalias/DESCR @@ -0,0 +1,3 @@ +This is a short python utility to assist people in de-uglification of +their TrueType fonts. Basically, creates a fonts.alias file from the +fonts.dir file found in the directory. diff --git a/fonts/mkfontalias/Makefile b/fonts/mkfontalias/Makefile new file mode 100644 index 00000000000..0d4a7a4a141 --- /dev/null +++ b/fonts/mkfontalias/Makefile @@ -0,0 +1,27 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:45:47 jlam Exp $ +# + +DISTNAME= mkfontalias.py +PKGNAME= mkfontalias-20000521 +CATEGORIES= fonts +MASTER_SITES= http://home.c2i.net/dark/ +EXTRACT_SUFX= # empty + +MAINTAINER= rxg@netbsd.org +HOMEPAGE= http://home.c2i.net/dark/linux.html#fuzzy +COMMENT= creates a fonts.alias from the fonts.dir for TrueType fonts + +EXTRACT_ONLY= # empty +WRKSRC= ${WRKDIR} +NO_BUILD= yes + +PYTHON_PATCH_SCRIPTS= ${DISTNAME} + +do-extract: + ${CP} ${_DISTDIR}/${DISTNAME} ${WRKSRC} + +do-install: + ${INSTALL_SCRIPT} ${WRKSRC}/mkfontalias.py ${PREFIX}/bin/mkfontalias + +.include "../../lang/python/application.buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/fonts/mkfontalias/PLIST b/fonts/mkfontalias/PLIST new file mode 100644 index 00000000000..5050b4705bf --- /dev/null +++ b/fonts/mkfontalias/PLIST @@ -0,0 +1,2 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.50.2 2002/06/23 18:45:47 jlam Exp $ +bin/mkfontalias diff --git a/fonts/mkfontalias/distinfo b/fonts/mkfontalias/distinfo new file mode 100644 index 00000000000..eff0574e1d6 --- /dev/null +++ b/fonts/mkfontalias/distinfo @@ -0,0 +1,5 @@ +$NetBSD: distinfo,v 1.1.1.1.12.2 2002/06/23 18:45:48 jlam Exp $ + +SHA1 (mkfontalias.py) = 455a7ac5b355d2ac6606f94ffa5cffa5af9385c1 +Size (mkfontalias.py) = 3571 bytes +SHA1 (patch-aa) = c1ea1fd0cd708f84e63b4039c1986b93086dd0b5 diff --git a/fonts/mkfontalias/patches/patch-aa b/fonts/mkfontalias/patches/patch-aa new file mode 100644 index 00000000000..b1d20d4ef8f --- /dev/null +++ b/fonts/mkfontalias/patches/patch-aa @@ -0,0 +1,38 @@ +$NetBSD: patch-aa,v 1.1.1.1.50.2 2002/06/23 18:45:48 jlam Exp $ + +--- mkfontalias.py.orig Mon May 13 23:10:34 2002 ++++ mkfontalias.py +@@ -16,7 +16,7 @@ + # -- + import sys, string, os + +-_font_sizes = range(6, 16) + [ 18, 24 ] ++_font_sizes = range(6, 13) + [ 14, 16, 18, 20, 22, 24, 26, 28, 36, 48, 72 ] + _infile = 'fonts.dir' + _outfile = 'fonts.alias' + +@@ -67,13 +67,8 @@ + sys.stderr.write ( 'Invalid font: %s\n' % (font) ) + sys.exit(1) + +- name = entries[2] +- +- map = _font_map.get ( name, None ) +- +- if map: +- # Create a bunch of aliases, for each size +- for size in _font_sizes: ++ # Create a bunch of aliases, for each size ++ for size in _font_sizes: + # Do the 'cheating' - fallback to size if not in the cheat map + real_size = _cheat_map.get ( size, size ) + +@@ -81,7 +76,7 @@ + str(real_size * 10) ] + + entries[9:], '-' ) + +- alias = string.join ( entries[:2] + [map] + entries[3:7] + ++ alias = string.join ( entries[:3] + entries[3:7] + + [ str(size), str(size * 10) ] + + _res + entries[11:], '-' ) + diff --git a/fonts/mkfontscale/DESCR b/fonts/mkfontscale/DESCR new file mode 100644 index 00000000000..3efaeb7dd91 --- /dev/null +++ b/fonts/mkfontscale/DESCR @@ -0,0 +1,7 @@ +For each directory argument, mkfontscale reads all of the scalable font files +in the directory. For every font file found, an X11 font name (XLFD) is +generated, and is written together with the file name to a file fonts.scale +in the directory. + +The resulting fonts.scale file should be checked and possibly manually edited +before being used as input for the mkfontdir(1) program. diff --git a/fonts/mkfontscale/Makefile b/fonts/mkfontscale/Makefile new file mode 100644 index 00000000000..fbe16443c01 --- /dev/null +++ b/fonts/mkfontscale/Makefile @@ -0,0 +1,16 @@ +# $NetBSD: Makefile,v 1.2.2.2 2002/06/23 18:45:50 jlam Exp $ +# + +DISTNAME= mkfontscale-20020524 +CATEGORIES= fonts +MASTER_SITES= http://www.pps.jussieu.fr/~jch/software/files/ + +MAINTAINER= rxg@netbsd.org +HOMEPAGE= http://www.pps.jussieu.fr/~jch/software/files/ +COMMENT= create an index of scalable font files for X + +USE_IMAKE= yes + +WRKSRC= ${WRKDIR}/mkfontscale + +.include "../../mk/bsd.pkg.mk" diff --git a/fonts/mkfontscale/PLIST b/fonts/mkfontscale/PLIST new file mode 100644 index 00000000000..91144f083c2 --- /dev/null +++ b/fonts/mkfontscale/PLIST @@ -0,0 +1,3 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.2.2 2002/06/23 18:45:50 jlam Exp $ +bin/mkfontscale +man/cat1/mkfontscale.0 diff --git a/fonts/mkfontscale/distinfo b/fonts/mkfontscale/distinfo new file mode 100644 index 00000000000..45863e88fad --- /dev/null +++ b/fonts/mkfontscale/distinfo @@ -0,0 +1,5 @@ +$NetBSD: distinfo,v 1.3.2.2 2002/06/23 18:45:50 jlam Exp $ + +SHA1 (mkfontscale-20020524.tar.gz) = 4c1f8bba8fd2a939a95d1ad18700320b7ec993b5 +Size (mkfontscale-20020524.tar.gz) = 8133 bytes +SHA1 (patch-aa) = 759f60cca2f29a4537a1b9576ddce76a3db45e27 diff --git a/fonts/mkfontscale/patches/patch-aa b/fonts/mkfontscale/patches/patch-aa new file mode 100644 index 00000000000..db9ed02508d --- /dev/null +++ b/fonts/mkfontscale/patches/patch-aa @@ -0,0 +1,22 @@ +$NetBSD: patch-aa,v 1.2.2.2 2002/06/23 18:45:51 jlam Exp $ + +--- Imakefile.orig Thu Apr 4 14:25:46 2002 ++++ Imakefile Thu May 30 13:28:44 2002 +@@ -1,5 +1,5 @@ + XTOP = /usr/local/src/XFree86/xc +-XFONTENCLIB = $(XTOP)/exports/lib/libfontenc.a ++XFONTENCLIB = -lfontenc + + LOCAL_LIBRARIES = $(XFONTENCLIB) $(FREETYPE2LIB) + +@@ -9,8 +9,8 @@ + + OBJS = mkfontscale.o list.o + +-INCLUDES = $(FREETYPE2INCLUDES) -I$(XTOP)/exports/include +-DEFINES = $(FREETYPE2DEFINES) ++EXTRA_INCLUDES = $(FREETYPE2INCLUDES) -I$(XTOP)/exports/include ++EXTRA_DEFINES = $(FREETYPE2DEFINES) + + ComplexProgramTarget(mkfontscale) + diff --git a/fonts/mkttfdir/DESCR b/fonts/mkttfdir/DESCR deleted file mode 100644 index 70071f62e87..00000000000 --- a/fonts/mkttfdir/DESCR +++ /dev/null @@ -1,5 +0,0 @@ -mkttfdir is a script to create an index of X TrueType fonts files -in a directory. It would call the program 'ttfinfo' to read TrueType -Fonts information, then use them to fill up each field of XLFD -(X Logical Font Descriptor) in fonts.scale. Just to use it simply -like 'mkfontdir'. diff --git a/fonts/mkttfdir/Makefile b/fonts/mkttfdir/Makefile deleted file mode 100644 index ff0f70abe6e..00000000000 --- a/fonts/mkttfdir/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# $NetBSD: Makefile,v 1.6 2002/03/16 05:25:16 rxg Exp $ -# - -DISTNAME= mkttfdir-1.2.1 -CATEGORIES= fonts -MASTER_SITES= http://residence.educities.edu.tw/rxghome/ - -MAINTAINER= rxg@ms25.url.com.tw -COMMENT= create an index of X TrueType fonts files in a directory - -MAKE_FLAGS+= prefix=${PREFIX} FREETYPE_BASE=${LOCALBASE} - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/ttfinfo ${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/mkttfdir ${PREFIX}/bin - -.include "../../graphics/freetype-lib/buildlink.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/fonts/mkttfdir/PLIST b/fonts/mkttfdir/PLIST deleted file mode 100644 index b1dd4acf545..00000000000 --- a/fonts/mkttfdir/PLIST +++ /dev/null @@ -1,3 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:49:11 zuntum Exp $ -bin/mkttfdir -bin/ttfinfo diff --git a/fonts/mkttfdir/distinfo b/fonts/mkttfdir/distinfo deleted file mode 100644 index 805880a4ccf..00000000000 --- a/fonts/mkttfdir/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -$NetBSD: distinfo,v 1.6 2002/03/16 05:25:16 rxg Exp $ - -SHA1 (mkttfdir-1.2.1.tar.gz) = 2ba0aa7cee8f6dfc14c408ad26add6d40dc2ca03 -Size (mkttfdir-1.2.1.tar.gz) = 17741 bytes diff --git a/fonts/p5-Font-TTF/DESCR b/fonts/p5-Font-TTF/DESCR new file mode 100644 index 00000000000..2591a247eb5 --- /dev/null +++ b/fonts/p5-Font-TTF/DESCR @@ -0,0 +1,8 @@ +Perl module for TrueType font hacking. Supports reading, processing and +writing of the following tables: GDEF, GPOS, GSUB, LTSH, OS/2, PCLT, +bsln, cmap, cvt, fdsc, feat, fpgm, glyf, hdmx, head, hhea, hmtx, kern, +loca, maxp, mort, name, post, prep, prop, vhea, vmtx and the reading and +writing of all other table types. + +In short, you can do almost anything with a standard TrueType font with +this module. diff --git a/fonts/p5-Font-TTF/Makefile b/fonts/p5-Font-TTF/Makefile new file mode 100644 index 00000000000..77ac915c08f --- /dev/null +++ b/fonts/p5-Font-TTF/Makefile @@ -0,0 +1,19 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:45:53 jlam Exp $ +# + +DISTNAME= Font-TTF-0.28 +PKGNAME= p5-${DISTNAME} +CATEGORIES= perl5 +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Font/} + +MAINTAINER= packages@netbsd.org +COMMENT= Perl module for TrueType font hacking + +USE_BUILDLINK_ONLY= YES +PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Font/TTF/.packlist + +do-configure: + @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL + +.include "../../lang/perl5/buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/fonts/p5-Font-TTF/PLIST b/fonts/p5-Font-TTF/PLIST new file mode 100644 index 00000000000..2828cf5c769 --- /dev/null +++ b/fonts/p5-Font-TTF/PLIST @@ -0,0 +1 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.34.2 2002/06/23 18:45:53 jlam Exp $ diff --git a/fonts/p5-Font-TTF/distinfo b/fonts/p5-Font-TTF/distinfo new file mode 100644 index 00000000000..5b500d64a4b --- /dev/null +++ b/fonts/p5-Font-TTF/distinfo @@ -0,0 +1,4 @@ +$NetBSD: distinfo,v 1.1.1.1.2.2 2002/06/23 18:45:54 jlam Exp $ + +SHA1 (Font-TTF-0.28.tar.gz) = 24891f59838e9a069a6f7f8b8431ab2a83ba9d54 +Size (Font-TTF-0.28.tar.gz) = 153500 bytes diff --git a/games/Makefile b/games/Makefile index 91171a164e8..3e61d8f2193 100644 --- a/games/Makefile +++ b/games/Makefile @@ -1,10 +1,11 @@ -# $NetBSD: Makefile,v 1.139 2002/05/05 23:02:00 hubertf Exp $ +# $NetBSD: Makefile,v 1.139.2.1 2002/06/23 18:45:54 jlam Exp $ # COMMENT= Games SUBDIR+= 0verkill SUBDIR+= abuse +SUBDIR+= adom SUBDIR+= amor SUBDIR+= an SUBDIR+= angband-tty @@ -69,8 +70,10 @@ SUBDIR+= iso-pernangband SUBDIR+= jetpack SUBDIR+= kdegames SUBDIR+= kdegames2 +SUBDIR+= kdegames3 SUBDIR+= kdetoys SUBDIR+= kdetoys2 +SUBDIR+= kdetoys3 SUBDIR+= ketm SUBDIR+= knightcap SUBDIR+= knightcap-brain @@ -146,6 +149,7 @@ SUBDIR+= xpilot SUBDIR+= xpipeman SUBDIR+= xpuyopuyo SUBDIR+= xracer +SUBDIR+= xrick SUBDIR+= xroach SUBDIR+= xroads SUBDIR+= xscavenger diff --git a/games/adom/DESCR b/games/adom/DESCR new file mode 100644 index 00000000000..7b617cab373 --- /dev/null +++ b/games/adom/DESCR @@ -0,0 +1,8 @@ +Ancient Domains of Mystery (ADOM for short) is a rogue-like game +which means that it is a single-user game featuring the exploration of +a dungeon complex. You control a fictional character described by +race, class, attributes, skills, and equipment. This fictional +character is trying to achieve a specific goal (see below) and succeed +in a difficult quest. To fulfill the quest, you have to explore +previously undiscovered tunnels and dungeons, fight hideous monsters, +uncover long forgotten secrets, and find treasures of all kind. diff --git a/games/adom/Makefile b/games/adom/Makefile new file mode 100644 index 00000000000..02b0967f0b9 --- /dev/null +++ b/games/adom/Makefile @@ -0,0 +1,32 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:45:55 jlam Exp $ +# + +DISTNAME= adom-100-elf +PKGNAME= adom-1.00 +CATEGORIES= games +MASTER_SITES= http://www.adom.de/adom/download/linux/ + +MAINTAINER= svs@ropnet.ru +HOMEPAGE= http://www.adom.de/ +COMMENT= Ancient Domains of Mystery - yet another roguelike game + +ONLY_FOR_PLATFORM= NetBSD-*-i386 Linux-*-i386 + +WRKSRC= ${WRKDIR}/adom +NO_BUILD= YES +NO_PATCH= YES +NO_CONFIGURE= YES +CHECK_SHLIBS= NO + +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} == "NetBSD" +DEPENDS= suse_base>=6.1:../../emulators/${SUSE_DIR_PREFIX}_base +.endif + +do-install: + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/adom + ${INSTALL_DATA} ${WRKSRC}/*.* ${PREFIX}/share/doc/adom + ${INSTALL_PROGRAM} ${WRKSRC}/adom ${PREFIX}/bin + +.include "../../emulators/suse_linux/Makefile.application" diff --git a/games/adom/PLIST b/games/adom/PLIST new file mode 100644 index 00000000000..969241a99b5 --- /dev/null +++ b/games/adom/PLIST @@ -0,0 +1,6 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.48.2 2002/06/23 18:45:56 jlam Exp $ +bin/adom +share/doc/adom/adomfaq.txt +share/doc/adom/manual.doc +share/doc/adom/readme.1st +@dirrm share/doc/adom diff --git a/games/adom/distinfo b/games/adom/distinfo new file mode 100644 index 00000000000..6d6dd08fac9 --- /dev/null +++ b/games/adom/distinfo @@ -0,0 +1,4 @@ +$NetBSD: distinfo,v 1.1.1.1.2.2 2002/06/23 18:45:56 jlam Exp $ + +SHA1 (adom-100-elf.tar.gz) = b3c90c11dac87aec1a5de7cbe7bc4de7f87ee403 +Size (adom-100-elf.tar.gz) = 973081 bytes diff --git a/games/crossfire-cli/Makefile b/games/crossfire-cli/Makefile index c5a5a4252d6..6eac4dba128 100644 --- a/games/crossfire-cli/Makefile +++ b/games/crossfire-cli/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2002/03/13 17:36:59 fredb Exp $ +# $NetBSD: Makefile,v 1.12.2.1 2002/06/23 18:45:57 jlam Exp $ # DISTNAME= crossfire-client-1.0.0 @@ -26,7 +26,6 @@ USE_X11= yes USE_GMAKE= yes GNU_CONFIGURE= yes SCRIPTS_ENV+= ${SCRIPTSDIR} -CONFIGURE_ARGS+= --prefix=${LOCALBASE} CONFIGURE_ARGS+= --with-includes=-I${LOCALBASE}/include CONFIGURE_ARGS+= --with-sound-dir=${LOCALBASE}/share/cfclient/sounds diff --git a/games/crossfire-srv/Makefile b/games/crossfire-srv/Makefile index 783a043a604..bcdc066ac0f 100644 --- a/games/crossfire-srv/Makefile +++ b/games/crossfire-srv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2002/03/13 17:36:59 fredb Exp $ +# $NetBSD: Makefile,v 1.10.2.1 2002/06/23 18:45:58 jlam Exp $ # DISTNAME= crossfire-1.0.0 @@ -26,7 +26,6 @@ USE_X11= yes USE_GMAKE= yes GNU_CONFIGURE= yes USE_PERL5= yes -CONFIGURE_ARGS+= --prefix=${LOCALBASE} CONFIGURE_ARGS+= --with-includes=-I${LOCALBASE}/include MAKE_ENV+= EXTRA_INCLUDES=-I${LOCALBASE}/include diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile index c48c9edc2fd..6be440033a8 100644 --- a/games/gnome-games/Makefile +++ b/games/gnome-games/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.35 2002/03/13 17:37:00 fredb Exp $ +# $NetBSD: Makefile,v 1.35.2.1 2002/06/23 18:45:58 jlam Exp $ DISTNAME= gnome-games-1.4.0.3 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= games gnome MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/gnome-games/} EXTRACT_SUFX= .tar.bz2 diff --git a/games/gnome-games/distinfo b/games/gnome-games/distinfo index a3b7a05d8dc..ba726499bec 100644 --- a/games/gnome-games/distinfo +++ b/games/gnome-games/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.6 2001/12/12 14:59:14 wiz Exp $ +$NetBSD: distinfo,v 1.6.2.1 2002/06/23 18:45:59 jlam Exp $ SHA1 (gnome-games-1.4.0.3.tar.bz2) = 1e2232aab41a53004db5b0e3eaf69896ad430f29 Size (gnome-games-1.4.0.3.tar.bz2) = 7052953 bytes SHA1 (patch-aa) = 888cf35c192d70e2edd1e4f656b69eac25c2e88a SHA1 (patch-ab) = a65a783eca7102c3ecb5352f7ce855b75434388b SHA1 (patch-ac) = 71cf86496f6a8cf5f3291a7e046704e3ed0855ed -SHA1 (patch-ad) = df442b8054ab515e32c6ce667d5ebb8af1342b8c -SHA1 (patch-ae) = 585442dc89430094211d598af63095ba7a99a055 -SHA1 (patch-af) = c370320ef670b855d0400245015527942b90f5da +SHA1 (patch-ad) = 268de04b74b35a5ed37b9b3abc592100af3ad4fc +SHA1 (patch-ae) = 3cb3e3cea44a092ab65d45f3557888a090bf8369 +SHA1 (patch-af) = 99ecb1786e6a32824ab30e81d7c9e4a31107a6ff diff --git a/games/gnome-games/patches/patch-ad b/games/gnome-games/patches/patch-ad index 5e23969307c..ea46dac648e 100644 --- a/games/gnome-games/patches/patch-ad +++ b/games/gnome-games/patches/patch-ad @@ -1,8 +1,16 @@ -$NetBSD: patch-ad,v 1.4 2001/12/12 14:59:14 wiz Exp $ +$NetBSD: patch-ad,v 1.4.2.1 2002/06/23 18:45:59 jlam Exp $ ---- aclocal.m4.orig Sun May 21 23:56:34 2000 -+++ aclocal.m4 Thu Nov 9 18:58:34 2000 -@@ -1594,7 +1594,7 @@ +--- aclocal.m4.orig Thu Jul 12 06:02:03 2001 ++++ aclocal.m4 +@@ -4298,6 +4298,7 @@ + fi + AC_SUBST(GDK_PIXBUF_CFLAGS) + AC_SUBST(GDK_PIXBUF_LIBS) ++ CFLAGS="$CFLAGS $GDK_PIXBUF_CFLAGS" + rm -f conf.gdk_pixbuftest + ]) + +@@ -4697,7 +4698,7 @@ [CATOBJEXT=.gmo DATADIRNAME=share], [CATOBJEXT=.mo diff --git a/games/gnome-games/patches/patch-ae b/games/gnome-games/patches/patch-ae index 2893284614f..fa69e643435 100644 --- a/games/gnome-games/patches/patch-ae +++ b/games/gnome-games/patches/patch-ae @@ -1,8 +1,13 @@ -$NetBSD: patch-ae,v 1.1 2000/11/26 14:20:38 mycroft Exp $ +$NetBSD: patch-ae,v 1.1.2.1 2002/06/23 18:45:59 jlam Exp $ ---- gnome-stones/objects/Makefile.am.orig Sun Nov 26 13:55:25 2000 -+++ gnome-stones/objects/Makefile.am Sun Nov 26 13:53:34 2000 -@@ -10,5 +10,7 @@ +--- gnome-stones/objects/Makefile.am.orig Tue Nov 10 14:55:56 1998 ++++ gnome-stones/objects/Makefile.am +@@ -6,9 +6,11 @@ + -I$(GSTONES_SRC_DIR) \ + -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -I$(includedir) \ +- $(GNOME_INCLUDEDIR) ++ $(GNOME_INCLUDEDIR) $(GDK_PIXBUF_CFLAGS) object_LTLIBRARIES = libgnome-stones.la libgnomekoban.la diff --git a/games/gnome-games/patches/patch-af b/games/gnome-games/patches/patch-af index bdf66707126..d3de871ac5b 100644 --- a/games/gnome-games/patches/patch-af +++ b/games/gnome-games/patches/patch-af @@ -1,11 +1,12 @@ -$NetBSD: patch-af,v 1.1 2000/11/26 14:41:12 mycroft Exp $ +$NetBSD: patch-af,v 1.1.2.1 2002/06/23 18:46:00 jlam Exp $ ---- gnome-stones/Makefile.am.orig Tue Apr 6 08:39:55 1999 -+++ gnome-stones/Makefile.am Sun Nov 26 14:38:30 2000 -@@ -37,6 +37,7 @@ +--- gnome-stones/Makefile.am.orig Sun Jul 8 18:56:41 2001 ++++ gnome-stones/Makefile.am +@@ -37,6 +37,8 @@ view.c \ view.h ++gnome_stones_CFLAGS = ${GDK_PIXBUF_CFLAGS} +gnome_stones_LDFLAGS = -export-dynamic gnome_stones_LDADD = \ $(GNOME_LIBDIR) \ diff --git a/games/gnugo/Makefile b/games/gnugo/Makefile index 88d45cef08c..b00686cbfa6 100644 --- a/games/gnugo/Makefile +++ b/games/gnugo/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.6 2002/02/18 15:14:19 seb Exp $ +# $NetBSD: Makefile,v 1.6.2.1 2002/06/23 18:46:00 jlam Exp $ -DISTNAME= gnugo-2.6 +DISTNAME= gnugo-3.2 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_GNU:=gnugo/} diff --git a/games/gnugo/PLIST b/games/gnugo/PLIST index 35726d3a58d..d58aee09f1d 100644 --- a/games/gnugo/PLIST +++ b/games/gnugo/PLIST @@ -1,4 +1,5 @@ -@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:19 seb Exp $ +@comment $NetBSD: PLIST,v 1.2.2.1 2002/06/23 18:46:00 jlam Exp $ +bin/debugboard bin/gnugo @unexec ${INSTALL_INFO} --delete %D/info/gnugo.info %D/info/dir info/gnugo.info @@ -7,5 +8,12 @@ info/gnugo.info-2 info/gnugo.info-3 info/gnugo.info-4 info/gnugo.info-5 +info/gnugo.info-6 +info/gnugo.info-7 +info/gnugo.info-8 +info/gnugo.info-9 +info/gnugo.info-10 +info/gnugo.info-11 +info/gnugo.info-12 @exec ${INSTALL_INFO} %D/info/gnugo.info %D/info/dir man/man6/gnugo.6 diff --git a/games/gnugo/distinfo b/games/gnugo/distinfo index df7bb9e3402..3c3a7d0a61b 100644 --- a/games/gnugo/distinfo +++ b/games/gnugo/distinfo @@ -1,5 +1,4 @@ -$NetBSD: distinfo,v 1.2 2001/04/21 02:08:27 wiz Exp $ +$NetBSD: distinfo,v 1.2.2.1 2002/06/23 18:46:01 jlam Exp $ -SHA1 (gnugo-2.6.tar.gz) = 03b3da993a62b6fee473784900795eaade7e788a -Size (gnugo-2.6.tar.gz) = 617161 bytes -SHA1 (patch-aa) = 8ba523dd10dfc3c08af06750bf1eff9eff76571b +SHA1 (gnugo-3.2.tar.gz) = 9485fc53fc7d7353d9d672b8aaec96d480480b77 +Size (gnugo-3.2.tar.gz) = 2012129 bytes diff --git a/games/gnugo/patches/patch-aa b/games/gnugo/patches/patch-aa deleted file mode 100644 index 203bd1f6acb..00000000000 --- a/games/gnugo/patches/patch-aa +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-aa,v 1.4 2000/11/21 04:51:37 toshii Exp $ - ---- doc/gnugo.info.orig Mon Feb 14 16:10:18 2000 -+++ doc/gnugo.info -@@ -1,5 +1,9 @@ - This is gnugo.info, produced by makeinfo version 4.0 from gnugo.texi. - -+INFO-DIR-SECTION Games -+START-INFO-DIR-ENTRY -+* Gnugo: (gnugo). Go playing program. -+END-INFO-DIR-ENTRY - - Indirect: - gnugo.info-1: 71 diff --git a/games/kdegames3/DESCR b/games/kdegames3/DESCR new file mode 100644 index 00000000000..90ae45773be --- /dev/null +++ b/games/kdegames3/DESCR @@ -0,0 +1 @@ +KDE provides an integrated X11 based environment, much like CDE. diff --git a/games/kdegames3/Makefile b/games/kdegames3/Makefile new file mode 100644 index 00000000000..978f1af4408 --- /dev/null +++ b/games/kdegames3/Makefile @@ -0,0 +1,14 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:46:02 jlam Exp $ + +DISTNAME= kdegames-3.0.1 +CATEGORIES= games +COMMENT= Games for the KDE integrated X11 desktop + +.include "../../x11/kde3/Makefile.kde3" + +USE_BUILDLINK_ONLY= YES + +.include "../../x11/kde3/buildlink.mk" +.include "../../x11/kdebase3/buildlink.mk" +.include "../../mk/x11.buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/games/kdegames3/PLIST b/games/kdegames3/PLIST new file mode 100644 index 00000000000..c443757fdad --- /dev/null +++ b/games/kdegames3/PLIST @@ -0,0 +1,2115 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.2.2 2002/06/23 18:46:03 jlam Exp $ +bin/kasteroids +bin/katomic +bin/kbackgammon +bin/kbattleship +bin/kblackbox +bin/kbounce +bin/kenolaba +bin/kfouleggs +bin/kjumpingcube +bin/klines +bin/kmahjongg +bin/kmines +bin/konquest +bin/kpat +bin/kpoker +bin/kreversi +bin/ksame +bin/kshisen +bin/ksirtet +bin/ksmiletris +bin/ksnake +bin/ksokoban +bin/kspaceduel +bin/ktron +bin/ktuberling +bin/kwin4 +bin/kwin4proc +bin/lskat +bin/lskatproc +include/kcarddialog.h +include/kchat.h +include/kchatbase.h +include/kchatdialog.h +include/kgame/kgame.h +include/kgame/kgamechat.h +include/kgame/kgameconnectdialog.h +include/kgame/kgamedebugdialog.h +include/kgame/kgamedialog.h +include/kgame/kgamedialogconfig.h +include/kgame/kgameerror.h +include/kgame/kgameerrordialog.h +include/kgame/kgameio.h +include/kgame/kgamemessage.h +include/kgame/kgamenetwork.h +include/kgame/kgameprocess.h +include/kgame/kgameproperty.h +include/kgame/kgamepropertyarray.h +include/kgame/kgamepropertyhandler.h +include/kgame/kgamepropertylist.h +include/kgame/kmessageclient.h +include/kgame/kmessageio.h +include/kgame/kmessageserver.h +include/kgame/kplayer.h +include/kgamemisc.h +include/kgameprogress.h +include/khighscore.h +include/kscoredialog.h +include/kstdgameaction.h +lib/kbackgammon.a +lib/kbackgammon.la +lib/kbackgammon.so +lib/libkbackgammon_main.a +lib/libkbackgammon_main.la +lib/libkbackgammon_main.so +lib/libkbackgammon_main.so.0 +lib/libkbackgammon_main.so.0.0 +lib/libkdegames.a +lib/libkdegames.la +lib/libkdegames.so +lib/libkdegames.so.1 +lib/libkdegames.so.1.1 +lib/libkdehighscores.a +lib/libkdehighscores.la +lib/libkdehighscores.so +lib/libkdehighscores.so.0 +lib/libkdehighscores.so.0.1 +lib/libksirtetbase.a +lib/libksirtetbase.la +lib/libksirtetbase.so +lib/libksirtetbase.so.0 +lib/libksirtetbase.so.0.1 +lib/libksirtetcommon.a +lib/libksirtetcommon.la +lib/libksirtetcommon.so +lib/libksirtetcommon.so.0 +lib/libksirtetcommon.so.0.1 +share/doc/kde/HTML/en/kasteroids/common +share/doc/kde/HTML/en/kasteroids/fuel.png +share/doc/kde/HTML/en/kasteroids/index.cache.bz2 +share/doc/kde/HTML/en/kasteroids/index.docbook +share/doc/kde/HTML/en/katomic/common +share/doc/kde/HTML/en/katomic/index.cache.bz2 +share/doc/kde/HTML/en/katomic/index.docbook +share/doc/kde/HTML/en/kbackgammon/board.png +share/doc/kde/HTML/en/kbackgammon/common +share/doc/kde/HTML/en/kbackgammon/index.cache.bz2 +share/doc/kde/HTML/en/kbackgammon/index.docbook +share/doc/kde/HTML/en/kbattleship/common +share/doc/kde/HTML/en/kbattleship/index.cache.bz2 +share/doc/kde/HTML/en/kbattleship/index.docbook +share/doc/kde/HTML/en/kblackbox/common +share/doc/kde/HTML/en/kblackbox/index.cache.bz2 +share/doc/kde/HTML/en/kblackbox/index.docbook +share/doc/kde/HTML/en/kblackbox/kblackboxtbar.png +share/doc/kde/HTML/en/kbounce/common +share/doc/kde/HTML/en/kbounce/index.cache.bz2 +share/doc/kde/HTML/en/kbounce/index.docbook +share/doc/kde/HTML/en/kbounce/jezball_corridor1.png +share/doc/kde/HTML/en/kbounce/jezball_corridor2.png +share/doc/kde/HTML/en/kbounce/jezball_newWall.png +share/doc/kde/HTML/en/kenolaba/common +share/doc/kde/HTML/en/kenolaba/index.cache.bz2 +share/doc/kde/HTML/en/kenolaba/index.docbook +share/doc/kde/HTML/en/kenolaba/kenolaba-pieces.png +share/doc/kde/HTML/en/kfouleggs/common +share/doc/kde/HTML/en/kfouleggs/gamescreen.png +share/doc/kde/HTML/en/kfouleggs/index.cache.bz2 +share/doc/kde/HTML/en/kfouleggs/index.docbook +share/doc/kde/HTML/en/kjumpingcube/common +share/doc/kde/HTML/en/kjumpingcube/index.cache.bz2 +share/doc/kde/HTML/en/kjumpingcube/index.docbook +share/doc/kde/HTML/en/klines/common +share/doc/kde/HTML/en/klines/index.cache.bz2 +share/doc/kde/HTML/en/klines/index.docbook +share/doc/kde/HTML/en/kmines/common +share/doc/kde/HTML/en/kmines/index.cache.bz2 +share/doc/kde/HTML/en/kmines/index.docbook +share/doc/kde/HTML/en/kmines/kmines1.png +share/doc/kde/HTML/en/kmines/kmines2.png +share/doc/kde/HTML/en/konquest/common +share/doc/kde/HTML/en/konquest/index.cache.bz2 +share/doc/kde/HTML/en/konquest/index.docbook +share/doc/kde/HTML/en/kpat/clubs.png +share/doc/kde/HTML/en/kpat/common +share/doc/kde/HTML/en/kpat/diamonds.png +share/doc/kde/HTML/en/kpat/hearts.png +share/doc/kde/HTML/en/kpat/index.cache.bz2 +share/doc/kde/HTML/en/kpat/index.docbook +share/doc/kde/HTML/en/kpat/man.docbook +share/doc/kde/HTML/en/kpat/playfield.png +share/doc/kde/HTML/en/kpat/spades.png +share/doc/kde/HTML/en/kpoker/common +share/doc/kde/HTML/en/kpoker/index.cache.bz2 +share/doc/kde/HTML/en/kpoker/index.docbook +share/doc/kde/HTML/en/kpoker/kpoker1.png +share/doc/kde/HTML/en/kpoker/kpoker2.png +share/doc/kde/HTML/en/kreversi/common +share/doc/kde/HTML/en/kreversi/index.cache.bz2 +share/doc/kde/HTML/en/kreversi/index.docbook +share/doc/kde/HTML/en/kreversi/kreversi1.png +share/doc/kde/HTML/en/ksame/common +share/doc/kde/HTML/en/ksame/index.cache.bz2 +share/doc/kde/HTML/en/ksame/index.docbook +share/doc/kde/HTML/en/kshisen/common +share/doc/kde/HTML/en/kshisen/index.cache.bz2 +share/doc/kde/HTML/en/kshisen/index.docbook +share/doc/kde/HTML/en/ksirtet/common +share/doc/kde/HTML/en/ksirtet/index.cache.bz2 +share/doc/kde/HTML/en/ksirtet/index.docbook +share/doc/kde/HTML/en/ksnake/common +share/doc/kde/HTML/en/ksnake/index.cache.bz2 +share/doc/kde/HTML/en/ksnake/index.docbook +share/doc/kde/HTML/en/ksokoban/common +share/doc/kde/HTML/en/ksokoban/index.cache.bz2 +share/doc/kde/HTML/en/ksokoban/index.docbook +share/doc/kde/HTML/en/kspaceduel/common +share/doc/kde/HTML/en/kspaceduel/index.cache.bz2 +share/doc/kde/HTML/en/kspaceduel/index.docbook +share/doc/kde/HTML/en/kspaceduel/kspaceduel1.png +share/doc/kde/HTML/en/kspaceduel/kspaceduel2.png +share/doc/kde/HTML/en/kspaceduel/kspaceduel3.png +share/doc/kde/HTML/en/ktron/common +share/doc/kde/HTML/en/ktron/index.cache.bz2 +share/doc/kde/HTML/en/ktron/index.docbook +share/doc/kde/HTML/en/ktuberling/button.new.png +share/doc/kde/HTML/en/ktuberling/button.open.png +share/doc/kde/HTML/en/ktuberling/button.print.png +share/doc/kde/HTML/en/ktuberling/button.redo.png +share/doc/kde/HTML/en/ktuberling/button.save.png +share/doc/kde/HTML/en/ktuberling/button.undo.png +share/doc/kde/HTML/en/ktuberling/common +share/doc/kde/HTML/en/ktuberling/gameboard.png +share/doc/kde/HTML/en/ktuberling/index.cache.bz2 +share/doc/kde/HTML/en/ktuberling/index.docbook +share/doc/kde/HTML/en/ktuberling/menu.edit.png +share/doc/kde/HTML/en/ktuberling/menu.file.png +share/doc/kde/HTML/en/ktuberling/menu.help.png +share/doc/kde/HTML/en/ktuberling/menu.option.png +share/doc/kde/HTML/en/ktuberling/menu.raw.png +share/doc/kde/HTML/en/ktuberling/technical-reference.docbook +share/doc/kde/HTML/en/ktuberling/toolbar.png +share/doc/kde/HTML/en/kwin4/common +share/doc/kde/HTML/en/kwin4/index.cache.bz2 +share/doc/kde/HTML/en/kwin4/index.docbook +share/doc/kde/HTML/en/lskat/common +share/doc/kde/HTML/en/lskat/index.cache.bz2 +share/doc/kde/HTML/en/lskat/index.docbook +share/kde/applnk/Games/Arcade/kasteroids.desktop +share/kde/applnk/Games/Arcade/kbounce.desktop +share/kde/applnk/Games/Arcade/kfouleggs.desktop +share/kde/applnk/Games/Arcade/ksirtet.desktop +share/kde/applnk/Games/Arcade/ksmiletris.desktop +share/kde/applnk/Games/Arcade/ksnake.desktop +share/kde/applnk/Games/Arcade/kspaceduel.desktop +share/kde/applnk/Games/Arcade/ktron.desktop +share/kde/applnk/Games/Board/kbackgammon.desktop +share/kde/applnk/Games/Board/kbattleship.desktop +share/kde/applnk/Games/Board/kblackbox.desktop +share/kde/applnk/Games/Board/kenolaba.desktop +share/kde/applnk/Games/Board/kmahjongg.desktop +share/kde/applnk/Games/Board/kreversi.desktop +share/kde/applnk/Games/Board/kshisen.desktop +share/kde/applnk/Games/Board/kwin4.desktop +share/kde/applnk/Games/Card/kpat.desktop +share/kde/applnk/Games/Card/kpoker.desktop +share/kde/applnk/Games/Card/lskat.desktop +share/kde/applnk/Games/TacticStrategy/katomic.desktop +share/kde/applnk/Games/TacticStrategy/kjumpingcube.desktop +share/kde/applnk/Games/TacticStrategy/klines.desktop +share/kde/applnk/Games/TacticStrategy/kmines.desktop +share/kde/applnk/Games/TacticStrategy/konquest.desktop +share/kde/applnk/Games/TacticStrategy/ksame.desktop +share/kde/applnk/Games/TacticStrategy/ksokoban.desktop +share/kde/applnk/Toys/ktuberling.desktop +share/kde/apps/carddecks/cards-aisleriot/1.png +share/kde/apps/carddecks/cards-aisleriot/10.png +share/kde/apps/carddecks/cards-aisleriot/11.png +share/kde/apps/carddecks/cards-aisleriot/12.png +share/kde/apps/carddecks/cards-aisleriot/13.png +share/kde/apps/carddecks/cards-aisleriot/14.png +share/kde/apps/carddecks/cards-aisleriot/15.png +share/kde/apps/carddecks/cards-aisleriot/16.png +share/kde/apps/carddecks/cards-aisleriot/17.png +share/kde/apps/carddecks/cards-aisleriot/18.png +share/kde/apps/carddecks/cards-aisleriot/19.png +share/kde/apps/carddecks/cards-aisleriot/2.png +share/kde/apps/carddecks/cards-aisleriot/20.png +share/kde/apps/carddecks/cards-aisleriot/21.png +share/kde/apps/carddecks/cards-aisleriot/22.png +share/kde/apps/carddecks/cards-aisleriot/23.png +share/kde/apps/carddecks/cards-aisleriot/24.png +share/kde/apps/carddecks/cards-aisleriot/25.png +share/kde/apps/carddecks/cards-aisleriot/26.png +share/kde/apps/carddecks/cards-aisleriot/27.png +share/kde/apps/carddecks/cards-aisleriot/28.png +share/kde/apps/carddecks/cards-aisleriot/29.png +share/kde/apps/carddecks/cards-aisleriot/3.png +share/kde/apps/carddecks/cards-aisleriot/30.png +share/kde/apps/carddecks/cards-aisleriot/31.png +share/kde/apps/carddecks/cards-aisleriot/32.png +share/kde/apps/carddecks/cards-aisleriot/33.png +share/kde/apps/carddecks/cards-aisleriot/34.png +share/kde/apps/carddecks/cards-aisleriot/35.png +share/kde/apps/carddecks/cards-aisleriot/36.png +share/kde/apps/carddecks/cards-aisleriot/37.png +share/kde/apps/carddecks/cards-aisleriot/38.png +share/kde/apps/carddecks/cards-aisleriot/39.png +share/kde/apps/carddecks/cards-aisleriot/4.png +share/kde/apps/carddecks/cards-aisleriot/40.png +share/kde/apps/carddecks/cards-aisleriot/41.png +share/kde/apps/carddecks/cards-aisleriot/42.png +share/kde/apps/carddecks/cards-aisleriot/43.png +share/kde/apps/carddecks/cards-aisleriot/44.png +share/kde/apps/carddecks/cards-aisleriot/45.png +share/kde/apps/carddecks/cards-aisleriot/46.png +share/kde/apps/carddecks/cards-aisleriot/47.png +share/kde/apps/carddecks/cards-aisleriot/48.png +share/kde/apps/carddecks/cards-aisleriot/49.png +share/kde/apps/carddecks/cards-aisleriot/5.png +share/kde/apps/carddecks/cards-aisleriot/50.png +share/kde/apps/carddecks/cards-aisleriot/51.png +share/kde/apps/carddecks/cards-aisleriot/52.png +share/kde/apps/carddecks/cards-aisleriot/6.png +share/kde/apps/carddecks/cards-aisleriot/7.png +share/kde/apps/carddecks/cards-aisleriot/8.png +share/kde/apps/carddecks/cards-aisleriot/9.png +share/kde/apps/carddecks/cards-aisleriot/COPYRIGHT +share/kde/apps/carddecks/cards-aisleriot/index.desktop +share/kde/apps/carddecks/cards-default/1.png +share/kde/apps/carddecks/cards-default/10.png +share/kde/apps/carddecks/cards-default/11.png +share/kde/apps/carddecks/cards-default/12.png +share/kde/apps/carddecks/cards-default/13.png +share/kde/apps/carddecks/cards-default/14.png +share/kde/apps/carddecks/cards-default/15.png +share/kde/apps/carddecks/cards-default/16.png +share/kde/apps/carddecks/cards-default/17.png +share/kde/apps/carddecks/cards-default/18.png +share/kde/apps/carddecks/cards-default/19.png +share/kde/apps/carddecks/cards-default/2.png +share/kde/apps/carddecks/cards-default/20.png +share/kde/apps/carddecks/cards-default/21.png +share/kde/apps/carddecks/cards-default/22.png +share/kde/apps/carddecks/cards-default/23.png +share/kde/apps/carddecks/cards-default/24.png +share/kde/apps/carddecks/cards-default/25.png +share/kde/apps/carddecks/cards-default/26.png +share/kde/apps/carddecks/cards-default/27.png +share/kde/apps/carddecks/cards-default/28.png +share/kde/apps/carddecks/cards-default/29.png +share/kde/apps/carddecks/cards-default/3.png +share/kde/apps/carddecks/cards-default/30.png +share/kde/apps/carddecks/cards-default/31.png +share/kde/apps/carddecks/cards-default/32.png +share/kde/apps/carddecks/cards-default/33.png +share/kde/apps/carddecks/cards-default/34.png +share/kde/apps/carddecks/cards-default/35.png +share/kde/apps/carddecks/cards-default/36.png +share/kde/apps/carddecks/cards-default/37.png +share/kde/apps/carddecks/cards-default/38.png +share/kde/apps/carddecks/cards-default/39.png +share/kde/apps/carddecks/cards-default/4.png +share/kde/apps/carddecks/cards-default/40.png +share/kde/apps/carddecks/cards-default/41.png +share/kde/apps/carddecks/cards-default/42.png +share/kde/apps/carddecks/cards-default/43.png +share/kde/apps/carddecks/cards-default/44.png +share/kde/apps/carddecks/cards-default/45.png +share/kde/apps/carddecks/cards-default/46.png +share/kde/apps/carddecks/cards-default/47.png +share/kde/apps/carddecks/cards-default/48.png +share/kde/apps/carddecks/cards-default/49.png +share/kde/apps/carddecks/cards-default/5.png +share/kde/apps/carddecks/cards-default/50.png +share/kde/apps/carddecks/cards-default/51.png +share/kde/apps/carddecks/cards-default/52.png +share/kde/apps/carddecks/cards-default/6.png +share/kde/apps/carddecks/cards-default/7.png +share/kde/apps/carddecks/cards-default/8.png +share/kde/apps/carddecks/cards-default/9.png +share/kde/apps/carddecks/cards-default/index.desktop +share/kde/apps/carddecks/cards-dondorf-whist-b/1.png +share/kde/apps/carddecks/cards-dondorf-whist-b/10.png +share/kde/apps/carddecks/cards-dondorf-whist-b/11.png +share/kde/apps/carddecks/cards-dondorf-whist-b/12.png +share/kde/apps/carddecks/cards-dondorf-whist-b/13.png +share/kde/apps/carddecks/cards-dondorf-whist-b/14.png +share/kde/apps/carddecks/cards-dondorf-whist-b/15.png +share/kde/apps/carddecks/cards-dondorf-whist-b/16.png +share/kde/apps/carddecks/cards-dondorf-whist-b/17.png +share/kde/apps/carddecks/cards-dondorf-whist-b/18.png +share/kde/apps/carddecks/cards-dondorf-whist-b/19.png +share/kde/apps/carddecks/cards-dondorf-whist-b/2.png +share/kde/apps/carddecks/cards-dondorf-whist-b/20.png +share/kde/apps/carddecks/cards-dondorf-whist-b/21.png +share/kde/apps/carddecks/cards-dondorf-whist-b/22.png +share/kde/apps/carddecks/cards-dondorf-whist-b/23.png +share/kde/apps/carddecks/cards-dondorf-whist-b/24.png +share/kde/apps/carddecks/cards-dondorf-whist-b/25.png +share/kde/apps/carddecks/cards-dondorf-whist-b/26.png +share/kde/apps/carddecks/cards-dondorf-whist-b/27.png +share/kde/apps/carddecks/cards-dondorf-whist-b/28.png +share/kde/apps/carddecks/cards-dondorf-whist-b/29.png +share/kde/apps/carddecks/cards-dondorf-whist-b/3.png +share/kde/apps/carddecks/cards-dondorf-whist-b/30.png +share/kde/apps/carddecks/cards-dondorf-whist-b/31.png +share/kde/apps/carddecks/cards-dondorf-whist-b/32.png +share/kde/apps/carddecks/cards-dondorf-whist-b/33.png +share/kde/apps/carddecks/cards-dondorf-whist-b/34.png +share/kde/apps/carddecks/cards-dondorf-whist-b/35.png +share/kde/apps/carddecks/cards-dondorf-whist-b/36.png +share/kde/apps/carddecks/cards-dondorf-whist-b/37.png +share/kde/apps/carddecks/cards-dondorf-whist-b/38.png +share/kde/apps/carddecks/cards-dondorf-whist-b/39.png +share/kde/apps/carddecks/cards-dondorf-whist-b/4.png +share/kde/apps/carddecks/cards-dondorf-whist-b/40.png +share/kde/apps/carddecks/cards-dondorf-whist-b/41.png +share/kde/apps/carddecks/cards-dondorf-whist-b/42.png +share/kde/apps/carddecks/cards-dondorf-whist-b/43.png +share/kde/apps/carddecks/cards-dondorf-whist-b/44.png +share/kde/apps/carddecks/cards-dondorf-whist-b/45.png +share/kde/apps/carddecks/cards-dondorf-whist-b/46.png +share/kde/apps/carddecks/cards-dondorf-whist-b/47.png +share/kde/apps/carddecks/cards-dondorf-whist-b/48.png +share/kde/apps/carddecks/cards-dondorf-whist-b/49.png +share/kde/apps/carddecks/cards-dondorf-whist-b/5.png +share/kde/apps/carddecks/cards-dondorf-whist-b/50.png +share/kde/apps/carddecks/cards-dondorf-whist-b/51.png +share/kde/apps/carddecks/cards-dondorf-whist-b/52.png +share/kde/apps/carddecks/cards-dondorf-whist-b/6.png +share/kde/apps/carddecks/cards-dondorf-whist-b/7.png +share/kde/apps/carddecks/cards-dondorf-whist-b/8.png +share/kde/apps/carddecks/cards-dondorf-whist-b/9.png +share/kde/apps/carddecks/cards-dondorf-whist-b/COPYRIGHT +share/kde/apps/carddecks/cards-dondorf-whist-b/index.desktop +share/kde/apps/carddecks/cards-gdkcard-bonded/1.png +share/kde/apps/carddecks/cards-gdkcard-bonded/10.png +share/kde/apps/carddecks/cards-gdkcard-bonded/11.png +share/kde/apps/carddecks/cards-gdkcard-bonded/12.png +share/kde/apps/carddecks/cards-gdkcard-bonded/13.png +share/kde/apps/carddecks/cards-gdkcard-bonded/14.png +share/kde/apps/carddecks/cards-gdkcard-bonded/15.png +share/kde/apps/carddecks/cards-gdkcard-bonded/16.png +share/kde/apps/carddecks/cards-gdkcard-bonded/17.png +share/kde/apps/carddecks/cards-gdkcard-bonded/18.png +share/kde/apps/carddecks/cards-gdkcard-bonded/19.png +share/kde/apps/carddecks/cards-gdkcard-bonded/2.png +share/kde/apps/carddecks/cards-gdkcard-bonded/20.png +share/kde/apps/carddecks/cards-gdkcard-bonded/21.png +share/kde/apps/carddecks/cards-gdkcard-bonded/22.png +share/kde/apps/carddecks/cards-gdkcard-bonded/23.png +share/kde/apps/carddecks/cards-gdkcard-bonded/24.png +share/kde/apps/carddecks/cards-gdkcard-bonded/25.png +share/kde/apps/carddecks/cards-gdkcard-bonded/26.png +share/kde/apps/carddecks/cards-gdkcard-bonded/27.png +share/kde/apps/carddecks/cards-gdkcard-bonded/28.png +share/kde/apps/carddecks/cards-gdkcard-bonded/29.png +share/kde/apps/carddecks/cards-gdkcard-bonded/3.png +share/kde/apps/carddecks/cards-gdkcard-bonded/30.png +share/kde/apps/carddecks/cards-gdkcard-bonded/31.png +share/kde/apps/carddecks/cards-gdkcard-bonded/32.png +share/kde/apps/carddecks/cards-gdkcard-bonded/33.png +share/kde/apps/carddecks/cards-gdkcard-bonded/34.png +share/kde/apps/carddecks/cards-gdkcard-bonded/35.png +share/kde/apps/carddecks/cards-gdkcard-bonded/36.png +share/kde/apps/carddecks/cards-gdkcard-bonded/37.png +share/kde/apps/carddecks/cards-gdkcard-bonded/38.png +share/kde/apps/carddecks/cards-gdkcard-bonded/39.png +share/kde/apps/carddecks/cards-gdkcard-bonded/4.png +share/kde/apps/carddecks/cards-gdkcard-bonded/40.png +share/kde/apps/carddecks/cards-gdkcard-bonded/41.png +share/kde/apps/carddecks/cards-gdkcard-bonded/42.png +share/kde/apps/carddecks/cards-gdkcard-bonded/43.png +share/kde/apps/carddecks/cards-gdkcard-bonded/44.png +share/kde/apps/carddecks/cards-gdkcard-bonded/45.png +share/kde/apps/carddecks/cards-gdkcard-bonded/46.png +share/kde/apps/carddecks/cards-gdkcard-bonded/47.png +share/kde/apps/carddecks/cards-gdkcard-bonded/48.png +share/kde/apps/carddecks/cards-gdkcard-bonded/49.png +share/kde/apps/carddecks/cards-gdkcard-bonded/5.png +share/kde/apps/carddecks/cards-gdkcard-bonded/50.png +share/kde/apps/carddecks/cards-gdkcard-bonded/51.png +share/kde/apps/carddecks/cards-gdkcard-bonded/52.png +share/kde/apps/carddecks/cards-gdkcard-bonded/6.png +share/kde/apps/carddecks/cards-gdkcard-bonded/7.png +share/kde/apps/carddecks/cards-gdkcard-bonded/8.png +share/kde/apps/carddecks/cards-gdkcard-bonded/9.png +share/kde/apps/carddecks/cards-gdkcard-bonded/COPYRIGHT +share/kde/apps/carddecks/cards-gdkcard-bonded/index.desktop +share/kde/apps/carddecks/cards-hard-a-port/1.png +share/kde/apps/carddecks/cards-hard-a-port/10.png +share/kde/apps/carddecks/cards-hard-a-port/11.png +share/kde/apps/carddecks/cards-hard-a-port/12.png +share/kde/apps/carddecks/cards-hard-a-port/13.png +share/kde/apps/carddecks/cards-hard-a-port/14.png +share/kde/apps/carddecks/cards-hard-a-port/15.png +share/kde/apps/carddecks/cards-hard-a-port/16.png +share/kde/apps/carddecks/cards-hard-a-port/17.png +share/kde/apps/carddecks/cards-hard-a-port/18.png +share/kde/apps/carddecks/cards-hard-a-port/19.png +share/kde/apps/carddecks/cards-hard-a-port/2.png +share/kde/apps/carddecks/cards-hard-a-port/20.png +share/kde/apps/carddecks/cards-hard-a-port/21.png +share/kde/apps/carddecks/cards-hard-a-port/22.png +share/kde/apps/carddecks/cards-hard-a-port/23.png +share/kde/apps/carddecks/cards-hard-a-port/24.png +share/kde/apps/carddecks/cards-hard-a-port/25.png +share/kde/apps/carddecks/cards-hard-a-port/26.png +share/kde/apps/carddecks/cards-hard-a-port/27.png +share/kde/apps/carddecks/cards-hard-a-port/28.png +share/kde/apps/carddecks/cards-hard-a-port/29.png +share/kde/apps/carddecks/cards-hard-a-port/3.png +share/kde/apps/carddecks/cards-hard-a-port/30.png +share/kde/apps/carddecks/cards-hard-a-port/31.png +share/kde/apps/carddecks/cards-hard-a-port/32.png +share/kde/apps/carddecks/cards-hard-a-port/33.png +share/kde/apps/carddecks/cards-hard-a-port/34.png +share/kde/apps/carddecks/cards-hard-a-port/35.png +share/kde/apps/carddecks/cards-hard-a-port/36.png +share/kde/apps/carddecks/cards-hard-a-port/37.png +share/kde/apps/carddecks/cards-hard-a-port/38.png +share/kde/apps/carddecks/cards-hard-a-port/39.png +share/kde/apps/carddecks/cards-hard-a-port/4.png +share/kde/apps/carddecks/cards-hard-a-port/40.png +share/kde/apps/carddecks/cards-hard-a-port/41.png +share/kde/apps/carddecks/cards-hard-a-port/42.png +share/kde/apps/carddecks/cards-hard-a-port/43.png +share/kde/apps/carddecks/cards-hard-a-port/44.png +share/kde/apps/carddecks/cards-hard-a-port/45.png +share/kde/apps/carddecks/cards-hard-a-port/46.png +share/kde/apps/carddecks/cards-hard-a-port/47.png +share/kde/apps/carddecks/cards-hard-a-port/48.png +share/kde/apps/carddecks/cards-hard-a-port/49.png +share/kde/apps/carddecks/cards-hard-a-port/5.png +share/kde/apps/carddecks/cards-hard-a-port/50.png +share/kde/apps/carddecks/cards-hard-a-port/51.png +share/kde/apps/carddecks/cards-hard-a-port/52.png +share/kde/apps/carddecks/cards-hard-a-port/6.png +share/kde/apps/carddecks/cards-hard-a-port/7.png +share/kde/apps/carddecks/cards-hard-a-port/8.png +share/kde/apps/carddecks/cards-hard-a-port/9.png +share/kde/apps/carddecks/cards-hard-a-port/COPYRIGHT +share/kde/apps/carddecks/cards-hard-a-port/index.desktop +share/kde/apps/carddecks/cards-konqi-modern/1.png +share/kde/apps/carddecks/cards-konqi-modern/10.png +share/kde/apps/carddecks/cards-konqi-modern/11.png +share/kde/apps/carddecks/cards-konqi-modern/12.png +share/kde/apps/carddecks/cards-konqi-modern/13.png +share/kde/apps/carddecks/cards-konqi-modern/14.png +share/kde/apps/carddecks/cards-konqi-modern/15.png +share/kde/apps/carddecks/cards-konqi-modern/16.png +share/kde/apps/carddecks/cards-konqi-modern/17.png +share/kde/apps/carddecks/cards-konqi-modern/18.png +share/kde/apps/carddecks/cards-konqi-modern/19.png +share/kde/apps/carddecks/cards-konqi-modern/2.png +share/kde/apps/carddecks/cards-konqi-modern/20.png +share/kde/apps/carddecks/cards-konqi-modern/21.png +share/kde/apps/carddecks/cards-konqi-modern/22.png +share/kde/apps/carddecks/cards-konqi-modern/23.png +share/kde/apps/carddecks/cards-konqi-modern/24.png +share/kde/apps/carddecks/cards-konqi-modern/25.png +share/kde/apps/carddecks/cards-konqi-modern/26.png +share/kde/apps/carddecks/cards-konqi-modern/27.png +share/kde/apps/carddecks/cards-konqi-modern/28.png +share/kde/apps/carddecks/cards-konqi-modern/29.png +share/kde/apps/carddecks/cards-konqi-modern/3.png +share/kde/apps/carddecks/cards-konqi-modern/30.png +share/kde/apps/carddecks/cards-konqi-modern/31.png +share/kde/apps/carddecks/cards-konqi-modern/32.png +share/kde/apps/carddecks/cards-konqi-modern/33.png +share/kde/apps/carddecks/cards-konqi-modern/34.png +share/kde/apps/carddecks/cards-konqi-modern/35.png +share/kde/apps/carddecks/cards-konqi-modern/36.png +share/kde/apps/carddecks/cards-konqi-modern/37.png +share/kde/apps/carddecks/cards-konqi-modern/38.png +share/kde/apps/carddecks/cards-konqi-modern/39.png +share/kde/apps/carddecks/cards-konqi-modern/4.png +share/kde/apps/carddecks/cards-konqi-modern/40.png +share/kde/apps/carddecks/cards-konqi-modern/41.png +share/kde/apps/carddecks/cards-konqi-modern/42.png +share/kde/apps/carddecks/cards-konqi-modern/43.png +share/kde/apps/carddecks/cards-konqi-modern/44.png +share/kde/apps/carddecks/cards-konqi-modern/45.png +share/kde/apps/carddecks/cards-konqi-modern/46.png +share/kde/apps/carddecks/cards-konqi-modern/47.png +share/kde/apps/carddecks/cards-konqi-modern/48.png +share/kde/apps/carddecks/cards-konqi-modern/49.png +share/kde/apps/carddecks/cards-konqi-modern/5.png +share/kde/apps/carddecks/cards-konqi-modern/50.png +share/kde/apps/carddecks/cards-konqi-modern/51.png +share/kde/apps/carddecks/cards-konqi-modern/52.png +share/kde/apps/carddecks/cards-konqi-modern/6.png +share/kde/apps/carddecks/cards-konqi-modern/7.png +share/kde/apps/carddecks/cards-konqi-modern/8.png +share/kde/apps/carddecks/cards-konqi-modern/9.png +share/kde/apps/carddecks/cards-konqi-modern/index.desktop +share/kde/apps/carddecks/cards-penguins/1.png +share/kde/apps/carddecks/cards-penguins/10.png +share/kde/apps/carddecks/cards-penguins/11.png +share/kde/apps/carddecks/cards-penguins/12.png +share/kde/apps/carddecks/cards-penguins/13.png +share/kde/apps/carddecks/cards-penguins/14.png +share/kde/apps/carddecks/cards-penguins/15.png +share/kde/apps/carddecks/cards-penguins/16.png +share/kde/apps/carddecks/cards-penguins/17.png +share/kde/apps/carddecks/cards-penguins/18.png +share/kde/apps/carddecks/cards-penguins/19.png +share/kde/apps/carddecks/cards-penguins/2.png +share/kde/apps/carddecks/cards-penguins/20.png +share/kde/apps/carddecks/cards-penguins/21.png +share/kde/apps/carddecks/cards-penguins/22.png +share/kde/apps/carddecks/cards-penguins/23.png +share/kde/apps/carddecks/cards-penguins/24.png +share/kde/apps/carddecks/cards-penguins/25.png +share/kde/apps/carddecks/cards-penguins/26.png +share/kde/apps/carddecks/cards-penguins/27.png +share/kde/apps/carddecks/cards-penguins/28.png +share/kde/apps/carddecks/cards-penguins/29.png +share/kde/apps/carddecks/cards-penguins/3.png +share/kde/apps/carddecks/cards-penguins/30.png +share/kde/apps/carddecks/cards-penguins/31.png +share/kde/apps/carddecks/cards-penguins/32.png +share/kde/apps/carddecks/cards-penguins/33.png +share/kde/apps/carddecks/cards-penguins/34.png +share/kde/apps/carddecks/cards-penguins/35.png +share/kde/apps/carddecks/cards-penguins/36.png +share/kde/apps/carddecks/cards-penguins/37.png +share/kde/apps/carddecks/cards-penguins/38.png +share/kde/apps/carddecks/cards-penguins/39.png +share/kde/apps/carddecks/cards-penguins/4.png +share/kde/apps/carddecks/cards-penguins/40.png +share/kde/apps/carddecks/cards-penguins/41.png +share/kde/apps/carddecks/cards-penguins/42.png +share/kde/apps/carddecks/cards-penguins/43.png +share/kde/apps/carddecks/cards-penguins/44.png +share/kde/apps/carddecks/cards-penguins/45.png +share/kde/apps/carddecks/cards-penguins/46.png +share/kde/apps/carddecks/cards-penguins/47.png +share/kde/apps/carddecks/cards-penguins/48.png +share/kde/apps/carddecks/cards-penguins/49.png +share/kde/apps/carddecks/cards-penguins/5.png +share/kde/apps/carddecks/cards-penguins/50.png +share/kde/apps/carddecks/cards-penguins/51.png +share/kde/apps/carddecks/cards-penguins/52.png +share/kde/apps/carddecks/cards-penguins/6.png +share/kde/apps/carddecks/cards-penguins/7.png +share/kde/apps/carddecks/cards-penguins/8.png +share/kde/apps/carddecks/cards-penguins/9.png +share/kde/apps/carddecks/cards-penguins/COPYRIGHT +share/kde/apps/carddecks/cards-penguins/index.desktop +share/kde/apps/carddecks/cards-spaced/1.png +share/kde/apps/carddecks/cards-spaced/10.png +share/kde/apps/carddecks/cards-spaced/11.png +share/kde/apps/carddecks/cards-spaced/12.png +share/kde/apps/carddecks/cards-spaced/13.png +share/kde/apps/carddecks/cards-spaced/14.png +share/kde/apps/carddecks/cards-spaced/15.png +share/kde/apps/carddecks/cards-spaced/16.png +share/kde/apps/carddecks/cards-spaced/17.png +share/kde/apps/carddecks/cards-spaced/18.png +share/kde/apps/carddecks/cards-spaced/19.png +share/kde/apps/carddecks/cards-spaced/2.png +share/kde/apps/carddecks/cards-spaced/20.png +share/kde/apps/carddecks/cards-spaced/21.png +share/kde/apps/carddecks/cards-spaced/22.png +share/kde/apps/carddecks/cards-spaced/23.png +share/kde/apps/carddecks/cards-spaced/24.png +share/kde/apps/carddecks/cards-spaced/25.png +share/kde/apps/carddecks/cards-spaced/26.png +share/kde/apps/carddecks/cards-spaced/27.png +share/kde/apps/carddecks/cards-spaced/28.png +share/kde/apps/carddecks/cards-spaced/29.png +share/kde/apps/carddecks/cards-spaced/3.png +share/kde/apps/carddecks/cards-spaced/30.png +share/kde/apps/carddecks/cards-spaced/31.png +share/kde/apps/carddecks/cards-spaced/32.png +share/kde/apps/carddecks/cards-spaced/33.png +share/kde/apps/carddecks/cards-spaced/34.png +share/kde/apps/carddecks/cards-spaced/35.png +share/kde/apps/carddecks/cards-spaced/36.png +share/kde/apps/carddecks/cards-spaced/37.png +share/kde/apps/carddecks/cards-spaced/38.png +share/kde/apps/carddecks/cards-spaced/39.png +share/kde/apps/carddecks/cards-spaced/4.png +share/kde/apps/carddecks/cards-spaced/40.png +share/kde/apps/carddecks/cards-spaced/41.png +share/kde/apps/carddecks/cards-spaced/42.png +share/kde/apps/carddecks/cards-spaced/43.png +share/kde/apps/carddecks/cards-spaced/44.png +share/kde/apps/carddecks/cards-spaced/45.png +share/kde/apps/carddecks/cards-spaced/46.png +share/kde/apps/carddecks/cards-spaced/47.png +share/kde/apps/carddecks/cards-spaced/48.png +share/kde/apps/carddecks/cards-spaced/49.png +share/kde/apps/carddecks/cards-spaced/5.png +share/kde/apps/carddecks/cards-spaced/50.png +share/kde/apps/carddecks/cards-spaced/51.png +share/kde/apps/carddecks/cards-spaced/52.png +share/kde/apps/carddecks/cards-spaced/6.png +share/kde/apps/carddecks/cards-spaced/7.png +share/kde/apps/carddecks/cards-spaced/8.png +share/kde/apps/carddecks/cards-spaced/9.png +share/kde/apps/carddecks/cards-spaced/COPYRIGHT +share/kde/apps/carddecks/cards-spaced/index.desktop +share/kde/apps/carddecks/cards-warwick/0.png +share/kde/apps/carddecks/cards-warwick/1.png +share/kde/apps/carddecks/cards-warwick/10.png +share/kde/apps/carddecks/cards-warwick/105.png +share/kde/apps/carddecks/cards-warwick/106.png +share/kde/apps/carddecks/cards-warwick/107.png +share/kde/apps/carddecks/cards-warwick/108.png +share/kde/apps/carddecks/cards-warwick/109.png +share/kde/apps/carddecks/cards-warwick/11.png +share/kde/apps/carddecks/cards-warwick/110.png +share/kde/apps/carddecks/cards-warwick/111.png +share/kde/apps/carddecks/cards-warwick/112.png +share/kde/apps/carddecks/cards-warwick/113.png +share/kde/apps/carddecks/cards-warwick/114.png +share/kde/apps/carddecks/cards-warwick/115.png +share/kde/apps/carddecks/cards-warwick/116.png +share/kde/apps/carddecks/cards-warwick/12.png +share/kde/apps/carddecks/cards-warwick/13.png +share/kde/apps/carddecks/cards-warwick/14.png +share/kde/apps/carddecks/cards-warwick/15.png +share/kde/apps/carddecks/cards-warwick/16.png +share/kde/apps/carddecks/cards-warwick/17.png +share/kde/apps/carddecks/cards-warwick/18.png +share/kde/apps/carddecks/cards-warwick/19.png +share/kde/apps/carddecks/cards-warwick/2.png +share/kde/apps/carddecks/cards-warwick/20.png +share/kde/apps/carddecks/cards-warwick/21.png +share/kde/apps/carddecks/cards-warwick/22.png +share/kde/apps/carddecks/cards-warwick/23.png +share/kde/apps/carddecks/cards-warwick/24.png +share/kde/apps/carddecks/cards-warwick/25.png +share/kde/apps/carddecks/cards-warwick/26.png +share/kde/apps/carddecks/cards-warwick/27.png +share/kde/apps/carddecks/cards-warwick/28.png +share/kde/apps/carddecks/cards-warwick/29.png +share/kde/apps/carddecks/cards-warwick/3.png +share/kde/apps/carddecks/cards-warwick/30.png +share/kde/apps/carddecks/cards-warwick/31.png +share/kde/apps/carddecks/cards-warwick/32.png +share/kde/apps/carddecks/cards-warwick/33.png +share/kde/apps/carddecks/cards-warwick/34.png +share/kde/apps/carddecks/cards-warwick/35.png +share/kde/apps/carddecks/cards-warwick/36.png +share/kde/apps/carddecks/cards-warwick/37.png +share/kde/apps/carddecks/cards-warwick/38.png +share/kde/apps/carddecks/cards-warwick/39.png +share/kde/apps/carddecks/cards-warwick/4.png +share/kde/apps/carddecks/cards-warwick/40.png +share/kde/apps/carddecks/cards-warwick/41.png +share/kde/apps/carddecks/cards-warwick/42.png +share/kde/apps/carddecks/cards-warwick/43.png +share/kde/apps/carddecks/cards-warwick/44.png +share/kde/apps/carddecks/cards-warwick/45.png +share/kde/apps/carddecks/cards-warwick/46.png +share/kde/apps/carddecks/cards-warwick/47.png +share/kde/apps/carddecks/cards-warwick/48.png +share/kde/apps/carddecks/cards-warwick/49.png +share/kde/apps/carddecks/cards-warwick/5.png +share/kde/apps/carddecks/cards-warwick/50.png +share/kde/apps/carddecks/cards-warwick/51.png +share/kde/apps/carddecks/cards-warwick/52.png +share/kde/apps/carddecks/cards-warwick/6.png +share/kde/apps/carddecks/cards-warwick/7.png +share/kde/apps/carddecks/cards-warwick/8.png +share/kde/apps/carddecks/cards-warwick/9.png +share/kde/apps/carddecks/cards-warwick/index.desktop +share/kde/apps/carddecks/cards-xskat-french/1.png +share/kde/apps/carddecks/cards-xskat-french/10.png +share/kde/apps/carddecks/cards-xskat-french/11.png +share/kde/apps/carddecks/cards-xskat-french/12.png +share/kde/apps/carddecks/cards-xskat-french/13.png +share/kde/apps/carddecks/cards-xskat-french/14.png +share/kde/apps/carddecks/cards-xskat-french/15.png +share/kde/apps/carddecks/cards-xskat-french/16.png +share/kde/apps/carddecks/cards-xskat-french/17.png +share/kde/apps/carddecks/cards-xskat-french/18.png +share/kde/apps/carddecks/cards-xskat-french/19.png +share/kde/apps/carddecks/cards-xskat-french/2.png +share/kde/apps/carddecks/cards-xskat-french/20.png +share/kde/apps/carddecks/cards-xskat-french/21.png +share/kde/apps/carddecks/cards-xskat-french/22.png +share/kde/apps/carddecks/cards-xskat-french/23.png +share/kde/apps/carddecks/cards-xskat-french/24.png +share/kde/apps/carddecks/cards-xskat-french/25.png +share/kde/apps/carddecks/cards-xskat-french/26.png +share/kde/apps/carddecks/cards-xskat-french/27.png +share/kde/apps/carddecks/cards-xskat-french/28.png +share/kde/apps/carddecks/cards-xskat-french/29.png +share/kde/apps/carddecks/cards-xskat-french/3.png +share/kde/apps/carddecks/cards-xskat-french/30.png +share/kde/apps/carddecks/cards-xskat-french/31.png +share/kde/apps/carddecks/cards-xskat-french/32.png +share/kde/apps/carddecks/cards-xskat-french/33.png +share/kde/apps/carddecks/cards-xskat-french/34.png +share/kde/apps/carddecks/cards-xskat-french/35.png +share/kde/apps/carddecks/cards-xskat-french/36.png +share/kde/apps/carddecks/cards-xskat-french/37.png +share/kde/apps/carddecks/cards-xskat-french/38.png +share/kde/apps/carddecks/cards-xskat-french/39.png +share/kde/apps/carddecks/cards-xskat-french/4.png +share/kde/apps/carddecks/cards-xskat-french/40.png +share/kde/apps/carddecks/cards-xskat-french/41.png +share/kde/apps/carddecks/cards-xskat-french/42.png +share/kde/apps/carddecks/cards-xskat-french/43.png +share/kde/apps/carddecks/cards-xskat-french/44.png +share/kde/apps/carddecks/cards-xskat-french/45.png +share/kde/apps/carddecks/cards-xskat-french/46.png +share/kde/apps/carddecks/cards-xskat-french/47.png +share/kde/apps/carddecks/cards-xskat-french/48.png +share/kde/apps/carddecks/cards-xskat-french/49.png +share/kde/apps/carddecks/cards-xskat-french/5.png +share/kde/apps/carddecks/cards-xskat-french/50.png +share/kde/apps/carddecks/cards-xskat-french/51.png +share/kde/apps/carddecks/cards-xskat-french/52.png +share/kde/apps/carddecks/cards-xskat-french/6.png +share/kde/apps/carddecks/cards-xskat-french/7.png +share/kde/apps/carddecks/cards-xskat-french/8.png +share/kde/apps/carddecks/cards-xskat-french/9.png +share/kde/apps/carddecks/cards-xskat-french/COPYRIGHT +share/kde/apps/carddecks/cards-xskat-french/index.desktop +share/kde/apps/carddecks/decks/deck0.desktop +share/kde/apps/carddecks/decks/deck0.png +share/kde/apps/carddecks/decks/deck1.desktop +share/kde/apps/carddecks/decks/deck1.png +share/kde/apps/carddecks/decks/deck10.desktop +share/kde/apps/carddecks/decks/deck10.png +share/kde/apps/carddecks/decks/deck11.desktop +share/kde/apps/carddecks/decks/deck11.png +share/kde/apps/carddecks/decks/deck12.desktop +share/kde/apps/carddecks/decks/deck12.png +share/kde/apps/carddecks/decks/deck13.desktop +share/kde/apps/carddecks/decks/deck13.png +share/kde/apps/carddecks/decks/deck14.desktop +share/kde/apps/carddecks/decks/deck14.png +share/kde/apps/carddecks/decks/deck15.desktop +share/kde/apps/carddecks/decks/deck15.png +share/kde/apps/carddecks/decks/deck16.desktop +share/kde/apps/carddecks/decks/deck16.png +share/kde/apps/carddecks/decks/deck17.desktop +share/kde/apps/carddecks/decks/deck17.png +share/kde/apps/carddecks/decks/deck18.desktop +share/kde/apps/carddecks/decks/deck18.png +share/kde/apps/carddecks/decks/deck19.desktop +share/kde/apps/carddecks/decks/deck19.png +share/kde/apps/carddecks/decks/deck2.desktop +share/kde/apps/carddecks/decks/deck2.png +share/kde/apps/carddecks/decks/deck20.desktop +share/kde/apps/carddecks/decks/deck20.png +share/kde/apps/carddecks/decks/deck21.desktop +share/kde/apps/carddecks/decks/deck21.png +share/kde/apps/carddecks/decks/deck22.desktop +share/kde/apps/carddecks/decks/deck22.png +share/kde/apps/carddecks/decks/deck23.desktop +share/kde/apps/carddecks/decks/deck23.png +share/kde/apps/carddecks/decks/deck24.desktop +share/kde/apps/carddecks/decks/deck24.png +share/kde/apps/carddecks/decks/deck3.desktop +share/kde/apps/carddecks/decks/deck3.png +share/kde/apps/carddecks/decks/deck4.desktop +share/kde/apps/carddecks/decks/deck4.png +share/kde/apps/carddecks/decks/deck5.desktop +share/kde/apps/carddecks/decks/deck5.png +share/kde/apps/carddecks/decks/deck6.desktop +share/kde/apps/carddecks/decks/deck6.png +share/kde/apps/carddecks/decks/deck7.desktop +share/kde/apps/carddecks/decks/deck7.png +share/kde/apps/carddecks/decks/deck8.desktop +share/kde/apps/carddecks/decks/deck8.png +share/kde/apps/carddecks/decks/deck9.desktop +share/kde/apps/carddecks/decks/deck9.png +share/kde/apps/kasteroids/kasteroidsui.rc +share/kde/apps/kasteroids/sounds/Explosion.wav +share/kde/apps/kasteroids/sprites/bg.png +share/kde/apps/kasteroids/sprites/bits/bits0000.png +share/kde/apps/kasteroids/sprites/bits/bits0001.png +share/kde/apps/kasteroids/sprites/bits/bits0002.png +share/kde/apps/kasteroids/sprites/bits/bits0003.png +share/kde/apps/kasteroids/sprites/bits/bits0004.png +share/kde/apps/kasteroids/sprites/bits/bits0005.png +share/kde/apps/kasteroids/sprites/bits/bits0006.png +share/kde/apps/kasteroids/sprites/bits/bits0007.png +share/kde/apps/kasteroids/sprites/bits/bits0008.png +share/kde/apps/kasteroids/sprites/bits/bits0009.png +share/kde/apps/kasteroids/sprites/bits/bits0010.png +share/kde/apps/kasteroids/sprites/bits/bits0011.png +share/kde/apps/kasteroids/sprites/bits/bits0012.png +share/kde/apps/kasteroids/sprites/bits/bits0013.png +share/kde/apps/kasteroids/sprites/bits/bits0014.png +share/kde/apps/kasteroids/sprites/bits/bits0015.png +share/kde/apps/kasteroids/sprites/exhaust/exhaust.png +share/kde/apps/kasteroids/sprites/missile/missile.png +share/kde/apps/kasteroids/sprites/powerups/brake.png +share/kde/apps/kasteroids/sprites/powerups/energy.png +share/kde/apps/kasteroids/sprites/powerups/shield.png +share/kde/apps/kasteroids/sprites/powerups/shoot.png +share/kde/apps/kasteroids/sprites/powerups/teleport.png +share/kde/apps/kasteroids/sprites/rock1/rock10000.png +share/kde/apps/kasteroids/sprites/rock1/rock10001.png +share/kde/apps/kasteroids/sprites/rock1/rock10002.png +share/kde/apps/kasteroids/sprites/rock1/rock10003.png +share/kde/apps/kasteroids/sprites/rock1/rock10004.png +share/kde/apps/kasteroids/sprites/rock1/rock10005.png +share/kde/apps/kasteroids/sprites/rock1/rock10006.png +share/kde/apps/kasteroids/sprites/rock1/rock10007.png +share/kde/apps/kasteroids/sprites/rock1/rock10008.png +share/kde/apps/kasteroids/sprites/rock1/rock10009.png +share/kde/apps/kasteroids/sprites/rock1/rock10010.png +share/kde/apps/kasteroids/sprites/rock1/rock10011.png +share/kde/apps/kasteroids/sprites/rock1/rock10012.png +share/kde/apps/kasteroids/sprites/rock1/rock10013.png +share/kde/apps/kasteroids/sprites/rock1/rock10014.png +share/kde/apps/kasteroids/sprites/rock1/rock10015.png +share/kde/apps/kasteroids/sprites/rock1/rock10016.png +share/kde/apps/kasteroids/sprites/rock1/rock10017.png +share/kde/apps/kasteroids/sprites/rock1/rock10018.png +share/kde/apps/kasteroids/sprites/rock1/rock10019.png +share/kde/apps/kasteroids/sprites/rock1/rock10020.png +share/kde/apps/kasteroids/sprites/rock1/rock10021.png +share/kde/apps/kasteroids/sprites/rock1/rock10022.png +share/kde/apps/kasteroids/sprites/rock1/rock10023.png +share/kde/apps/kasteroids/sprites/rock1/rock10024.png +share/kde/apps/kasteroids/sprites/rock1/rock10025.png +share/kde/apps/kasteroids/sprites/rock1/rock10026.png +share/kde/apps/kasteroids/sprites/rock1/rock10027.png +share/kde/apps/kasteroids/sprites/rock1/rock10028.png +share/kde/apps/kasteroids/sprites/rock1/rock10029.png +share/kde/apps/kasteroids/sprites/rock1/rock10030.png +share/kde/apps/kasteroids/sprites/rock1/rock10031.png +share/kde/apps/kasteroids/sprites/rock2/rock20000.png +share/kde/apps/kasteroids/sprites/rock2/rock20001.png +share/kde/apps/kasteroids/sprites/rock2/rock20002.png +share/kde/apps/kasteroids/sprites/rock2/rock20003.png +share/kde/apps/kasteroids/sprites/rock2/rock20004.png +share/kde/apps/kasteroids/sprites/rock2/rock20005.png +share/kde/apps/kasteroids/sprites/rock2/rock20006.png +share/kde/apps/kasteroids/sprites/rock2/rock20007.png +share/kde/apps/kasteroids/sprites/rock2/rock20008.png +share/kde/apps/kasteroids/sprites/rock2/rock20009.png +share/kde/apps/kasteroids/sprites/rock2/rock20010.png +share/kde/apps/kasteroids/sprites/rock2/rock20011.png +share/kde/apps/kasteroids/sprites/rock2/rock20012.png +share/kde/apps/kasteroids/sprites/rock2/rock20013.png +share/kde/apps/kasteroids/sprites/rock2/rock20014.png +share/kde/apps/kasteroids/sprites/rock2/rock20015.png +share/kde/apps/kasteroids/sprites/rock2/rock20016.png +share/kde/apps/kasteroids/sprites/rock2/rock20017.png +share/kde/apps/kasteroids/sprites/rock2/rock20018.png +share/kde/apps/kasteroids/sprites/rock2/rock20019.png +share/kde/apps/kasteroids/sprites/rock2/rock20020.png +share/kde/apps/kasteroids/sprites/rock2/rock20021.png +share/kde/apps/kasteroids/sprites/rock2/rock20022.png +share/kde/apps/kasteroids/sprites/rock2/rock20023.png +share/kde/apps/kasteroids/sprites/rock2/rock20024.png +share/kde/apps/kasteroids/sprites/rock2/rock20025.png +share/kde/apps/kasteroids/sprites/rock2/rock20026.png +share/kde/apps/kasteroids/sprites/rock2/rock20027.png +share/kde/apps/kasteroids/sprites/rock2/rock20028.png +share/kde/apps/kasteroids/sprites/rock2/rock20029.png +share/kde/apps/kasteroids/sprites/rock2/rock20030.png +share/kde/apps/kasteroids/sprites/rock2/rock20031.png +share/kde/apps/kasteroids/sprites/rock3/rock30000.png +share/kde/apps/kasteroids/sprites/rock3/rock30001.png +share/kde/apps/kasteroids/sprites/rock3/rock30002.png +share/kde/apps/kasteroids/sprites/rock3/rock30003.png +share/kde/apps/kasteroids/sprites/rock3/rock30004.png +share/kde/apps/kasteroids/sprites/rock3/rock30005.png +share/kde/apps/kasteroids/sprites/rock3/rock30006.png +share/kde/apps/kasteroids/sprites/rock3/rock30007.png +share/kde/apps/kasteroids/sprites/rock3/rock30008.png +share/kde/apps/kasteroids/sprites/rock3/rock30009.png +share/kde/apps/kasteroids/sprites/rock3/rock30010.png +share/kde/apps/kasteroids/sprites/rock3/rock30011.png +share/kde/apps/kasteroids/sprites/rock3/rock30012.png +share/kde/apps/kasteroids/sprites/rock3/rock30013.png +share/kde/apps/kasteroids/sprites/rock3/rock30014.png +share/kde/apps/kasteroids/sprites/rock3/rock30015.png +share/kde/apps/kasteroids/sprites/rock3/rock30016.png +share/kde/apps/kasteroids/sprites/rock3/rock30017.png +share/kde/apps/kasteroids/sprites/rock3/rock30018.png +share/kde/apps/kasteroids/sprites/rock3/rock30019.png +share/kde/apps/kasteroids/sprites/rock3/rock30020.png +share/kde/apps/kasteroids/sprites/rock3/rock30021.png +share/kde/apps/kasteroids/sprites/rock3/rock30022.png +share/kde/apps/kasteroids/sprites/rock3/rock30023.png +share/kde/apps/kasteroids/sprites/rock3/rock30024.png +share/kde/apps/kasteroids/sprites/rock3/rock30025.png +share/kde/apps/kasteroids/sprites/rock3/rock30026.png +share/kde/apps/kasteroids/sprites/rock3/rock30027.png +share/kde/apps/kasteroids/sprites/rock3/rock30028.png +share/kde/apps/kasteroids/sprites/rock3/rock30029.png +share/kde/apps/kasteroids/sprites/rock3/rock30030.png +share/kde/apps/kasteroids/sprites/rock3/rock30031.png +share/kde/apps/kasteroids/sprites/shield/shield0000.png +share/kde/apps/kasteroids/sprites/shield/shield0001.png +share/kde/apps/kasteroids/sprites/shield/shield0002.png +share/kde/apps/kasteroids/sprites/shield/shield0003.png +share/kde/apps/kasteroids/sprites/shield/shield0004.png +share/kde/apps/kasteroids/sprites/shield/shield0005.png +share/kde/apps/kasteroids/sprites/shield/shield0006.png +share/kde/apps/kasteroids/sprites/ship/ship0000.png +share/kde/apps/kasteroids/sprites/ship/ship0001.png +share/kde/apps/kasteroids/sprites/ship/ship0002.png +share/kde/apps/kasteroids/sprites/ship/ship0003.png +share/kde/apps/kasteroids/sprites/ship/ship0004.png +share/kde/apps/kasteroids/sprites/ship/ship0005.png +share/kde/apps/kasteroids/sprites/ship/ship0006.png +share/kde/apps/kasteroids/sprites/ship/ship0007.png +share/kde/apps/kasteroids/sprites/ship/ship0008.png +share/kde/apps/kasteroids/sprites/ship/ship0009.png +share/kde/apps/kasteroids/sprites/ship/ship0010.png +share/kde/apps/kasteroids/sprites/ship/ship0011.png +share/kde/apps/kasteroids/sprites/ship/ship0012.png +share/kde/apps/kasteroids/sprites/ship/ship0013.png +share/kde/apps/kasteroids/sprites/ship/ship0014.png +share/kde/apps/kasteroids/sprites/ship/ship0015.png +share/kde/apps/kasteroids/sprites/ship/ship0016.png +share/kde/apps/kasteroids/sprites/ship/ship0017.png +share/kde/apps/kasteroids/sprites/ship/ship0018.png +share/kde/apps/kasteroids/sprites/ship/ship0019.png +share/kde/apps/kasteroids/sprites/ship/ship0020.png +share/kde/apps/kasteroids/sprites/ship/ship0021.png +share/kde/apps/kasteroids/sprites/ship/ship0022.png +share/kde/apps/kasteroids/sprites/ship/ship0023.png +share/kde/apps/kasteroids/sprites/ship/ship0024.png +share/kde/apps/kasteroids/sprites/ship/ship0025.png +share/kde/apps/kasteroids/sprites/ship/ship0026.png +share/kde/apps/kasteroids/sprites/ship/ship0027.png +share/kde/apps/kasteroids/sprites/ship/ship0028.png +share/kde/apps/kasteroids/sprites/ship/ship0029.png +share/kde/apps/kasteroids/sprites/ship/ship0030.png +share/kde/apps/kasteroids/sprites/ship/ship0031.png +share/kde/apps/kasteroids/sprites/ship/ship0032.png +share/kde/apps/kasteroids/sprites/ship/ship0033.png +share/kde/apps/kasteroids/sprites/ship/ship0034.png +share/kde/apps/kasteroids/sprites/ship/ship0035.png +share/kde/apps/kasteroids/sprites/ship/ship0036.png +share/kde/apps/kasteroids/sprites/ship/ship0037.png +share/kde/apps/kasteroids/sprites/ship/ship0038.png +share/kde/apps/kasteroids/sprites/ship/ship0039.png +share/kde/apps/kasteroids/sprites/ship/ship0040.png +share/kde/apps/kasteroids/sprites/ship/ship0041.png +share/kde/apps/kasteroids/sprites/ship/ship0042.png +share/kde/apps/kasteroids/sprites/ship/ship0043.png +share/kde/apps/kasteroids/sprites/ship/ship0044.png +share/kde/apps/kasteroids/sprites/ship/ship0045.png +share/kde/apps/kasteroids/sprites/ship/ship0046.png +share/kde/apps/kasteroids/sprites/ship/ship0047.png +share/kde/apps/kasteroids/sprites/ship/ship0048.png +share/kde/apps/kasteroids/sprites/ship/ship0049.png +share/kde/apps/kasteroids/sprites/ship/ship0050.png +share/kde/apps/kasteroids/sprites/ship/ship0051.png +share/kde/apps/kasteroids/sprites/ship/ship0052.png +share/kde/apps/kasteroids/sprites/ship/ship0053.png +share/kde/apps/kasteroids/sprites/ship/ship0054.png +share/kde/apps/kasteroids/sprites/ship/ship0055.png +share/kde/apps/kasteroids/sprites/ship/ship0056.png +share/kde/apps/kasteroids/sprites/ship/ship0057.png +share/kde/apps/kasteroids/sprites/ship/ship0058.png +share/kde/apps/kasteroids/sprites/ship/ship0059.png +share/kde/apps/kasteroids/sprites/ship/ship0060.png +share/kde/apps/kasteroids/sprites/ship/ship0061.png +share/kde/apps/kasteroids/sprites/ship/ship0062.png +share/kde/apps/kasteroids/sprites/ship/ship0063.png +share/kde/apps/katomic/katomicui.rc +share/kde/apps/katomic/levels/level_1 +share/kde/apps/katomic/levels/level_10 +share/kde/apps/katomic/levels/level_11 +share/kde/apps/katomic/levels/level_12 +share/kde/apps/katomic/levels/level_13 +share/kde/apps/katomic/levels/level_14 +share/kde/apps/katomic/levels/level_15 +share/kde/apps/katomic/levels/level_16 +share/kde/apps/katomic/levels/level_17 +share/kde/apps/katomic/levels/level_18 +share/kde/apps/katomic/levels/level_19 +share/kde/apps/katomic/levels/level_2 +share/kde/apps/katomic/levels/level_20 +share/kde/apps/katomic/levels/level_21 +share/kde/apps/katomic/levels/level_22 +share/kde/apps/katomic/levels/level_23 +share/kde/apps/katomic/levels/level_24 +share/kde/apps/katomic/levels/level_25 +share/kde/apps/katomic/levels/level_26 +share/kde/apps/katomic/levels/level_27 +share/kde/apps/katomic/levels/level_28 +share/kde/apps/katomic/levels/level_29 +share/kde/apps/katomic/levels/level_3 +share/kde/apps/katomic/levels/level_30 +share/kde/apps/katomic/levels/level_31 +share/kde/apps/katomic/levels/level_32 +share/kde/apps/katomic/levels/level_33 +share/kde/apps/katomic/levels/level_34 +share/kde/apps/katomic/levels/level_35 +share/kde/apps/katomic/levels/level_36 +share/kde/apps/katomic/levels/level_37 +share/kde/apps/katomic/levels/level_38 +share/kde/apps/katomic/levels/level_39 +share/kde/apps/katomic/levels/level_4 +share/kde/apps/katomic/levels/level_40 +share/kde/apps/katomic/levels/level_41 +share/kde/apps/katomic/levels/level_42 +share/kde/apps/katomic/levels/level_43 +share/kde/apps/katomic/levels/level_44 +share/kde/apps/katomic/levels/level_45 +share/kde/apps/katomic/levels/level_46 +share/kde/apps/katomic/levels/level_47 +share/kde/apps/katomic/levels/level_48 +share/kde/apps/katomic/levels/level_49 +share/kde/apps/katomic/levels/level_5 +share/kde/apps/katomic/levels/level_50 +share/kde/apps/katomic/levels/level_51 +share/kde/apps/katomic/levels/level_52 +share/kde/apps/katomic/levels/level_53 +share/kde/apps/katomic/levels/level_54 +share/kde/apps/katomic/levels/level_55 +share/kde/apps/katomic/levels/level_56 +share/kde/apps/katomic/levels/level_57 +share/kde/apps/katomic/levels/level_58 +share/kde/apps/katomic/levels/level_59 +share/kde/apps/katomic/levels/level_6 +share/kde/apps/katomic/levels/level_60 +share/kde/apps/katomic/levels/level_61 +share/kde/apps/katomic/levels/level_62 +share/kde/apps/katomic/levels/level_63 +share/kde/apps/katomic/levels/level_64 +share/kde/apps/katomic/levels/level_65 +share/kde/apps/katomic/levels/level_66 +share/kde/apps/katomic/levels/level_67 +share/kde/apps/katomic/levels/level_68 +share/kde/apps/katomic/levels/level_69 +share/kde/apps/katomic/levels/level_7 +share/kde/apps/katomic/levels/level_70 +share/kde/apps/katomic/levels/level_71 +share/kde/apps/katomic/levels/level_72 +share/kde/apps/katomic/levels/level_73 +share/kde/apps/katomic/levels/level_74 +share/kde/apps/katomic/levels/level_75 +share/kde/apps/katomic/levels/level_76 +share/kde/apps/katomic/levels/level_77 +share/kde/apps/katomic/levels/level_78 +share/kde/apps/katomic/levels/level_79 +share/kde/apps/katomic/levels/level_8 +share/kde/apps/katomic/levels/level_80 +share/kde/apps/katomic/levels/level_81 +share/kde/apps/katomic/levels/level_82 +share/kde/apps/katomic/levels/level_9 +share/kde/apps/katomic/pics/abilder.png +share/kde/apps/katomic/pics/molek.png +share/kde/apps/kbackgammon/eventsrc +share/kde/apps/kbackgammon/kbackgammonui.rc +share/kde/apps/kbackgammon/pics/kbackgammon-chat.png +share/kde/apps/kbackgammon/pics/kbackgammon-double.xpm +share/kde/apps/kbackgammon/pics/kbackgammon-fonts.xpm +share/kde/apps/kbackgammon/pics/kbackgammon-hint.xpm +share/kde/apps/kbackgammon/pics/kbackgammon-redo.xpm +share/kde/apps/kbackgammon/pics/kbackgammon-reload.xpm +share/kde/apps/kbackgammon/pics/kbackgammon-roll.xpm +share/kde/apps/kbackgammon/pics/kbackgammon-send.xpm +share/kde/apps/kbackgammon/pics/kbackgammon-undo.xpm +share/kde/apps/kbackgammon/sounds/kbackgammon-lost.wav +share/kde/apps/kbackgammon/sounds/kbackgammon-move.wav +share/kde/apps/kbackgammon/sounds/kbackgammon-roll.wav +share/kde/apps/kbackgammon/sounds/kbackgammon-won.wav +share/kde/apps/kbattleship/kbattleshipui.rc +share/kde/apps/kbattleship/pictures/death.png +share/kde/apps/kbattleship/pictures/hit.png +share/kde/apps/kbattleship/pictures/sea.png +share/kde/apps/kbattleship/pictures/ship1-1-r.png +share/kde/apps/kbattleship/pictures/ship1-1.png +share/kde/apps/kbattleship/pictures/ship2-1-r.png +share/kde/apps/kbattleship/pictures/ship2-1.png +share/kde/apps/kbattleship/pictures/ship2-2-r.png +share/kde/apps/kbattleship/pictures/ship2-2.png +share/kde/apps/kbattleship/pictures/ship3-1-r.png +share/kde/apps/kbattleship/pictures/ship3-1.png +share/kde/apps/kbattleship/pictures/ship3-2-r.png +share/kde/apps/kbattleship/pictures/ship3-2.png +share/kde/apps/kbattleship/pictures/ship3-3-r.png +share/kde/apps/kbattleship/pictures/ship3-3.png +share/kde/apps/kbattleship/pictures/ship4-1-r.png +share/kde/apps/kbattleship/pictures/ship4-1.png +share/kde/apps/kbattleship/pictures/ship4-2-r.png +share/kde/apps/kbattleship/pictures/ship4-2.png +share/kde/apps/kbattleship/pictures/ship4-3-r.png +share/kde/apps/kbattleship/pictures/ship4-3.png +share/kde/apps/kbattleship/pictures/ship4-4-r.png +share/kde/apps/kbattleship/pictures/ship4-4.png +share/kde/apps/kbattleship/pictures/water.png +share/kde/apps/kbattleship/sounds/ship-player-shoot-water.mp3 +share/kde/apps/kbattleship/sounds/ship-player1-shoot.mp3 +share/kde/apps/kbattleship/sounds/ship-player2-shoot.mp3 +share/kde/apps/kbattleship/sounds/ship-sink.mp3 +share/kde/apps/kblackbox/kblackboxui.rc +share/kde/apps/kblackbox/pics/blue.xpm +share/kde/apps/kblackbox/pics/brown.xpm +share/kde/apps/kblackbox/pics/cyan.xpm +share/kde/apps/kblackbox/pics/done.xpm +share/kde/apps/kblackbox/pics/giveup.xpm +share/kde/apps/kblackbox/pics/gray.xpm +share/kde/apps/kblackbox/pics/green.xpm +share/kde/apps/kblackbox/pics/green2.xpm +share/kde/apps/kblackbox/pics/red.xpm +share/kde/apps/kblackbox/pics/white.xpm +share/kde/apps/kbounce/kbounceui.rc +share/kde/apps/kbounce/pics/ball0000.png +share/kde/apps/kbounce/pics/ball0001.png +share/kde/apps/kbounce/pics/ball0002.png +share/kde/apps/kbounce/pics/ball0003.png +share/kde/apps/kbounce/pics/ball0004.png +share/kde/apps/kbounce/pics/ball0005.png +share/kde/apps/kbounce/pics/ball0006.png +share/kde/apps/kbounce/pics/ball0007.png +share/kde/apps/kbounce/pics/ball0008.png +share/kde/apps/kbounce/pics/ball0009.png +share/kde/apps/kbounce/pics/ball0010.png +share/kde/apps/kbounce/pics/ball0011.png +share/kde/apps/kbounce/pics/ball0012.png +share/kde/apps/kbounce/pics/ball0013.png +share/kde/apps/kbounce/pics/ball0014.png +share/kde/apps/kbounce/pics/ball0015.png +share/kde/apps/kbounce/pics/ball0016.png +share/kde/apps/kbounce/pics/ball0017.png +share/kde/apps/kbounce/pics/ball0018.png +share/kde/apps/kbounce/pics/ball0019.png +share/kde/apps/kbounce/pics/ball0020.png +share/kde/apps/kbounce/pics/ball0021.png +share/kde/apps/kbounce/pics/ball0022.png +share/kde/apps/kbounce/pics/ball0023.png +share/kde/apps/kbounce/pics/ball0024.png +share/kde/apps/kbounce/pics/tiles.png +share/kde/apps/kbounce/sounds/death.au +share/kde/apps/kbounce/sounds/reflect.au +share/kde/apps/kbounce/sounds/seconds.au +share/kde/apps/kbounce/sounds/timeout.au +share/kde/apps/kbounce/sounds/wallend.au +share/kde/apps/kbounce/sounds/wallstart.au +share/kde/apps/kdegames/pics/star.png +share/kde/apps/kenolaba/kenolabaui.rc +share/kde/apps/kenolaba/toolbar/edit.xpm +share/kde/apps/kenolaba/toolbar/hint.xpm +share/kde/apps/kenolaba/toolbar/net.xpm +share/kde/apps/kenolaba/toolbar/new.xpm +share/kde/apps/kenolaba/toolbar/noball.xpm +share/kde/apps/kenolaba/toolbar/ok.xpm +share/kde/apps/kenolaba/toolbar/redball.xpm +share/kde/apps/kenolaba/toolbar/spy0.xpm +share/kde/apps/kenolaba/toolbar/spy1.xpm +share/kde/apps/kenolaba/toolbar/spy2.xpm +share/kde/apps/kenolaba/toolbar/spy3.xpm +share/kde/apps/kenolaba/toolbar/stop.xpm +share/kde/apps/kenolaba/toolbar/undo.xpm +share/kde/apps/kenolaba/toolbar/warning.xpm +share/kde/apps/kenolaba/toolbar/yellowball.xpm +share/kde/apps/kfouleggs/kfouleggsui.rc +share/kde/apps/kjumpingcube/kjumpingcubeui.rc +share/kde/apps/klines/balls.jpg +share/kde/apps/klines/field.jpg +share/kde/apps/klines/fire.jpg +share/kde/apps/kmahjongg/pics/cross.layout +share/kde/apps/kmahjongg/pics/default.bgnd +share/kde/apps/kmahjongg/pics/default.layout +share/kde/apps/kmahjongg/pics/default.theme +share/kde/apps/kmahjongg/pics/default.tileset +share/kde/apps/kmahjongg/pics/haze.bgnd +share/kde/apps/kmahjongg/pics/kmahjongg.png +share/kde/apps/kmahjongg/pics/kmahjongg_bgnd.png +share/kde/apps/kmahjongg/pics/pirates.bgnd +share/kde/apps/kmahjongg/pics/pirates.layout +share/kde/apps/kmahjongg/pics/pirates.theme +share/kde/apps/kmahjongg/pics/pirates.tileset +share/kde/apps/kmahjongg/pics/pyramid.layout +share/kde/apps/kmahjongg/pics/slate.bgnd +share/kde/apps/kmahjongg/pics/splash.png +share/kde/apps/kmahjongg/pics/stax.layout +share/kde/apps/kmahjongg/pics/test.layout +share/kde/apps/kmahjongg/pics/test2.layout +share/kde/apps/kmahjongg/pics/tower.layout +share/kde/apps/kmahjongg/pics/traditional.tileset +share/kde/apps/kmahjongg/pics/triangle.layout +share/kde/apps/kmahjongg/pics/wood.bgnd +share/kde/apps/kmahjongg/toolbar/newnum.xpm +share/kde/apps/kmahjongg/toolbar/pause.xpm +share/kde/apps/kmahjongg/toolbar/play.xpm +share/kde/apps/kmines/kminesui.rc +share/kde/apps/konquest/konquestui.rc +share/kde/apps/konquest/pics/konquest-splash.png +share/kde/apps/konquest/pics/planet1.xpm +share/kde/apps/konquest/pics/planet2.xpm +share/kde/apps/konquest/pics/planet3.xpm +share/kde/apps/konquest/pics/planet4.xpm +share/kde/apps/konquest/pics/planet5.xpm +share/kde/apps/konquest/pics/planet6.xpm +share/kde/apps/konquest/pics/planet7.xpm +share/kde/apps/konquest/pics/planet8.xpm +share/kde/apps/konquest/pics/planet9.xpm +share/kde/apps/konquest/pics/ruler.xpm +share/kde/apps/kpat/kpatui.rc +share/kde/apps/kpoker/kpokerui.rc +share/kde/apps/kpoker/sounds/cardflip.wav +share/kde/apps/kpoker/sounds/hold.wav +share/kde/apps/kpoker/sounds/lose.wav +share/kde/apps/kpoker/sounds/win.wav +share/kde/apps/kreversi/pics/background/Dark_Wood.xpm +share/kde/apps/kreversi/pics/background/Earth.xpm +share/kde/apps/kreversi/pics/background/Granite.xpm +share/kde/apps/kreversi/pics/background/Hexagon.xpm +share/kde/apps/kreversi/pics/background/Light_Wood.xpm +share/kde/apps/kreversi/pics/background/Mystique.xpm +share/kde/apps/kreversi/pics/background/Ocean.xpm +share/kde/apps/kreversi/pics/background/Pipes.xpm +share/kde/apps/kreversi/pics/background/Puzzle.xpm +share/kde/apps/kreversi/pics/background/Stones.xpm +share/kde/apps/kreversi/pics/chips.xpm +share/kde/apps/kreversi/pics/chips_mono.xpm +share/kde/apps/kreversi/pics/help.xpm +share/kde/apps/kreversi/pics/hint.xpm +share/kde/apps/kreversi/pics/logo.xpm +share/kde/apps/kreversi/pics/stop.xpm +share/kde/apps/kreversi/pics/undo.xpm +share/kde/apps/kreversi/pics/zoomin.xpm +share/kde/apps/kreversi/pics/zoomout.xpm +share/kde/apps/kreversi/sounds/reversi-click.wav +share/kde/apps/kreversi/sounds/reversi-lost.wav +share/kde/apps/kreversi/sounds/reversi-won.wav +share/kde/apps/ksame/eventsrc +share/kde/apps/ksame/ksameui.rc +share/kde/apps/ksame/stones.png +share/kde/apps/kshisen/kshisen.xpm +share/kde/apps/kshisen/kshisen_bgnd.xpm +share/kde/apps/kshisen/kshisenui.rc +share/kde/apps/kshisen/mask.xpm +share/kde/apps/kshisen/paused.xpm +share/kde/apps/ksirtet/ksirtetui.rc +share/kde/apps/ksmiletris/data/bg1.bmp +share/kde/apps/ksmiletris/data/bg10.bmp +share/kde/apps/ksmiletris/data/bg11.bmp +share/kde/apps/ksmiletris/data/bg12.bmp +share/kde/apps/ksmiletris/data/bg13.bmp +share/kde/apps/ksmiletris/data/bg14.bmp +share/kde/apps/ksmiletris/data/bg15.bmp +share/kde/apps/ksmiletris/data/bg16.bmp +share/kde/apps/ksmiletris/data/bg2.bmp +share/kde/apps/ksmiletris/data/bg3.bmp +share/kde/apps/ksmiletris/data/bg4.bmp +share/kde/apps/ksmiletris/data/bg5.bmp +share/kde/apps/ksmiletris/data/bg6.bmp +share/kde/apps/ksmiletris/data/bg7.bmp +share/kde/apps/ksmiletris/data/bg8.bmp +share/kde/apps/ksmiletris/data/bg9.bmp +share/kde/apps/ksmiletris/data/block-a1.bmp +share/kde/apps/ksmiletris/data/block-a2.bmp +share/kde/apps/ksmiletris/data/block-a3.bmp +share/kde/apps/ksmiletris/data/block-a4.bmp +share/kde/apps/ksmiletris/data/block-a5.bmp +share/kde/apps/ksmiletris/data/block-a6.bmp +share/kde/apps/ksmiletris/data/block-a7.bmp +share/kde/apps/ksmiletris/data/block-a8.bmp +share/kde/apps/ksmiletris/data/block-b1.bmp +share/kde/apps/ksmiletris/data/block-b2.bmp +share/kde/apps/ksmiletris/data/block-b3.bmp +share/kde/apps/ksmiletris/data/block-b4.bmp +share/kde/apps/ksmiletris/data/block-b5.bmp +share/kde/apps/ksmiletris/data/block-b6.bmp +share/kde/apps/ksmiletris/data/block-b7.bmp +share/kde/apps/ksmiletris/data/block-b8.bmp +share/kde/apps/ksmiletris/data/block-c1.bmp +share/kde/apps/ksmiletris/data/block-c2.bmp +share/kde/apps/ksmiletris/data/block-c3.bmp +share/kde/apps/ksmiletris/data/block-c4.bmp +share/kde/apps/ksmiletris/data/block-c5.bmp +share/kde/apps/ksmiletris/data/block-c6.bmp +share/kde/apps/ksmiletris/data/block-c7.bmp +share/kde/apps/ksmiletris/data/block-c8.bmp +share/kde/apps/ksmiletris/data/broken-mask.bmp +share/kde/apps/ksmiletris/data/broken.bmp +share/kde/apps/ksmiletris/data/cleared-a.bmp +share/kde/apps/ksmiletris/data/cleared-b.bmp +share/kde/apps/ksmiletris/data/cleared-c.bmp +share/kde/apps/ksmiletris/data/pause.bmp +share/kde/apps/ksmiletris/ksmiletrisui.rc +share/kde/apps/ksmiletris/sounds/break.wav +share/kde/apps/ksmiletris/sounds/clear.wav +share/kde/apps/ksnake/backgrounds/Bark.png +share/kde/apps/ksnake/backgrounds/Blue_Carpet.png +share/kde/apps/ksnake/backgrounds/Dark_Wood.png +share/kde/apps/ksnake/backgrounds/Granite.png +share/kde/apps/ksnake/backgrounds/Green_Carpet.png +share/kde/apps/ksnake/backgrounds/Mystique.png +share/kde/apps/ksnake/backgrounds/Rope_Weave.png +share/kde/apps/ksnake/backgrounds/Volcanic.png +share/kde/apps/ksnake/backgrounds/Wood.png +share/kde/apps/ksnake/highScores +share/kde/apps/ksnake/ksnakeui.rc +share/kde/apps/ksnake/levels/room01 +share/kde/apps/ksnake/levels/room02 +share/kde/apps/ksnake/levels/room03 +share/kde/apps/ksnake/levels/room04 +share/kde/apps/ksnake/levels/room05 +share/kde/apps/ksnake/levels/room06 +share/kde/apps/ksnake/levels/room07 +share/kde/apps/ksnake/levels/room08 +share/kde/apps/ksnake/levels/room09 +share/kde/apps/ksnake/levels/room10 +share/kde/apps/ksnake/levels/room11 +share/kde/apps/ksnake/levels/room12 +share/kde/apps/ksnake/levels/room13 +share/kde/apps/ksnake/levels/room14 +share/kde/apps/ksnake/levels/room15 +share/kde/apps/ksnake/levels/room16 +share/kde/apps/ksnake/levels/room17 +share/kde/apps/ksnake/levels/room18 +share/kde/apps/ksnake/levels/room19 +share/kde/apps/ksnake/levels/room20 +share/kde/apps/ksnake/levels/room21 +share/kde/apps/ksnake/levels/room22 +share/kde/apps/ksnake/levels/room23 +share/kde/apps/ksnake/levels/room24 +share/kde/apps/ksnake/levels/room25 +share/kde/apps/ksnake/pics/apples.png +share/kde/apps/ksnake/pics/ball.png +share/kde/apps/ksnake/pics/brick.png +share/kde/apps/ksnake/pics/down.png +share/kde/apps/ksnake/pics/left.png +share/kde/apps/ksnake/pics/right.png +share/kde/apps/ksnake/pics/samy.png +share/kde/apps/ksnake/pics/snake1.png +share/kde/apps/ksnake/pics/snake2.png +share/kde/apps/ksnake/pics/up.png +share/kde/apps/kspaceduel/icons/hicolor/16x16/actions/spnewgame.png +share/kde/apps/kspaceduel/icons/hicolor/16x16/actions/spnewround.png +share/kde/apps/kspaceduel/icons/hicolor/16x16/actions/sppausegame.png +share/kde/apps/kspaceduel/icons/hicolor/22x22/actions/spnewgame.png +share/kde/apps/kspaceduel/icons/hicolor/22x22/actions/spnewround.png +share/kde/apps/kspaceduel/icons/hicolor/22x22/actions/sppausegame.png +share/kde/apps/kspaceduel/icons/hicolor/32x32/actions/spnewgame.png +share/kde/apps/kspaceduel/icons/hicolor/32x32/actions/spnewround.png +share/kde/apps/kspaceduel/icons/hicolor/32x32/actions/sppausegame.png +share/kde/apps/kspaceduel/icons/locolor/16x16/actions/spnewgame.png +share/kde/apps/kspaceduel/icons/locolor/16x16/actions/spnewround.png +share/kde/apps/kspaceduel/icons/locolor/16x16/actions/sppausegame.png +share/kde/apps/kspaceduel/kspaceduelui.rc +share/kde/apps/kspaceduel/sprites/backgr.png +share/kde/apps/kspaceduel/sprites/explosion/explos00.pbm +share/kde/apps/kspaceduel/sprites/explosion/explos00.ppm +share/kde/apps/kspaceduel/sprites/explosion/explos01.pbm +share/kde/apps/kspaceduel/sprites/explosion/explos01.ppm +share/kde/apps/kspaceduel/sprites/explosion/explos02.pbm +share/kde/apps/kspaceduel/sprites/explosion/explos02.ppm +share/kde/apps/kspaceduel/sprites/explosion/explos03.pbm +share/kde/apps/kspaceduel/sprites/explosion/explos03.ppm +share/kde/apps/kspaceduel/sprites/explosion/explos04.pbm +share/kde/apps/kspaceduel/sprites/explosion/explos04.ppm +share/kde/apps/kspaceduel/sprites/explosion/explos05.pbm +share/kde/apps/kspaceduel/sprites/explosion/explos05.ppm +share/kde/apps/kspaceduel/sprites/explosion/explos06.pbm +share/kde/apps/kspaceduel/sprites/explosion/explos06.ppm +share/kde/apps/kspaceduel/sprites/explosion/explos07.pbm +share/kde/apps/kspaceduel/sprites/explosion/explos07.ppm +share/kde/apps/kspaceduel/sprites/explosion/explos08.pbm +share/kde/apps/kspaceduel/sprites/explosion/explos08.ppm +share/kde/apps/kspaceduel/sprites/explosion/explos09.pbm +share/kde/apps/kspaceduel/sprites/explosion/explos09.ppm +share/kde/apps/kspaceduel/sprites/explosion/explos10.pbm +share/kde/apps/kspaceduel/sprites/explosion/explos10.ppm +share/kde/apps/kspaceduel/sprites/explosion/explos11.pbm +share/kde/apps/kspaceduel/sprites/explosion/explos11.ppm +share/kde/apps/kspaceduel/sprites/explosion/explos12.pbm +share/kde/apps/kspaceduel/sprites/explosion/explos12.ppm +share/kde/apps/kspaceduel/sprites/explosion/explos13.pbm +share/kde/apps/kspaceduel/sprites/explosion/explos13.ppm +share/kde/apps/kspaceduel/sprites/explosion/explos14.pbm +share/kde/apps/kspaceduel/sprites/explosion/explos14.ppm +share/kde/apps/kspaceduel/sprites/explosion/explos15.pbm +share/kde/apps/kspaceduel/sprites/explosion/explos15.ppm +share/kde/apps/kspaceduel/sprites/explosion/explos16.pbm +share/kde/apps/kspaceduel/sprites/explosion/explos16.ppm +share/kde/apps/kspaceduel/sprites/explosion/explos17.pbm +share/kde/apps/kspaceduel/sprites/explosion/explos17.ppm +share/kde/apps/kspaceduel/sprites/explosion/explos18.pbm +share/kde/apps/kspaceduel/sprites/explosion/explos18.ppm +share/kde/apps/kspaceduel/sprites/explosion/explos19.pbm +share/kde/apps/kspaceduel/sprites/explosion/explos19.ppm +share/kde/apps/kspaceduel/sprites/explosion/explos20.pbm +share/kde/apps/kspaceduel/sprites/explosion/explos20.ppm +share/kde/apps/kspaceduel/sprites/explosion/explos21.pbm +share/kde/apps/kspaceduel/sprites/explosion/explos21.ppm +share/kde/apps/kspaceduel/sprites/explosion/explos22.pbm +share/kde/apps/kspaceduel/sprites/explosion/explos22.ppm +share/kde/apps/kspaceduel/sprites/explosion/explos23.pbm +share/kde/apps/kspaceduel/sprites/explosion/explos23.ppm +share/kde/apps/kspaceduel/sprites/explosion/explos24.pbm +share/kde/apps/kspaceduel/sprites/explosion/explos24.ppm +share/kde/apps/kspaceduel/sprites/explosion/explos25.pbm +share/kde/apps/kspaceduel/sprites/explosion/explos25.ppm +share/kde/apps/kspaceduel/sprites/explosion/explos26.pbm +share/kde/apps/kspaceduel/sprites/explosion/explos26.ppm +share/kde/apps/kspaceduel/sprites/explosion/explos27.pbm +share/kde/apps/kspaceduel/sprites/explosion/explos27.ppm +share/kde/apps/kspaceduel/sprites/explosion/explos28.pbm +share/kde/apps/kspaceduel/sprites/explosion/explos28.ppm +share/kde/apps/kspaceduel/sprites/explosion/explos29.pbm +share/kde/apps/kspaceduel/sprites/explosion/explos29.ppm +share/kde/apps/kspaceduel/sprites/explosion/explos30.pbm +share/kde/apps/kspaceduel/sprites/explosion/explos30.ppm +share/kde/apps/kspaceduel/sprites/explosion/mineex00.pbm +share/kde/apps/kspaceduel/sprites/explosion/mineex00.ppm +share/kde/apps/kspaceduel/sprites/explosion/mineex01.pbm +share/kde/apps/kspaceduel/sprites/explosion/mineex01.ppm +share/kde/apps/kspaceduel/sprites/explosion/mineex02.pbm +share/kde/apps/kspaceduel/sprites/explosion/mineex02.ppm +share/kde/apps/kspaceduel/sprites/explosion/mineex03.pbm +share/kde/apps/kspaceduel/sprites/explosion/mineex03.ppm +share/kde/apps/kspaceduel/sprites/explosion/mineex04.pbm +share/kde/apps/kspaceduel/sprites/explosion/mineex04.ppm +share/kde/apps/kspaceduel/sprites/explosion/mineex05.pbm +share/kde/apps/kspaceduel/sprites/explosion/mineex05.ppm +share/kde/apps/kspaceduel/sprites/explosion/mineex06.pbm +share/kde/apps/kspaceduel/sprites/explosion/mineex06.ppm +share/kde/apps/kspaceduel/sprites/explosion/mineex07.pbm +share/kde/apps/kspaceduel/sprites/explosion/mineex07.ppm +share/kde/apps/kspaceduel/sprites/explosion/mineex08.pbm +share/kde/apps/kspaceduel/sprites/explosion/mineex08.ppm +share/kde/apps/kspaceduel/sprites/explosion/mineex09.pbm +share/kde/apps/kspaceduel/sprites/explosion/mineex09.ppm +share/kde/apps/kspaceduel/sprites/explosion/mineex10.pbm +share/kde/apps/kspaceduel/sprites/explosion/mineex10.ppm +share/kde/apps/kspaceduel/sprites/explosion/mineex11.pbm +share/kde/apps/kspaceduel/sprites/explosion/mineex11.ppm +share/kde/apps/kspaceduel/sprites/explosion/mineex12.pbm +share/kde/apps/kspaceduel/sprites/explosion/mineex12.ppm +share/kde/apps/kspaceduel/sprites/explosion/mineex13.pbm +share/kde/apps/kspaceduel/sprites/explosion/mineex13.ppm +share/kde/apps/kspaceduel/sprites/explosion/mineex14.pbm +share/kde/apps/kspaceduel/sprites/explosion/mineex14.ppm +share/kde/apps/kspaceduel/sprites/explosion/mineex15.pbm +share/kde/apps/kspaceduel/sprites/explosion/mineex15.ppm +share/kde/apps/kspaceduel/sprites/explosion/mineex16.pbm +share/kde/apps/kspaceduel/sprites/explosion/mineex16.ppm +share/kde/apps/kspaceduel/sprites/explosion/mineex17.pbm +share/kde/apps/kspaceduel/sprites/explosion/mineex17.ppm +share/kde/apps/kspaceduel/sprites/playerinfo/energy.pnm +share/kde/apps/kspaceduel/sprites/playerinfo/mine.pnm +share/kde/apps/kspaceduel/sprites/playerinfo/ship10.pnm +share/kde/apps/kspaceduel/sprites/playerinfo/ship11.pnm +share/kde/apps/kspaceduel/sprites/playerinfo/ship12.pnm +share/kde/apps/kspaceduel/sprites/playerinfo/ship13.pnm +share/kde/apps/kspaceduel/sprites/playerinfo/ship20.pnm +share/kde/apps/kspaceduel/sprites/playerinfo/ship21.pnm +share/kde/apps/kspaceduel/sprites/playerinfo/ship22.pnm +share/kde/apps/kspaceduel/sprites/playerinfo/ship23.pnm +share/kde/apps/kspaceduel/sprites/playerinfo/win.pnm +share/kde/apps/kspaceduel/sprites/powerups/pbullet.pbm +share/kde/apps/kspaceduel/sprites/powerups/pbullet.ppm +share/kde/apps/kspaceduel/sprites/powerups/penergy.pbm +share/kde/apps/kspaceduel/sprites/powerups/penergy.ppm +share/kde/apps/kspaceduel/sprites/powerups/pmine.pbm +share/kde/apps/kspaceduel/sprites/powerups/pmine.ppm +share/kde/apps/kspaceduel/sprites/powerups/pshield.pbm +share/kde/apps/kspaceduel/sprites/powerups/pshield.ppm +share/kde/apps/kspaceduel/sprites/ship1/bullet.pbm +share/kde/apps/kspaceduel/sprites/ship1/bullet.ppm +share/kde/apps/kspaceduel/sprites/ship1/mine0.pbm +share/kde/apps/kspaceduel/sprites/ship1/mine0.ppm +share/kde/apps/kspaceduel/sprites/ship1/mine1.pbm +share/kde/apps/kspaceduel/sprites/ship1/mine1.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship00.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship00.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship01.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship01.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship02.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship02.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship03.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship03.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship04.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship04.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship05.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship05.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship06.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship06.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship07.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship07.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship08.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship08.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship09.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship09.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship10.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship10.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship11.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship11.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship12.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship12.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship13.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship13.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship14.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship14.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship15.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship15.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship16.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship16.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship17.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship17.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship18.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship18.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship19.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship19.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship20.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship20.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship21.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship21.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship22.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship22.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship23.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship23.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship24.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship24.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship25.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship25.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship26.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship26.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship27.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship27.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship28.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship28.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship29.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship29.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship30.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship30.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship31.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship31.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship32.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship32.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship33.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship33.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship34.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship34.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship35.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship35.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship36.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship36.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship37.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship37.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship38.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship38.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship39.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship39.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship40.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship40.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship41.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship41.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship42.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship42.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship43.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship43.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship44.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship44.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship45.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship45.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship46.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship46.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship47.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship47.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship48.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship48.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship49.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship49.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship50.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship50.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship51.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship51.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship52.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship52.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship53.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship53.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship54.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship54.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship55.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship55.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship56.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship56.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship57.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship57.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship58.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship58.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship59.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship59.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship60.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship60.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship61.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship61.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship62.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship62.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship63.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship63.ppm +share/kde/apps/kspaceduel/sprites/ship1/ship64.pbm +share/kde/apps/kspaceduel/sprites/ship1/ship64.ppm +share/kde/apps/kspaceduel/sprites/ship2/bullet.pbm +share/kde/apps/kspaceduel/sprites/ship2/bullet.ppm +share/kde/apps/kspaceduel/sprites/ship2/mine0.pbm +share/kde/apps/kspaceduel/sprites/ship2/mine0.ppm +share/kde/apps/kspaceduel/sprites/ship2/mine1.pbm +share/kde/apps/kspaceduel/sprites/ship2/mine1.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship00.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship00.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship01.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship01.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship02.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship02.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship03.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship03.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship04.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship04.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship05.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship05.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship06.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship06.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship07.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship07.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship08.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship08.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship09.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship09.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship10.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship10.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship11.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship11.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship12.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship12.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship13.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship13.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship14.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship14.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship15.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship15.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship16.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship16.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship17.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship17.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship18.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship18.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship19.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship19.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship20.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship20.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship21.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship21.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship22.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship22.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship23.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship23.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship24.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship24.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship25.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship25.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship26.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship26.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship27.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship27.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship28.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship28.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship29.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship29.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship30.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship30.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship31.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship31.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship32.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship32.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship33.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship33.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship34.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship34.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship35.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship35.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship36.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship36.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship37.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship37.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship38.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship38.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship39.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship39.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship40.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship40.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship41.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship41.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship42.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship42.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship43.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship43.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship44.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship44.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship45.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship45.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship46.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship46.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship47.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship47.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship48.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship48.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship49.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship49.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship50.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship50.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship51.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship51.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship52.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship52.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship53.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship53.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship54.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship54.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship55.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship55.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship56.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship56.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship57.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship57.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship58.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship58.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship59.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship59.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship60.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship60.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship61.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship61.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship62.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship62.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship63.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship63.ppm +share/kde/apps/kspaceduel/sprites/ship2/ship64.pbm +share/kde/apps/kspaceduel/sprites/ship2/ship64.ppm +share/kde/apps/kspaceduel/sprites/sun/sun.pbm +share/kde/apps/kspaceduel/sprites/sun/sun.ppm +share/kde/apps/ktron/ktronui.rc +share/kde/apps/ktuberling/ktuberlingui.rc +share/kde/apps/ktuberling/museum/businessman.tuberling +share/kde/apps/ktuberling/museum/cool.tuberling +share/kde/apps/ktuberling/museum/crazy.tuberling +share/kde/apps/ktuberling/museum/cyclop.tuberling +share/kde/apps/ktuberling/museum/dali.tuberling +share/kde/apps/ktuberling/museum/einstein.tuberling +share/kde/apps/ktuberling/museum/fly.tuberling +share/kde/apps/ktuberling/museum/grandpa.tuberling +share/kde/apps/ktuberling/museum/hippie.tuberling +share/kde/apps/ktuberling/museum/idiot.tuberling +share/kde/apps/ktuberling/museum/miss.tuberling +share/kde/apps/ktuberling/museum/picasso.tuberling +share/kde/apps/ktuberling/museum/serious.tuberling +share/kde/apps/ktuberling/pics/layout.xml +share/kde/apps/ktuberling/pics/penguin-game.png +share/kde/apps/ktuberling/pics/penguin-mask.png +share/kde/apps/ktuberling/pics/potato-game.png +share/kde/apps/ktuberling/pics/potato-mask.png +share/kde/apps/ktuberling/sounds/en/badge.wav +share/kde/apps/ktuberling/sounds/en/bow.wav +share/kde/apps/ktuberling/sounds/en/cigar.wav +share/kde/apps/ktuberling/sounds/en/ear.wav +share/kde/apps/ktuberling/sounds/en/earring.wav +share/kde/apps/ktuberling/sounds/en/eye.wav +share/kde/apps/ktuberling/sounds/en/eyebrow.wav +share/kde/apps/ktuberling/sounds/en/hat.wav +share/kde/apps/ktuberling/sounds/en/moustache.wav +share/kde/apps/ktuberling/sounds/en/mouth.wav +share/kde/apps/ktuberling/sounds/en/nose.wav +share/kde/apps/ktuberling/sounds/en/spectacles.wav +share/kde/apps/ktuberling/sounds/en/sunglasses.wav +share/kde/apps/ktuberling/sounds/en/tuberling.wav +share/kde/apps/ktuberling/sounds/en/watch.wav +share/kde/apps/kwin4/grafix/default/aboute.png +share/kde/apps/kwin4/grafix/default/arrow0.png +share/kde/apps/kwin4/grafix/default/arrow1.png +share/kde/apps/kwin4/grafix/default/arrow2.png +share/kde/apps/kwin4/grafix/default/arrow_mask.png +share/kde/apps/kwin4/grafix/default/background.png +share/kde/apps/kwin4/grafix/default/board.png +share/kde/apps/kwin4/grafix/default/empty.png +share/kde/apps/kwin4/grafix/default/empty2.png +share/kde/apps/kwin4/grafix/default/empty2_mask.png +share/kde/apps/kwin4/grafix/default/empty_mask.png +share/kde/apps/kwin4/grafix/default/game_over.png +share/kde/apps/kwin4/grafix/default/game_over_mask.png +share/kde/apps/kwin4/grafix/default/grafix.rc +share/kde/apps/kwin4/grafix/default/hint.png +share/kde/apps/kwin4/grafix/default/introabout.png +share/kde/apps/kwin4/grafix/default/introabout_mask.png +share/kde/apps/kwin4/grafix/default/piece0.png +share/kde/apps/kwin4/grafix/default/piece1.png +share/kde/apps/kwin4/grafix/default/piece_mask.png +share/kde/apps/kwin4/grafix/default/star0.png +share/kde/apps/kwin4/grafix/default/star0_mask.png +share/kde/apps/kwin4/grafix/default/star1.png +share/kde/apps/kwin4/grafix/default/star1_mask.png +share/kde/apps/kwin4/grafix/default/star2.png +share/kde/apps/kwin4/grafix/default/star2_mask.png +share/kde/apps/kwin4/grafix/default/star3.png +share/kde/apps/kwin4/grafix/default/star3_mask.png +share/kde/apps/kwin4/grafix/default/star4.png +share/kde/apps/kwin4/grafix/default/star4_mask.png +share/kde/apps/kwin4/grafix/default/win4about.png +share/kde/apps/kwin4/kwin4ui.rc +share/kde/apps/lskat/grafix/400000.png +share/kde/apps/lskat/grafix/400001.png +share/kde/apps/lskat/grafix/400002.png +share/kde/apps/lskat/grafix/400003.png +share/kde/apps/lskat/grafix/400004.png +share/kde/apps/lskat/grafix/400005.png +share/kde/apps/lskat/grafix/400006.png +share/kde/apps/lskat/grafix/400007.png +share/kde/apps/lskat/grafix/400008.png +share/kde/apps/lskat/grafix/400009.png +share/kde/apps/lskat/grafix/400010.png +share/kde/apps/lskat/grafix/400011.png +share/kde/apps/lskat/grafix/400012.png +share/kde/apps/lskat/grafix/400013.png +share/kde/apps/lskat/grafix/400014.png +share/kde/apps/lskat/grafix/400015.png +share/kde/apps/lskat/grafix/400016.png +share/kde/apps/lskat/grafix/400017.png +share/kde/apps/lskat/grafix/400018.png +share/kde/apps/lskat/grafix/400019.png +share/kde/apps/lskat/grafix/400020.png +share/kde/apps/lskat/grafix/400021.png +share/kde/apps/lskat/grafix/400022.png +share/kde/apps/lskat/grafix/400023.png +share/kde/apps/lskat/grafix/400024.png +share/kde/apps/lskat/grafix/background.png +share/kde/apps/lskat/grafix/deck1.png +share/kde/apps/lskat/grafix/deck2.png +share/kde/apps/lskat/grafix/deck3.png +share/kde/apps/lskat/grafix/deck4.png +share/kde/apps/lskat/grafix/t1.png +share/kde/apps/lskat/grafix/t2.png +share/kde/apps/lskat/grafix/t3.png +share/kde/apps/lskat/grafix/t4.png +share/kde/apps/lskat/grafix/t5.png +share/kde/apps/lskat/grafix/tback.png +share/kde/apps/lskat/grafix/type1.png +share/kde/apps/lskat/grafix/type2.png +share/kde/apps/lskat/grafix/type3.png +share/kde/apps/lskat/lskatui.rc +share/kde/icons/hicolor/16x16/actions/highscore.png +share/kde/icons/hicolor/16x16/actions/roll.png +share/kde/icons/hicolor/16x16/apps/kasteroids.png +share/kde/icons/hicolor/16x16/apps/kbackgammon.png +share/kde/icons/hicolor/16x16/apps/kbackgammon_engine.png +share/kde/icons/hicolor/16x16/apps/kbattleship.png +share/kde/icons/hicolor/16x16/apps/kblackbox.png +share/kde/icons/hicolor/16x16/apps/kbounce.png +share/kde/icons/hicolor/16x16/apps/kenolaba.png +share/kde/icons/hicolor/16x16/apps/kjumpingcube.png +share/kde/icons/hicolor/16x16/apps/klines.png +share/kde/icons/hicolor/16x16/apps/kmahjongg.png +share/kde/icons/hicolor/16x16/apps/kmines.png +share/kde/icons/hicolor/16x16/apps/konquest.png +share/kde/icons/hicolor/16x16/apps/kpat.png +share/kde/icons/hicolor/16x16/apps/kpoker.png +share/kde/icons/hicolor/16x16/apps/kreversi.png +share/kde/icons/hicolor/16x16/apps/ksame.png +share/kde/icons/hicolor/16x16/apps/kshisen.png +share/kde/icons/hicolor/16x16/apps/ksirtet.png +share/kde/icons/hicolor/16x16/apps/ksmiletris.png +share/kde/icons/hicolor/16x16/apps/ksnake.png +share/kde/icons/hicolor/16x16/apps/ksokoban.png +share/kde/icons/hicolor/16x16/apps/kspaceduel.png +share/kde/icons/hicolor/16x16/apps/ktron.png +share/kde/icons/hicolor/16x16/apps/kwin4.png +share/kde/icons/hicolor/22x22/actions/roll.png +share/kde/icons/hicolor/32x32/actions/highscore.png +share/kde/icons/hicolor/32x32/actions/roll.png +share/kde/icons/hicolor/32x32/apps/kasteroids.png +share/kde/icons/hicolor/32x32/apps/katomic.png +share/kde/icons/hicolor/32x32/apps/kbackgammon.png +share/kde/icons/hicolor/32x32/apps/kbackgammon_engine.png +share/kde/icons/hicolor/32x32/apps/kbattleship.png +share/kde/icons/hicolor/32x32/apps/kblackbox.png +share/kde/icons/hicolor/32x32/apps/kbounce.png +share/kde/icons/hicolor/32x32/apps/kenolaba.png +share/kde/icons/hicolor/32x32/apps/kjumpingcube.png +share/kde/icons/hicolor/32x32/apps/klines.png +share/kde/icons/hicolor/32x32/apps/kmahjongg.png +share/kde/icons/hicolor/32x32/apps/kmines.png +share/kde/icons/hicolor/32x32/apps/konquest.png +share/kde/icons/hicolor/32x32/apps/kpat.png +share/kde/icons/hicolor/32x32/apps/kpoker.png +share/kde/icons/hicolor/32x32/apps/kreversi.png +share/kde/icons/hicolor/32x32/apps/ksame.png +share/kde/icons/hicolor/32x32/apps/kshisen.png +share/kde/icons/hicolor/32x32/apps/ksirtet.png +share/kde/icons/hicolor/32x32/apps/ksmiletris.png +share/kde/icons/hicolor/32x32/apps/ksnake.png +share/kde/icons/hicolor/32x32/apps/ksokoban.png +share/kde/icons/hicolor/32x32/apps/kspaceduel.png +share/kde/icons/hicolor/32x32/apps/ktron.png +share/kde/icons/hicolor/32x32/apps/ktuberling.png +share/kde/icons/hicolor/32x32/apps/kwin4.png +share/kde/icons/hicolor/32x32/apps/lskat.png +share/kde/icons/hicolor/48x48/apps/kasteroids.png +share/kde/icons/hicolor/48x48/apps/kbackgammon.png +share/kde/icons/hicolor/48x48/apps/kbackgammon_engine.png +share/kde/icons/hicolor/48x48/apps/kblackbox.png +share/kde/icons/hicolor/48x48/apps/kenolaba.png +share/kde/icons/hicolor/48x48/apps/kmahjongg.png +share/kde/icons/hicolor/48x48/apps/kmines.png +share/kde/icons/hicolor/48x48/apps/konquest.png +share/kde/icons/hicolor/48x48/apps/kpat.png +share/kde/icons/hicolor/48x48/apps/kpoker.png +share/kde/icons/hicolor/48x48/apps/kreversi.png +share/kde/icons/hicolor/48x48/apps/ksame.png +share/kde/icons/hicolor/48x48/apps/kshisen.png +share/kde/icons/hicolor/48x48/apps/ksirtet.png +share/kde/icons/hicolor/48x48/apps/ksmiletris.png +share/kde/icons/hicolor/48x48/apps/ksnake.png +share/kde/icons/hicolor/48x48/apps/ksokoban.png +share/kde/icons/hicolor/48x48/apps/kwin4.png +share/kde/icons/hicolor/48x48/apps/lskat.png +share/kde/icons/locolor/16x16/apps/kbounce.png +share/kde/icons/locolor/16x16/apps/kspaceduel.png +share/kde/icons/locolor/16x16/apps/lskat.png +share/kde/icons/locolor/32x32/apps/kbounce.png +share/kde/icons/locolor/32x32/apps/kspaceduel.png +share/kde/icons/locolor/32x32/apps/lskat.png +@comment dirrm share/kde/icons/locolor/32x32/apps +@comment dirrm share/kde/icons/locolor/16x16/apps +@comment dirrm share/kde/icons/hicolor/48x48/apps +@comment dirrm share/kde/icons/hicolor/32x32/apps +@comment dirrm share/kde/icons/hicolor/32x32/actions +@comment dirrm share/kde/icons/hicolor/22x22/actions +@comment dirrm share/kde/icons/hicolor/16x16/apps +@comment dirrm share/kde/icons/hicolor/16x16/actions +@dirrm share/kde/apps/lskat/grafix +@dirrm share/kde/apps/lskat +@dirrm share/kde/apps/kwin4/grafix/default +@dirrm share/kde/apps/kwin4/grafix +@dirrm share/kde/apps/kwin4 +@dirrm share/kde/apps/ktuberling/sounds/en +@dirrm share/kde/apps/ktuberling/sounds +@dirrm share/kde/apps/ktuberling/pics +@dirrm share/kde/apps/ktuberling/museum +@dirrm share/kde/apps/ktuberling +@dirrm share/kde/apps/ktron +@dirrm share/kde/apps/kspaceduel/sprites/sun +@dirrm share/kde/apps/kspaceduel/sprites/ship2 +@dirrm share/kde/apps/kspaceduel/sprites/ship1 +@dirrm share/kde/apps/kspaceduel/sprites/powerups +@dirrm share/kde/apps/kspaceduel/sprites/playerinfo +@dirrm share/kde/apps/kspaceduel/sprites/explosion +@dirrm share/kde/apps/kspaceduel/sprites +@dirrm share/kde/apps/kspaceduel/icons/locolor/16x16/actions +@dirrm share/kde/apps/kspaceduel/icons/locolor/16x16 +@dirrm share/kde/apps/kspaceduel/icons/locolor +@dirrm share/kde/apps/kspaceduel/icons/hicolor/32x32/actions +@dirrm share/kde/apps/kspaceduel/icons/hicolor/32x32 +@dirrm share/kde/apps/kspaceduel/icons/hicolor/22x22/actions +@dirrm share/kde/apps/kspaceduel/icons/hicolor/22x22 +@dirrm share/kde/apps/kspaceduel/icons/hicolor/16x16/actions +@dirrm share/kde/apps/kspaceduel/icons/hicolor/16x16 +@dirrm share/kde/apps/kspaceduel/icons/hicolor +@dirrm share/kde/apps/kspaceduel/icons +@dirrm share/kde/apps/kspaceduel +@dirrm share/kde/apps/ksnake/pics +@dirrm share/kde/apps/ksnake/levels +@dirrm share/kde/apps/ksnake/backgrounds +@dirrm share/kde/apps/ksnake +@dirrm share/kde/apps/ksmiletris/sounds +@dirrm share/kde/apps/ksmiletris/data +@dirrm share/kde/apps/ksmiletris +@dirrm share/kde/apps/ksirtet +@dirrm share/kde/apps/kshisen +@dirrm share/kde/apps/ksame +@dirrm share/kde/apps/kreversi/sounds +@dirrm share/kde/apps/kreversi/pics/background +@dirrm share/kde/apps/kreversi/pics +@dirrm share/kde/apps/kreversi +@dirrm share/kde/apps/kpoker/sounds +@dirrm share/kde/apps/kpoker +@dirrm share/kde/apps/kpat +@dirrm share/kde/apps/konquest/pics +@dirrm share/kde/apps/konquest +@dirrm share/kde/apps/kmines +@dirrm share/kde/apps/kmahjongg/toolbar +@dirrm share/kde/apps/kmahjongg/pics +@dirrm share/kde/apps/kmahjongg +@dirrm share/kde/apps/klines +@dirrm share/kde/apps/kjumpingcube +@dirrm share/kde/apps/kfouleggs +@dirrm share/kde/apps/kenolaba/toolbar +@dirrm share/kde/apps/kenolaba +@dirrm share/kde/apps/kdegames/pics +@dirrm share/kde/apps/kdegames +@dirrm share/kde/apps/kbounce/sounds +@dirrm share/kde/apps/kbounce/pics +@dirrm share/kde/apps/kbounce +@dirrm share/kde/apps/kblackbox/pics +@dirrm share/kde/apps/kblackbox +@dirrm share/kde/apps/kbattleship/sounds +@dirrm share/kde/apps/kbattleship/pictures +@dirrm share/kde/apps/kbattleship +@dirrm share/kde/apps/kbackgammon/sounds +@dirrm share/kde/apps/kbackgammon/pics +@dirrm share/kde/apps/kbackgammon +@dirrm share/kde/apps/katomic/pics +@dirrm share/kde/apps/katomic/levels +@dirrm share/kde/apps/katomic +@dirrm share/kde/apps/kasteroids/sprites/ship +@dirrm share/kde/apps/kasteroids/sprites/shield +@dirrm share/kde/apps/kasteroids/sprites/rock3 +@dirrm share/kde/apps/kasteroids/sprites/rock2 +@dirrm share/kde/apps/kasteroids/sprites/rock1 +@dirrm share/kde/apps/kasteroids/sprites/powerups +@dirrm share/kde/apps/kasteroids/sprites/missile +@dirrm share/kde/apps/kasteroids/sprites/exhaust +@dirrm share/kde/apps/kasteroids/sprites/bits +@dirrm share/kde/apps/kasteroids/sprites +@dirrm share/kde/apps/kasteroids/sounds +@dirrm share/kde/apps/kasteroids +@dirrm share/kde/apps/carddecks/decks +@dirrm share/kde/apps/carddecks/cards-xskat-french +@dirrm share/kde/apps/carddecks/cards-warwick +@dirrm share/kde/apps/carddecks/cards-spaced +@dirrm share/kde/apps/carddecks/cards-penguins +@dirrm share/kde/apps/carddecks/cards-konqi-modern +@dirrm share/kde/apps/carddecks/cards-hard-a-port +@dirrm share/kde/apps/carddecks/cards-gdkcard-bonded +@dirrm share/kde/apps/carddecks/cards-dondorf-whist-b +@dirrm share/kde/apps/carddecks/cards-default +@dirrm share/kde/apps/carddecks/cards-aisleriot +@dirrm share/kde/apps/carddecks +@comment dirrm share/kde/apps +@comment dirrm share/kde/applnk/Toys +@comment dirrm share/kde/applnk/Games/TacticStrategy +@comment dirrm share/kde/applnk/Games/Card +@comment dirrm share/kde/applnk/Games/Board +@comment dirrm share/kde/applnk/Games/Arcade +@dirrm share/doc/kde/HTML/en/lskat +@dirrm share/doc/kde/HTML/en/kwin4 +@dirrm share/doc/kde/HTML/en/ktuberling +@dirrm share/doc/kde/HTML/en/ktron +@dirrm share/doc/kde/HTML/en/kspaceduel +@dirrm share/doc/kde/HTML/en/ksokoban +@dirrm share/doc/kde/HTML/en/ksnake +@dirrm share/doc/kde/HTML/en/ksirtet +@dirrm share/doc/kde/HTML/en/kshisen +@dirrm share/doc/kde/HTML/en/ksame +@dirrm share/doc/kde/HTML/en/kreversi +@dirrm share/doc/kde/HTML/en/kpoker +@dirrm share/doc/kde/HTML/en/kpat +@dirrm share/doc/kde/HTML/en/konquest +@dirrm share/doc/kde/HTML/en/kmines +@dirrm share/doc/kde/HTML/en/klines +@dirrm share/doc/kde/HTML/en/kjumpingcube +@dirrm share/doc/kde/HTML/en/kfouleggs +@dirrm share/doc/kde/HTML/en/kenolaba +@dirrm share/doc/kde/HTML/en/kbounce +@dirrm share/doc/kde/HTML/en/kblackbox +@dirrm share/doc/kde/HTML/en/kbattleship +@dirrm share/doc/kde/HTML/en/kbackgammon +@dirrm share/doc/kde/HTML/en/katomic +@dirrm share/doc/kde/HTML/en/kasteroids +@comment dirrm share/doc/kde/HTML/en +@dirrm include/kgame diff --git a/games/kdegames3/distinfo b/games/kdegames3/distinfo new file mode 100644 index 00000000000..52d605cd6e6 --- /dev/null +++ b/games/kdegames3/distinfo @@ -0,0 +1,8 @@ +$NetBSD: distinfo,v 1.1.1.1.2.2 2002/06/23 18:46:04 jlam Exp $ + +SHA1 (kdegames-3.0.1.tar.bz2) = f4e87bfecf1b25b1b42969c7261e2fd239158e28 +Size (kdegames-3.0.1.tar.bz2) = 7239108 bytes +SHA1 (patch-aa) = c0103abe8c12e83800c09b3e87048a0bb86b365f +SHA1 (patch-ab) = 68875cb7ddd517bd65a2490143b9600001c359d2 +SHA1 (patch-ac) = 8fb1279b5ffc348bf2c54186f8156c9f9680c559 +SHA1 (patch-ad) = aa0658f3523f0f5b6d41f61748900c413e704f69 diff --git a/games/kdegames3/patches/patch-aa b/games/kdegames3/patches/patch-aa new file mode 100644 index 00000000000..0fcb6d1d177 --- /dev/null +++ b/games/kdegames3/patches/patch-aa @@ -0,0 +1,44 @@ +$NetBSD: patch-aa,v 1.1.1.1.2.2 2002/06/23 18:46:04 jlam Exp $ + +--- kbackgammon/Makefile.am.orig Fri Oct 5 12:52:05 2001 ++++ kbackgammon/Makefile.am +@@ -2,21 +2,22 @@ + INCLUDES = -I$(top_srcdir)/libkdegames -I$(top_srcdir)/libkdegames/kgame/ -I$(srcdir)/engines $(all_includes) + + bin_PROGRAMS = kbackgammon +-lib_LTLIBRARIES = kbackgammon.la ++lib_LTLIBRARIES = libkbackgammon_main.la kbackgammon.la + +-CLEANFILES = dummy.cpp +- +-kbackgammon_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) -lkdeprint \ ++libkbackgammon_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) -lkdeprint \ + ./engines/libkbgengines.la +-kbackgammon_la_SOURCES = main.cpp kbg.cpp kbgboard.cpp kbgtextview.cpp \ ++libkbackgammon_main_la_SOURCES = main.cpp kbg.cpp kbgboard.cpp kbgtextview.cpp \ + kbgstatus.cpp + ++kbackgammon_la_LIBADD = libkbackgammon_main.la ++kbackgammon_la_SOURCES = kbackgammon_main.cpp ++ + kbackgammon_la_METASOURCES = AUTO + kbackgammon_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version + +-kbackgammon_LDADD = kbackgammon.la $(top_builddir)/libkdegames/libkdegames.la \ ++kbackgammon_LDADD = libkbackgammon_main.la $(top_builddir)/libkdegames/libkdegames.la \ + $(LIB_KSYCOCA) +-kbackgammon_SOURCES = dummy.cpp ++kbackgammon_SOURCES = kbackgammon_main.cpp + kbackgammon_LDFLAGS = $(all_libraries) $(KDE_RPATH) + + noinst_HEADERS = version.h kbg.h kbgboard.h kbgtextview.h kbgstatus.h +@@ -34,9 +35,6 @@ + messages: rc.cpp + LIST=`find . -name \*.h -o -name \*.hh -o -name \*.H -o -name \*.hxx -o -name \*.hpp -o -name \*.cpp -o -name \*.cc -o -name \*.cxx -o -name \*.ecpp -o -name \*.C`; \ + $(XGETTEXT) $$LIST -o $(podir)/kbackgammon.pot +- +-dummy.cpp: +- echo > dummy.cpp + + install-data-local: + rm -rf $(kde_appsdir)/Games/kbackgammon.desktop diff --git a/games/kdegames3/patches/patch-ab b/games/kdegames3/patches/patch-ab new file mode 100644 index 00000000000..84ad87077b3 --- /dev/null +++ b/games/kdegames3/patches/patch-ab @@ -0,0 +1,249 @@ +$NetBSD: patch-ab,v 1.1.1.1.2.2 2002/06/23 18:46:05 jlam Exp $ + +--- kbackgammon/Makefile.in.orig Fri May 10 15:29:29 2002 ++++ kbackgammon/Makefile.in +@@ -229,24 +229,25 @@ + INCLUDES = -I$(top_srcdir)/libkdegames -I$(top_srcdir)/libkdegames/kgame/ -I$(srcdir)/engines $(all_includes) + + bin_PROGRAMS = kbackgammon +-lib_LTLIBRARIES = kbackgammon.la ++lib_LTLIBRARIES = libkbackgammon_main.la kbackgammon.la + +-CLEANFILES = dummy.cpp +- +-kbackgammon_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) -lkdeprint \ ++libkbackgammon_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) -lkdeprint \ + ./engines/libkbgengines.la + +-kbackgammon_la_SOURCES = main.cpp kbg.cpp kbgboard.cpp kbgtextview.cpp \ ++libkbackgammon_main_la_SOURCES = main.cpp kbg.cpp kbgboard.cpp kbgtextview.cpp \ + kbgstatus.cpp + + ++kbackgammon_la_LIBADD = libkbackgammon_main.la ++kbackgammon_la_SOURCES = kbackgammon_main.cpp ++ + #>- kbackgammon_la_METASOURCES = AUTO + kbackgammon_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version + +-kbackgammon_LDADD = kbackgammon.la $(top_builddir)/libkdegames/libkdegames.la \ ++kbackgammon_LDADD = libkbackgammon_main.la $(top_builddir)/libkdegames/libkdegames.la \ + $(LIB_KSYCOCA) + +-kbackgammon_SOURCES = dummy.cpp ++kbackgammon_SOURCES = kbackgammon_main.cpp + kbackgammon_LDFLAGS = $(all_libraries) $(KDE_RPATH) + + noinst_HEADERS = version.h kbg.h kbgboard.h kbgtextview.h kbgstatus.h +@@ -266,25 +267,31 @@ + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(lib_LTLIBRARIES) + +-kbackgammon_la_DEPENDENCIES = ./engines/libkbgengines.la +-am_kbackgammon_la_OBJECTS = main.lo kbg.lo kbgboard.lo kbgtextview.lo \ +- kbgstatus.lo ++kbackgammon_la_DEPENDENCIES = libkbackgammon_main.la ++am_kbackgammon_la_OBJECTS = kbackgammon_main.lo + #>- kbackgammon_la_OBJECTS = $(am_kbackgammon_la_OBJECTS) ++#>+ 1 ++kbackgammon_la_OBJECTS = kbackgammon_main.lo ++libkbackgammon_main_la_LDFLAGS = ++libkbackgammon_main_la_DEPENDENCIES = ./engines/libkbgengines.la ++am_libkbackgammon_main_la_OBJECTS = main.lo kbg.lo kbgboard.lo \ ++ kbgtextview.lo kbgstatus.lo ++#>- libkbackgammon_main_la_OBJECTS = $(am_libkbackgammon_main_la_OBJECTS) + #>+ 6 +-kbackgammon_la_final_OBJECTS = kbackgammon_la.all_cpp.lo +-kbackgammon_la_nofinal_OBJECTS = main.lo kbg.lo kbgboard.lo kbgtextview.lo \ +- kbgstatus.lo \ +- kbackgammon_la_meta_unload.lo +-@KDE_USE_FINAL_FALSE@kbackgammon_la_OBJECTS = $(kbackgammon_la_nofinal_OBJECTS) +-@KDE_USE_FINAL_TRUE@kbackgammon_la_OBJECTS = $(kbackgammon_la_final_OBJECTS) ++libkbackgammon_main_la_final_OBJECTS = libkbackgammon_main_la.all_cpp.lo ++libkbackgammon_main_la_nofinal_OBJECTS = main.lo kbg.lo kbgboard.lo \ ++ kbgtextview.lo kbgstatus.lo \ ++ libkbackgammon_main_la_meta_unload.lo ++@KDE_USE_FINAL_FALSE@libkbackgammon_main_la_OBJECTS = $(libkbackgammon_main_la_nofinal_OBJECTS) ++@KDE_USE_FINAL_TRUE@libkbackgammon_main_la_OBJECTS = $(libkbackgammon_main_la_final_OBJECTS) + bin_PROGRAMS = kbackgammon$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) + +-am_kbackgammon_OBJECTS = dummy.$(OBJEXT) ++am_kbackgammon_OBJECTS = kbackgammon_main.$(OBJEXT) + #>- kbackgammon_OBJECTS = $(am_kbackgammon_OBJECTS) + #>+ 1 +-kbackgammon_OBJECTS = dummy.$(OBJEXT) +-kbackgammon_DEPENDENCIES = kbackgammon.la \ ++kbackgammon_OBJECTS = kbackgammon_main.$(OBJEXT) ++kbackgammon_DEPENDENCIES = libkbackgammon_main.la \ + $(top_builddir)/libkdegames/libkdegames.la + + DEFS = @DEFS@ +@@ -293,7 +300,8 @@ + LDFLAGS = @LDFLAGS@ + LIBS = @LIBS@ + depcomp = $(SHELL) $(top_srcdir)/admin/depcomp +-@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kbg.Plo \ ++@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kbackgammon_main.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/kbackgammon_main.Po $(DEPDIR)/kbg.Plo \ + @AMDEP_TRUE@ $(DEPDIR)/kbgboard.Plo $(DEPDIR)/kbgstatus.Plo \ + @AMDEP_TRUE@ $(DEPDIR)/kbgtextview.Plo $(DEPDIR)/main.Plo + #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +@@ -315,7 +323,8 @@ + CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ + CXXFLAGS = @CXXFLAGS@ +-DIST_SOURCES = $(kbackgammon_la_SOURCES) $(kbackgammon_SOURCES) ++DIST_SOURCES = $(kbackgammon_la_SOURCES) \ ++ $(libkbackgammon_main_la_SOURCES) $(kbackgammon_SOURCES) + DATA = $(applnk_DATA) $(rc_DATA) + + HEADERS = $(noinst_HEADERS) +@@ -328,7 +337,7 @@ + DIST_COMMON = README $(noinst_HEADERS) AUTHORS Makefile.am Makefile.in \ + TODO + DIST_SUBDIRS = $(SUBDIRS) +-SOURCES = $(kbackgammon_la_SOURCES) $(kbackgammon_SOURCES) ++SOURCES = $(kbackgammon_la_SOURCES) $(libkbackgammon_main_la_SOURCES) $(kbackgammon_SOURCES) + + #>- all: all-recursive + #>+ 1 +@@ -377,6 +386,8 @@ + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + kbackgammon.la: $(kbackgammon_la_OBJECTS) $(kbackgammon_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(kbackgammon_la_LDFLAGS) $(kbackgammon_la_OBJECTS) $(kbackgammon_la_LIBADD) $(LIBS) ++libkbackgammon_main.la: $(libkbackgammon_main_la_OBJECTS) $(libkbackgammon_main_la_DEPENDENCIES) ++ $(CXXLINK) -rpath $(libdir) $(libkbackgammon_main_la_LDFLAGS) $(libkbackgammon_main_la_OBJECTS) $(libkbackgammon_main_la_LIBADD) $(LIBS) + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(bindir) +@@ -411,7 +422,8 @@ + distclean-compile: + -rm -f *.tab.c + +-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kbackgammon_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kbackgammon_main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kbg.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kbgboard.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kbgstatus.Plo@am__quote@ +@@ -569,7 +581,7 @@ + + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=kbackgammon.desktop kbackgammonui.rc eventsrc ++KDE_DIST=kbackgammon.desktop kbackgammonui.rc eventsrc kbackgammon dummy.cpp + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + +@@ -631,7 +643,6 @@ + mostlyclean-generic: + + clean-generic: +- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* +@@ -712,9 +723,6 @@ + LIST=`find . -name \*.h -o -name \*.hh -o -name \*.H -o -name \*.hxx -o -name \*.hpp -o -name \*.cpp -o -name \*.cc -o -name \*.cxx -o -name \*.ecpp -o -name \*.C`; \ + $(XGETTEXT) $$LIST -o $(podir)/kbackgammon.pot + +-dummy.cpp: +- echo > dummy.cpp +- + install-data-local: + #>- rm -rf $(kde_appsdir)/Games/kbackgammon.desktop + #>+ 1 +@@ -754,28 +762,28 @@ + + + #>+ 12 +-kbackgammon_la_meta_unload.cpp: kbgboard.moc kbgtextview.moc kbg.moc kbgstatus.moc +- @echo 'creating kbackgammon_la_meta_unload.cpp' +- @-rm -f kbackgammon_la_meta_unload.cpp ++libkbackgammon_main_la_meta_unload.cpp: kbgboard.moc kbgtextview.moc kbg.moc kbgstatus.moc ++ @echo 'creating libkbackgammon_main_la_meta_unload.cpp' ++ @-rm -f libkbackgammon_main_la_meta_unload.cpp + @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_kbackgammon_la[] = {' > kbackgammon_la_meta_unload.cpp ;\ +- cat kbgboard.moc kbgtextview.moc kbg.moc kbgstatus.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kbackgammon_la_meta_unload.cpp ;\ +- echo '0};' >> kbackgammon_la_meta_unload.cpp ;\ +- echo '#include <kunload.h>' >> kbackgammon_la_meta_unload.cpp ;\ +- echo '_UNLOAD(kbackgammon_la)' >> kbackgammon_la_meta_unload.cpp ;\ +- else echo > kbackgammon_la_meta_unload.cpp; fi ++ echo 'static const char * _metalist_libkbackgammon_main_la[] = {' > libkbackgammon_main_la_meta_unload.cpp ;\ ++ cat kbgboard.moc kbgtextview.moc kbg.moc kbgstatus.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkbackgammon_main_la_meta_unload.cpp ;\ ++ echo '0};' >> libkbackgammon_main_la_meta_unload.cpp ;\ ++ echo '#include <kunload.h>' >> libkbackgammon_main_la_meta_unload.cpp ;\ ++ echo '_UNLOAD(libkbackgammon_main_la)' >> libkbackgammon_main_la_meta_unload.cpp ;\ ++ else echo > libkbackgammon_main_la_meta_unload.cpp; fi + + + #>+ 3 + clean-moc-classes: +- -rm -f kbackgammon_la_meta_unload.cpp ++ -rm -f libkbackgammon_main_la_meta_unload.cpp + + #>+ 11 +-kbackgammon_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kbg.cpp $(srcdir)/kbgboard.cpp $(srcdir)/kbgtextview.cpp $(srcdir)/kbgstatus.cpp kbackgammon_la_meta_unload.cpp kbgboard.moc kbgtextview.moc kbgstatus.moc kbg.moc ++kbackgammon_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kbackgammon_main.cpp kbgboard.moc kbgtextview.moc kbgstatus.moc kbg.moc + @echo 'creating kbackgammon_la.all_cpp.cpp ...'; \ + rm -f kbackgammon_la.all_cpp.files kbackgammon_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kbackgammon_la.all_cpp.final; \ +- for file in main.cpp kbg.cpp kbgboard.cpp kbgtextview.cpp kbgstatus.cpp kbackgammon_la_meta_unload.cpp ; do \ ++ for file in kbackgammon_main.cpp ; do \ + echo "#include \"$$file\"" >> kbackgammon_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kbackgammon_la.all_cpp.final; \ + done; \ +@@ -783,11 +791,23 @@ + rm -f kbackgammon_la.all_cpp.final kbackgammon_la.all_cpp.files + + #>+ 11 +-kbackgammon.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp ++libkbackgammon_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kbg.cpp $(srcdir)/kbgboard.cpp $(srcdir)/kbgtextview.cpp $(srcdir)/kbgstatus.cpp libkbackgammon_main_la_meta_unload.cpp ++ @echo 'creating libkbackgammon_main_la.all_cpp.cpp ...'; \ ++ rm -f libkbackgammon_main_la.all_cpp.files libkbackgammon_main_la.all_cpp.final; \ ++ echo "#define KDE_USE_FINAL 1" >> libkbackgammon_main_la.all_cpp.final; \ ++ for file in main.cpp kbg.cpp kbgboard.cpp kbgtextview.cpp kbgstatus.cpp libkbackgammon_main_la_meta_unload.cpp ; do \ ++ echo "#include \"$$file\"" >> libkbackgammon_main_la.all_cpp.files; \ ++ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkbackgammon_main_la.all_cpp.final; \ ++ done; \ ++ cat libkbackgammon_main_la.all_cpp.final libkbackgammon_main_la.all_cpp.files > libkbackgammon_main_la.all_cpp.cpp; \ ++ rm -f libkbackgammon_main_la.all_cpp.final libkbackgammon_main_la.all_cpp.files ++ ++#>+ 11 ++kbackgammon.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kbackgammon_main.cpp + @echo 'creating kbackgammon.all_cpp.cpp ...'; \ + rm -f kbackgammon.all_cpp.files kbackgammon.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kbackgammon.all_cpp.final; \ +- for file in dummy.cpp ; do \ ++ for file in kbackgammon_main.cpp ; do \ + echo "#include \"$$file\"" >> kbackgammon.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kbackgammon.all_cpp.final; \ + done; \ +@@ -796,20 +816,20 @@ + + #>+ 3 + clean-final: +- -rm -f kbackgammon_la.all_cpp.cpp kbackgammon.all_cpp.cpp ++ -rm -f kbackgammon_la.all_cpp.cpp libkbackgammon_main_la.all_cpp.cpp kbackgammon.all_cpp.cpp + + #>+ 2 + final: +- $(MAKE) kbackgammon_la_OBJECTS="$(kbackgammon_la_final_OBJECTS)" all-am ++ $(MAKE) libkbackgammon_main_la_OBJECTS="$(libkbackgammon_main_la_final_OBJECTS)" all-am + #>+ 2 + final-install: +- $(MAKE) kbackgammon_la_OBJECTS="$(kbackgammon_la_final_OBJECTS)" install-am ++ $(MAKE) libkbackgammon_main_la_OBJECTS="$(libkbackgammon_main_la_final_OBJECTS)" install-am + #>+ 2 + no-final: +- $(MAKE) kbackgammon_la_OBJECTS="$(kbackgammon_la_nofinal_OBJECTS)" all-am ++ $(MAKE) libkbackgammon_main_la_OBJECTS="$(libkbackgammon_main_la_nofinal_OBJECTS)" all-am + #>+ 2 + no-final-install: +- $(MAKE) kbackgammon_la_OBJECTS="$(kbackgammon_la_nofinal_OBJECTS)" install-am ++ $(MAKE) libkbackgammon_main_la_OBJECTS="$(libkbackgammon_main_la_nofinal_OBJECTS)" install-am + #>+ 3 + cvs-clean: + $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/games/kdegames3/patches/patch-ac b/games/kdegames3/patches/patch-ac new file mode 100644 index 00000000000..37f2ea7d03a --- /dev/null +++ b/games/kdegames3/patches/patch-ac @@ -0,0 +1,33 @@ +$NetBSD: patch-ac,v 1.1.1.1.2.2 2002/06/23 18:46:05 jlam Exp $ + +--- kbackgammon/kbackgammon_main.cpp.orig Fri May 31 12:54:09 2002 ++++ kbackgammon/kbackgammon_main.cpp +@@ -0,0 +1,28 @@ ++/* ++ * ++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a copy ++ * of this software and associated documentation files (the "Software"), to deal ++ * in the Software without restriction, including without limitation the rights ++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++ * copies of the Software, and to permit persons to whom the Software is ++ * furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in ++ * all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ */ ++ ++extern "C" int kdemain(int, char* []); ++ ++int main( int argc, char* argv[] ) ++{ ++ return kdemain(argc, argv); ++} diff --git a/games/kdegames3/patches/patch-ad b/games/kdegames3/patches/patch-ad new file mode 100644 index 00000000000..c7fbb1c421a --- /dev/null +++ b/games/kdegames3/patches/patch-ad @@ -0,0 +1,15 @@ +$NetBSD: patch-ad,v 1.1.1.1.2.2 2002/06/23 18:46:06 jlam Exp $ + +--- kbackgammon/main.cpp.orig Wed Oct 10 18:13:31 2001 ++++ kbackgammon/main.cpp +@@ -38,7 +38,9 @@ + * Main program doesn't do much - more or less standard stuff. Right + * after creating a KBg object, control is passed to it. + */ +-int main(int argc, char *argv[]) ++extern "C" int kdemain(int, char *[]); ++ ++int kdemain(int argc, char *argv[]) + { + KAboutData about(PROG_NAME, I18N_NOOP("KBackgammon"), PROG_VERSION, description, + KAboutData::License_GPL, "(C) 1999-2001 Jens Hoefkens", notice, diff --git a/games/kdetoys3/DESCR b/games/kdetoys3/DESCR new file mode 100644 index 00000000000..90ae45773be --- /dev/null +++ b/games/kdetoys3/DESCR @@ -0,0 +1 @@ +KDE provides an integrated X11 based environment, much like CDE. diff --git a/games/kdetoys3/Makefile b/games/kdetoys3/Makefile new file mode 100644 index 00000000000..d3580147047 --- /dev/null +++ b/games/kdetoys3/Makefile @@ -0,0 +1,14 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:46:07 jlam Exp $ + +DISTNAME= kdetoys-3.0.1 +CATEGORIES= games +COMMENT= Toys for the KDE integrated X11 desktop + +.include "../../x11/kde3/Makefile.kde3" + +USE_BUILDLINK_ONLY= YES + +.include "../../x11/kde3/buildlink.mk" +.include "../../x11/kdebase3/buildlink.mk" +.include "../../mk/x11.buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/games/kdetoys3/PLIST b/games/kdetoys3/PLIST new file mode 100644 index 00000000000..18fda9fb59f --- /dev/null +++ b/games/kdetoys3/PLIST @@ -0,0 +1,622 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.2.2 2002/06/23 18:46:08 jlam Exp $ +bin/amor +bin/kaphorism +bin/kmoon +bin/kodo +bin/kteatime +bin/ktux +bin/kworldclock +include/AmorIface.h +lib/kde3/eyes_panelapplet.a +lib/kde3/eyes_panelapplet.la +lib/kde3/eyes_panelapplet.so +lib/kde3/eyes_panelapplet.so.1 +lib/kde3/eyes_panelapplet.so.1.0 +lib/kde3/fifteen_panelapplet.a +lib/kde3/fifteen_panelapplet.la +lib/kde3/fifteen_panelapplet.so +lib/kde3/fifteen_panelapplet.so.1 +lib/kde3/fifteen_panelapplet.so.1.0 +lib/kde3/weather_panelapplet.a +lib/kde3/weather_panelapplet.la +lib/kde3/weather_panelapplet.so +lib/kde3/weather_panelapplet.so.1 +lib/kde3/weather_panelapplet.so.1.0 +lib/kde3/ww_panelapplet.a +lib/kde3/ww_panelapplet.la +lib/kde3/ww_panelapplet.so +lib/kde3/ww_panelapplet.so.1 +lib/kde3/ww_panelapplet.so.1.0 +share/doc/kde/HTML/en/amor/billy.png +share/doc/kde/HTML/en/amor/bonhomme.png +share/doc/kde/HTML/en/amor/bsd.png +share/doc/kde/HTML/en/amor/common +share/doc/kde/HTML/en/amor/eyes.png +share/doc/kde/HTML/en/amor/ghost.png +share/doc/kde/HTML/en/amor/index.cache.bz2 +share/doc/kde/HTML/en/amor/index.docbook +share/doc/kde/HTML/en/amor/neko.png +share/doc/kde/HTML/en/amor/pingus.png +share/doc/kde/HTML/en/amor/spot.png +share/doc/kde/HTML/en/amor/tao.png +share/doc/kde/HTML/en/amor/tux.png +share/doc/kde/HTML/en/amor/worm.png +share/doc/kde/HTML/en/kmoon/carlosmail +share/doc/kde/HTML/en/kmoon/common +share/doc/kde/HTML/en/kmoon/index.cache.bz2 +share/doc/kde/HTML/en/kmoon/index.docbook +share/doc/kde/HTML/en/kodo/common +share/doc/kde/HTML/en/kodo/guide.png +share/doc/kde/HTML/en/kodo/index.cache.bz2 +share/doc/kde/HTML/en/kodo/index.docbook +share/doc/kde/HTML/en/kscore/close.png +share/doc/kde/HTML/en/kscore/common +share/doc/kde/HTML/en/kscore/dl_fail.png +share/doc/kde/HTML/en/kscore/index.cache.bz2 +share/doc/kde/HTML/en/kscore/index.docbook +share/doc/kde/HTML/en/kscore/ncaaf.png +share/doc/kde/HTML/en/kscore/nhl.png +share/doc/kde/HTML/en/kscore/no_score.png +share/doc/kde/HTML/en/kscore/premr.png +share/doc/kde/HTML/en/kscore/settings.png +share/doc/kde/HTML/en/kteatime/common +share/doc/kde/HTML/en/kteatime/config.png +share/doc/kde/HTML/en/kteatime/index.cache.bz2 +share/doc/kde/HTML/en/kteatime/index.docbook +share/doc/kde/HTML/en/kweather/common +share/doc/kde/HTML/en/kweather/index.cache.bz2 +share/doc/kde/HTML/en/kweather/index.docbook +share/doc/kde/HTML/en/kworldclock/common +share/doc/kde/HTML/en/kworldclock/index.cache.bz2 +share/doc/kde/HTML/en/kworldclock/index.docbook +share/kde/applnk/System/ScreenSavers/ktux.desktop +share/kde/applnk/Toys/amor.desktop +share/kde/applnk/Toys/kaphorism.desktop +share/kde/applnk/Toys/kmoon.desktop +share/kde/applnk/Toys/kodo.desktop +share/kde/applnk/Toys/kteatime.desktop +share/kde/applnk/Toys/kworldclock.desktop +share/kde/apps/amor/b/b-f.xpm +share/kde/apps/amor/b/b-f2.xpm +share/kde/apps/amor/b/b1-r.xpm +share/kde/apps/amor/b/b1.xpm +share/kde/apps/amor/b/b2-r.xpm +share/kde/apps/amor/b/b2.xpm +share/kde/apps/amor/b/b3-r.xpm +share/kde/apps/amor/b/b3.xpm +share/kde/apps/amor/b/b4-r.xpm +share/kde/apps/amor/b/b4.xpm +share/kde/apps/amor/b/bcol1.xpm +share/kde/apps/amor/b/bcol2.xpm +share/kde/apps/amor/b/bdrib1.xpm +share/kde/apps/amor/b/bdrib2.xpm +share/kde/apps/amor/b/bdrib3.xpm +share/kde/apps/amor/b/bdrib4.xpm +share/kde/apps/amor/b/bdrib5.xpm +share/kde/apps/amor/b/bdrib6.xpm +share/kde/apps/amor/b/bdrib7.xpm +share/kde/apps/amor/b/bdrop.xpm +share/kde/apps/amor/b/bgo1.xpm +share/kde/apps/amor/b/bgo2.xpm +share/kde/apps/amor/b/bgo3.xpm +share/kde/apps/amor/b/bgo4.xpm +share/kde/apps/amor/b/bgo5.xpm +share/kde/apps/amor/b/bgo6.xpm +share/kde/apps/amor/b/bgo7.xpm +share/kde/apps/amor/b/bh1.xpm +share/kde/apps/amor/b/bpof1.xpm +share/kde/apps/amor/b/bpof2.xpm +share/kde/apps/amor/b/bpof3.xpm +share/kde/apps/amor/b/bpof4.xpm +share/kde/apps/amor/b/bpof5.xpm +share/kde/apps/amor/b/bpof6.xpm +share/kde/apps/amor/b/sa1.xpm +share/kde/apps/amor/b/sa2.xpm +share/kde/apps/amor/b/sa2a.xpm +share/kde/apps/amor/b/sa2b.xpm +share/kde/apps/amor/b/sa2c.xpm +share/kde/apps/amor/b/salut.xpm +share/kde/apps/amor/b/salut1.xpm +share/kde/apps/amor/billyrc +share/kde/apps/amor/blob/blob.xpm +share/kde/apps/amor/blob/blob_BeamDown1.xpm +share/kde/apps/amor/blob/blob_BeamDown2.xpm +share/kde/apps/amor/blob/blob_BeamDown3.xpm +share/kde/apps/amor/blob/blob_BeamDown4.xpm +share/kde/apps/amor/blob/blob_BeamDown5.xpm +share/kde/apps/amor/blob/blob_BeamDown6.xpm +share/kde/apps/amor/blob/blob_BeamDown7.xpm +share/kde/apps/amor/blob/blob_BeamDown8.xpm +share/kde/apps/amor/blob/blob_BeamDown9.xpm +share/kde/apps/amor/blob/blob_BeamUp1.xpm +share/kde/apps/amor/blob/blob_BeamUp10.xpm +share/kde/apps/amor/blob/blob_BeamUp2.xpm +share/kde/apps/amor/blob/blob_BeamUp3.xpm +share/kde/apps/amor/blob/blob_BeamUp4.xpm +share/kde/apps/amor/blob/blob_BeamUp5.xpm +share/kde/apps/amor/blob/blob_BeamUp6.xpm +share/kde/apps/amor/blob/blob_BeamUp7.xpm +share/kde/apps/amor/blob/blob_BeamUp8.xpm +share/kde/apps/amor/blob/blob_BeamUp9.xpm +share/kde/apps/amor/blob/blob_b1.xpm +share/kde/apps/amor/blob/blob_b2.xpm +share/kde/apps/amor/blob/blob_e1.xpm +share/kde/apps/amor/blob/blob_ex1.xpm +share/kde/apps/amor/blob/blob_f1.xpm +share/kde/apps/amor/blob/blob_f2.xpm +share/kde/apps/amor/blob/blob_f3.xpm +share/kde/apps/amor/blob/blob_fire10.xpm +share/kde/apps/amor/blob/blob_fire11.xpm +share/kde/apps/amor/blob/blob_fire2.xpm +share/kde/apps/amor/blob/blob_fire3.xpm +share/kde/apps/amor/blob/blob_fire4.xpm +share/kde/apps/amor/blob/blob_fire5.xpm +share/kde/apps/amor/blob/blob_fire6.xpm +share/kde/apps/amor/blob/blob_fire7.xpm +share/kde/apps/amor/blob/blob_fire8.xpm +share/kde/apps/amor/blob/blob_fire9.xpm +share/kde/apps/amor/blob/blob_g1.xpm +share/kde/apps/amor/blob/blob_g2.xpm +share/kde/apps/amor/blob/blob_gl1.xpm +share/kde/apps/amor/blob/blob_gl2.xpm +share/kde/apps/amor/blob/blob_gl3.xpm +share/kde/apps/amor/blob/blob_h1.xpm +share/kde/apps/amor/blob/blob_h2.xpm +share/kde/apps/amor/blob/blob_h3.xpm +share/kde/apps/amor/blob/blob_jet1.xpm +share/kde/apps/amor/blob/blob_jet2.xpm +share/kde/apps/amor/blob/blob_jet3.xpm +share/kde/apps/amor/blob/blob_jet4.xpm +share/kde/apps/amor/blob/blob_l_jet1.xpm +share/kde/apps/amor/blob/blob_l_jet2.xpm +share/kde/apps/amor/blob/blob_l_jet3.xpm +share/kde/apps/amor/blob/blob_l_jet4.xpm +share/kde/apps/amor/blob/blob_l_turn1.xpm +share/kde/apps/amor/blob/blob_l_turn2.xpm +share/kde/apps/amor/blob/blob_l_turn3.xpm +share/kde/apps/amor/blob/blob_l_turn4.xpm +share/kde/apps/amor/blob/blob_r135.xpm +share/kde/apps/amor/blob/blob_r180.xpm +share/kde/apps/amor/blob/blob_r225.xpm +share/kde/apps/amor/blob/blob_r270.xpm +share/kde/apps/amor/blob/blob_r315.xpm +share/kde/apps/amor/blob/blob_r45.xpm +share/kde/apps/amor/blob/blob_r90.xpm +share/kde/apps/amor/blob/blob_r_turn1.xpm +share/kde/apps/amor/blob/blob_r_turn2.xpm +share/kde/apps/amor/blob/blob_r_turn3.xpm +share/kde/apps/amor/blob/blob_r_turn4.xpm +share/kde/apps/amor/blob/blob_s1.xpm +share/kde/apps/amor/blob/blob_s2.xpm +share/kde/apps/amor/blob/blob_s3.xpm +share/kde/apps/amor/blob/blob_sl1.xpm +share/kde/apps/amor/blob/blob_sl2.xpm +share/kde/apps/amor/blob/blob_sl3.xpm +share/kde/apps/amor/blob/blob_sl4.xpm +share/kde/apps/amor/blob/blob_z1.xpm +share/kde/apps/amor/blob/blob_z2.xpm +share/kde/apps/amor/blob/blob_z3.xpm +share/kde/apps/amor/blobrc +share/kde/apps/amor/brc +share/kde/apps/amor/bsdrc +share/kde/apps/amor/eyes/eye_1.xpm +share/kde/apps/amor/eyes/eye_2.xpm +share/kde/apps/amor/eyes/eye_b.xpm +share/kde/apps/amor/eyes/eye_d.xpm +share/kde/apps/amor/eyes/eye_e.xpm +share/kde/apps/amor/eyes/eye_h1.xpm +share/kde/apps/amor/eyes/eye_h2.xpm +share/kde/apps/amor/eyes/eye_h3.xpm +share/kde/apps/amor/eyes/eye_h4.xpm +share/kde/apps/amor/eyes/eye_l.xpm +share/kde/apps/amor/eyes/eye_m1.xpm +share/kde/apps/amor/eyes/eye_m2.xpm +share/kde/apps/amor/eyes/eye_m3.xpm +share/kde/apps/amor/eyes/eye_m4.xpm +share/kde/apps/amor/eyes/eye_m5.xpm +share/kde/apps/amor/eyes/eye_m6.xpm +share/kde/apps/amor/eyes/eye_m7.xpm +share/kde/apps/amor/eyes/eye_s1.xpm +share/kde/apps/amor/eyes/eye_s2.xpm +share/kde/apps/amor/eyes/eye_s3.xpm +share/kde/apps/amor/eyes/eye_s4.xpm +share/kde/apps/amor/eyes/eye_u.xpm +share/kde/apps/amor/eyes/eye_z1.xpm +share/kde/apps/amor/eyes/eye_z2.xpm +share/kde/apps/amor/eyes/eye_z3.xpm +share/kde/apps/amor/eyes/eye_z4.xpm +share/kde/apps/amor/eyes/eye_z5.xpm +share/kde/apps/amor/eyesrc +share/kde/apps/amor/ghost/ghost_1.xpm +share/kde/apps/amor/ghost/ghost_2.xpm +share/kde/apps/amor/ghost/ghost_e.xpm +share/kde/apps/amor/ghost/ghost_m1.xpm +share/kde/apps/amor/ghost/ghost_m2.xpm +share/kde/apps/amor/ghost/ghost_m3.xpm +share/kde/apps/amor/ghost/ghost_m4.xpm +share/kde/apps/amor/ghost/ghost_m5.xpm +share/kde/apps/amor/ghost/ghost_m6.xpm +share/kde/apps/amor/ghost/ghost_m7.xpm +share/kde/apps/amor/ghost/ghost_z1.xpm +share/kde/apps/amor/ghost/ghost_z2.xpm +share/kde/apps/amor/ghost/ghost_z3.xpm +share/kde/apps/amor/ghost/ghost_z4.xpm +share/kde/apps/amor/ghost/ghost_z5.xpm +share/kde/apps/amor/ghostrc +share/kde/apps/amor/neko/claw1.xpm +share/kde/apps/amor/neko/claw2.xpm +share/kde/apps/amor/neko/jump1.xpm +share/kde/apps/amor/neko/jump2.xpm +share/kde/apps/amor/neko/jump3.xpm +share/kde/apps/amor/neko/jump4.xpm +share/kde/apps/amor/neko/jumpl1.xpm +share/kde/apps/amor/neko/jumpl2.xpm +share/kde/apps/amor/neko/jumpl3.xpm +share/kde/apps/amor/neko/jumpl4.xpm +share/kde/apps/amor/neko/lick.xpm +share/kde/apps/amor/neko/lick2.xpm +share/kde/apps/amor/neko/run1.xpm +share/kde/apps/amor/neko/run2.xpm +share/kde/apps/amor/neko/run3.xpm +share/kde/apps/amor/neko/run4.xpm +share/kde/apps/amor/neko/scratch1.xpm +share/kde/apps/amor/neko/scratch2.xpm +share/kde/apps/amor/neko/scratch3.xpm +share/kde/apps/amor/neko/scratch4.xpm +share/kde/apps/amor/neko/sit.xpm +share/kde/apps/amor/neko/sitleft.xpm +share/kde/apps/amor/neko/sleep1.xpm +share/kde/apps/amor/neko/sleep2.xpm +share/kde/apps/amor/neko/surprise.xpm +share/kde/apps/amor/neko/tail.xpm +share/kde/apps/amor/neko/yawn.xpm +share/kde/apps/amor/nekorc +share/kde/apps/amor/pingu/bash_l1.xpm +share/kde/apps/amor/pingu/bash_l10.xpm +share/kde/apps/amor/pingu/bash_l11.xpm +share/kde/apps/amor/pingu/bash_l12.xpm +share/kde/apps/amor/pingu/bash_l2.xpm +share/kde/apps/amor/pingu/bash_l3.xpm +share/kde/apps/amor/pingu/bash_l4.xpm +share/kde/apps/amor/pingu/bash_l5.xpm +share/kde/apps/amor/pingu/bash_l6.xpm +share/kde/apps/amor/pingu/bash_l7.xpm +share/kde/apps/amor/pingu/bash_l8.xpm +share/kde/apps/amor/pingu/bash_l9.xpm +share/kde/apps/amor/pingu/bash_r1.xpm +share/kde/apps/amor/pingu/bash_r10.xpm +share/kde/apps/amor/pingu/bash_r11.xpm +share/kde/apps/amor/pingu/bash_r12.xpm +share/kde/apps/amor/pingu/bash_r2.xpm +share/kde/apps/amor/pingu/bash_r3.xpm +share/kde/apps/amor/pingu/bash_r4.xpm +share/kde/apps/amor/pingu/bash_r5.xpm +share/kde/apps/amor/pingu/bash_r6.xpm +share/kde/apps/amor/pingu/bash_r7.xpm +share/kde/apps/amor/pingu/bash_r8.xpm +share/kde/apps/amor/pingu/bash_r9.xpm +share/kde/apps/amor/pingu/blocker1.xpm +share/kde/apps/amor/pingu/blocker2.xpm +share/kde/apps/amor/pingu/blocker3.xpm +share/kde/apps/amor/pingu/blocker4.xpm +share/kde/apps/amor/pingu/blocker5.xpm +share/kde/apps/amor/pingu/blocker6.xpm +share/kde/apps/amor/pingu/bomber1.xpm +share/kde/apps/amor/pingu/bomber10.xpm +share/kde/apps/amor/pingu/bomber11.xpm +share/kde/apps/amor/pingu/bomber12.xpm +share/kde/apps/amor/pingu/bomber13.xpm +share/kde/apps/amor/pingu/bomber14.xpm +share/kde/apps/amor/pingu/bomber15.xpm +share/kde/apps/amor/pingu/bomber16.xpm +share/kde/apps/amor/pingu/bomber2.xpm +share/kde/apps/amor/pingu/bomber3.xpm +share/kde/apps/amor/pingu/bomber4.xpm +share/kde/apps/amor/pingu/bomber5.xpm +share/kde/apps/amor/pingu/bomber6.xpm +share/kde/apps/amor/pingu/bomber7.xpm +share/kde/apps/amor/pingu/bomber8.xpm +share/kde/apps/amor/pingu/bomber9.xpm +share/kde/apps/amor/pingu/digger1.xpm +share/kde/apps/amor/pingu/digger10.xpm +share/kde/apps/amor/pingu/digger11.xpm +share/kde/apps/amor/pingu/digger12.xpm +share/kde/apps/amor/pingu/digger13.xpm +share/kde/apps/amor/pingu/digger14.xpm +share/kde/apps/amor/pingu/digger2.xpm +share/kde/apps/amor/pingu/digger3.xpm +share/kde/apps/amor/pingu/digger4.xpm +share/kde/apps/amor/pingu/digger5.xpm +share/kde/apps/amor/pingu/digger6.xpm +share/kde/apps/amor/pingu/digger7.xpm +share/kde/apps/amor/pingu/digger8.xpm +share/kde/apps/amor/pingu/digger9.xpm +share/kde/apps/amor/pingu/faller1.xpm +share/kde/apps/amor/pingu/faller2.xpm +share/kde/apps/amor/pingu/faller3.xpm +share/kde/apps/amor/pingu/faller4.xpm +share/kde/apps/amor/pingu/faller5.xpm +share/kde/apps/amor/pingu/faller6.xpm +share/kde/apps/amor/pingu/faller7.xpm +share/kde/apps/amor/pingu/faller8.xpm +share/kde/apps/amor/pingu/floater1.xpm +share/kde/apps/amor/pingu/floater2.xpm +share/kde/apps/amor/pingu/floater3.xpm +share/kde/apps/amor/pingu/floater4.xpm +share/kde/apps/amor/pingu/floater5.xpm +share/kde/apps/amor/pingu/floater6.xpm +share/kde/apps/amor/pingu/floater7.xpm +share/kde/apps/amor/pingu/floater8.xpm +share/kde/apps/amor/pingu/pinguin.xpm +share/kde/apps/amor/pingu/tumble1.xpm +share/kde/apps/amor/pingu/tumble2.xpm +share/kde/apps/amor/pingu/tumble3.xpm +share/kde/apps/amor/pingu/tumble4.xpm +share/kde/apps/amor/pingu/tumble5.xpm +share/kde/apps/amor/pingu/tumble6.xpm +share/kde/apps/amor/pingu/tumble7.xpm +share/kde/apps/amor/pingu/tumble8.xpm +share/kde/apps/amor/pingu/walk_l1.xpm +share/kde/apps/amor/pingu/walk_l2.xpm +share/kde/apps/amor/pingu/walk_l3.xpm +share/kde/apps/amor/pingu/walk_l4.xpm +share/kde/apps/amor/pingu/walk_l5.xpm +share/kde/apps/amor/pingu/walk_l6.xpm +share/kde/apps/amor/pingu/walk_l7.xpm +share/kde/apps/amor/pingu/walk_l8.xpm +share/kde/apps/amor/pingu/walk_r1.xpm +share/kde/apps/amor/pingu/walk_r2.xpm +share/kde/apps/amor/pingu/walk_r3.xpm +share/kde/apps/amor/pingu/walk_r4.xpm +share/kde/apps/amor/pingu/walk_r5.xpm +share/kde/apps/amor/pingu/walk_r6.xpm +share/kde/apps/amor/pingu/walk_r7.xpm +share/kde/apps/amor/pingu/walk_r8.xpm +share/kde/apps/amor/pingurc +share/kde/apps/amor/static/billy.png +share/kde/apps/amor/static/bsd.png +share/kde/apps/amor/static/tux.png +share/kde/apps/amor/tao/yy-1.xpm +share/kde/apps/amor/tao/yy-2.xpm +share/kde/apps/amor/tao/yy-3.xpm +share/kde/apps/amor/tao/yy-4.xpm +share/kde/apps/amor/tao/yy-5.xpm +share/kde/apps/amor/tao/yy-6.xpm +share/kde/apps/amor/tao/yy-7.xpm +share/kde/apps/amor/tao/yy-8.xpm +share/kde/apps/amor/tao/yy-9.xpm +share/kde/apps/amor/tao/yy.xpm +share/kde/apps/amor/tao/yy105.xpm +share/kde/apps/amor/tao/yy120.xpm +share/kde/apps/amor/tao/yy135.xpm +share/kde/apps/amor/tao/yy15.xpm +share/kde/apps/amor/tao/yy150.xpm +share/kde/apps/amor/tao/yy165.xpm +share/kde/apps/amor/tao/yy180.xpm +share/kde/apps/amor/tao/yy195.xpm +share/kde/apps/amor/tao/yy210.xpm +share/kde/apps/amor/tao/yy225.xpm +share/kde/apps/amor/tao/yy240.xpm +share/kde/apps/amor/tao/yy255.xpm +share/kde/apps/amor/tao/yy270.xpm +share/kde/apps/amor/tao/yy285.xpm +share/kde/apps/amor/tao/yy30.xpm +share/kde/apps/amor/tao/yy300.xpm +share/kde/apps/amor/tao/yy315.xpm +share/kde/apps/amor/tao/yy330.xpm +share/kde/apps/amor/tao/yy345.xpm +share/kde/apps/amor/tao/yy45.xpm +share/kde/apps/amor/tao/yy60.xpm +share/kde/apps/amor/tao/yy75.xpm +share/kde/apps/amor/tao/yy90.xpm +share/kde/apps/amor/tao/yyx10.xpm +share/kde/apps/amor/tao/yyx12.xpm +share/kde/apps/amor/tao/yyx14.xpm +share/kde/apps/amor/tao/yyx16.xpm +share/kde/apps/amor/tao/yyx18.xpm +share/kde/apps/amor/tao/yyx20.xpm +share/kde/apps/amor/tao/yyx22.xpm +share/kde/apps/amor/tao/yyx24.xpm +share/kde/apps/amor/tao/yyx26.xpm +share/kde/apps/amor/tao/yyx28.xpm +share/kde/apps/amor/tao/yyx30.xpm +share/kde/apps/amor/tao/yyx6.xpm +share/kde/apps/amor/tao/yyx8.xpm +share/kde/apps/amor/taorc +share/kde/apps/amor/tips +share/kde/apps/amor/tips-en +share/kde/apps/amor/tuxrc +share/kde/apps/amor/worm/w-a1.xpm +share/kde/apps/amor/worm/w-a2.xpm +share/kde/apps/amor/worm/w-b1.xpm +share/kde/apps/amor/worm/w-b2.xpm +share/kde/apps/amor/worm/w-be1.xpm +share/kde/apps/amor/worm/w-be2.xpm +share/kde/apps/amor/worm/w-be3.xpm +share/kde/apps/amor/worm/w-be4.xpm +share/kde/apps/amor/worm/w-d1.xpm +share/kde/apps/amor/worm/w-d2.xpm +share/kde/apps/amor/worm/w-d3.xpm +share/kde/apps/amor/worm/w-d4.xpm +share/kde/apps/amor/worm/w-d5.xpm +share/kde/apps/amor/worm/w-dr1.xpm +share/kde/apps/amor/worm/w-e1.xpm +share/kde/apps/amor/worm/w-l1.xpm +share/kde/apps/amor/worm/w-l2.xpm +share/kde/apps/amor/worm/w-l3.xpm +share/kde/apps/amor/worm/w-ml0.xpm +share/kde/apps/amor/worm/w-ml1.xpm +share/kde/apps/amor/worm/w-ml2.xpm +share/kde/apps/amor/worm/w-ml3.xpm +share/kde/apps/amor/worm/w-mr0.xpm +share/kde/apps/amor/worm/w-mr1.xpm +share/kde/apps/amor/worm/w-mr2.xpm +share/kde/apps/amor/worm/w-mr3.xpm +share/kde/apps/amor/worm/w-s1.xpm +share/kde/apps/amor/worm/w-s2.xpm +share/kde/apps/amor/worm/w-s3.xpm +share/kde/apps/amor/worm/w-u1.xpm +share/kde/apps/amor/worm/w-u2.xpm +share/kde/apps/amor/worm/w-u3.xpm +share/kde/apps/amor/worm/w-wl1.xpm +share/kde/apps/amor/worm/w-wl2.xpm +share/kde/apps/amor/worm/w-wr1.xpm +share/kde/apps/amor/worm/w-wr2.xpm +share/kde/apps/amor/wormrc +share/kde/apps/kaphorism/aphorisms/Seelenkalender +share/kde/apps/kaphorism/aphorisms/Seelenkalender.png +share/kde/apps/kaphorism/aphorisms/kaphorism.rc +share/kde/apps/kaphorism/kaphorism.rc +share/kde/apps/kdesktop/programs/kdeworld.desktop +share/kde/apps/kicker/applets/eyesapplet.desktop +share/kde/apps/kicker/applets/kfifteenapplet.desktop +share/kde/apps/kicker/applets/kweather.desktop +share/kde/apps/kicker/applets/kwwapplet.desktop +share/kde/apps/kmoon/pics/moon1.png +share/kde/apps/kmoon/pics/moon10.png +share/kde/apps/kmoon/pics/moon11.png +share/kde/apps/kmoon/pics/moon12.png +share/kde/apps/kmoon/pics/moon13.png +share/kde/apps/kmoon/pics/moon14.png +share/kde/apps/kmoon/pics/moon15.png +share/kde/apps/kmoon/pics/moon16.png +share/kde/apps/kmoon/pics/moon17.png +share/kde/apps/kmoon/pics/moon18.png +share/kde/apps/kmoon/pics/moon19.png +share/kde/apps/kmoon/pics/moon2.png +share/kde/apps/kmoon/pics/moon20.png +share/kde/apps/kmoon/pics/moon21.png +share/kde/apps/kmoon/pics/moon22.png +share/kde/apps/kmoon/pics/moon23.png +share/kde/apps/kmoon/pics/moon24.png +share/kde/apps/kmoon/pics/moon25.png +share/kde/apps/kmoon/pics/moon26.png +share/kde/apps/kmoon/pics/moon27.png +share/kde/apps/kmoon/pics/moon28.png +share/kde/apps/kmoon/pics/moon29.png +share/kde/apps/kmoon/pics/moon3.png +share/kde/apps/kmoon/pics/moon4.png +share/kde/apps/kmoon/pics/moon5.png +share/kde/apps/kmoon/pics/moon6.png +share/kde/apps/kmoon/pics/moon7.png +share/kde/apps/kmoon/pics/moon8.png +share/kde/apps/kmoon/pics/moon9.png +share/kde/apps/kodo/numbers.png +share/kde/apps/ktux/sprites/anim0001.png +share/kde/apps/ktux/sprites/anim0002.png +share/kde/apps/ktux/sprites/anim0003.png +share/kde/apps/ktux/sprites/anim0004.png +share/kde/apps/ktux/sprites/anim0005.png +share/kde/apps/ktux/sprites/anim0006.png +share/kde/apps/ktux/sprites/anim0007.png +share/kde/apps/ktux/sprites/anim0008.png +share/kde/apps/ktux/sprites/anim0009.png +share/kde/apps/ktux/sprites/anim0010.png +share/kde/apps/ktux/sprites/bg.png +share/kde/apps/ktux/sprites/flare0001.png +share/kde/apps/ktux/sprites/flare0002.png +share/kde/apps/ktux/sprites/spriterc +share/kde/apps/ktux/sprites/star0001.png +share/kde/apps/ktux/sprites/star0002.png +share/kde/apps/kweather/cloudy1.png +share/kde/apps/kweather/cloudy2.png +share/kde/apps/kweather/cloudy3.png +share/kde/apps/kweather/cloudy4.png +share/kde/apps/kweather/cloudy5.png +share/kde/apps/kweather/dunno.png +share/kde/apps/kweather/fog.png +share/kde/apps/kweather/hail.png +share/kde/apps/kweather/light_rain.png +share/kde/apps/kweather/mcloudy.png +share/kde/apps/kweather/mist.png +share/kde/apps/kweather/overcast.png +share/kde/apps/kweather/part-cloud.png +share/kde/apps/kweather/pcloudy.png +share/kde/apps/kweather/rain.png +share/kde/apps/kweather/rainy.png +share/kde/apps/kweather/shower1.png +share/kde/apps/kweather/shower2.png +share/kde/apps/kweather/shower3.png +share/kde/apps/kweather/sleet.png +share/kde/apps/kweather/slop.png +share/kde/apps/kweather/snow.png +share/kde/apps/kweather/snow1.png +share/kde/apps/kweather/snow2.png +share/kde/apps/kweather/snow3.png +share/kde/apps/kweather/snow4.png +share/kde/apps/kweather/snow5.png +share/kde/apps/kweather/snowshowers.png +share/kde/apps/kweather/sunny.png +share/kde/apps/kweather/thunderstorm.png +share/kde/apps/kweather/tstorm.png +share/kde/apps/kweather/tstorm1.png +share/kde/apps/kweather/tstorm2.png +share/kde/apps/kweather/tstorm3.png +share/kde/apps/kweather/wind.png +share/kde/apps/kworldclock/maps/depths/400.jpg +share/kde/apps/kworldclock/maps/depths/800.jpg +share/kde/apps/kworldclock/maps/depths/depths.desktop +share/kde/apps/kworldclock/pics/flag-blue.png +share/kde/apps/kworldclock/pics/flag-green.png +share/kde/apps/kworldclock/pics/flag-mask.xpm +share/kde/apps/kworldclock/pics/flag-red.png +share/kde/apps/kworldclock/pics/flag.png +share/kde/apps/kworldclock/zone.tab +share/kde/icons/hicolor/16x16/apps/amor.png +share/kde/icons/hicolor/16x16/apps/kaphorism.png +share/kde/icons/hicolor/16x16/apps/kmoon.png +share/kde/icons/hicolor/16x16/apps/kodo.png +share/kde/icons/hicolor/16x16/apps/kteatime.png +share/kde/icons/hicolor/16x16/apps/kworldclock.png +share/kde/icons/hicolor/32x32/apps/amor.png +share/kde/icons/hicolor/32x32/apps/kaphorism.png +share/kde/icons/hicolor/32x32/apps/kmoon.png +share/kde/icons/hicolor/32x32/apps/kodo.png +share/kde/icons/hicolor/32x32/apps/kworldclock.png +share/kde/icons/hicolor/48x48/apps/kaphorism.png +share/kde/icons/hicolor/48x48/apps/kmoon.png +share/kde/icons/hicolor/48x48/apps/kodo.png +share/kde/icons/hicolor/48x48/apps/kworldclock.png +share/kde/icons/locolor/16x16/apps/kteatime.png +share/kde/icons/locolor/16x16/apps/ktux.png +share/kde/icons/locolor/32x32/apps/ktux.png +@comment dirrm share/kde/icons/locolor/32x32/apps +@comment dirrm share/kde/icons/locolor/16x16/apps +@comment dirrm share/kde/icons/hicolor/48x48/apps +@comment dirrm share/kde/icons/hicolor/32x32/apps +@comment dirrm share/kde/icons/hicolor/16x16/apps +@dirrm share/kde/apps/kworldclock/pics +@dirrm share/kde/apps/kworldclock/maps/depths +@comment dirrm share/kde/apps/kworldclock +@dirrm share/kde/apps/kweather +@dirrm share/kde/apps/ktux/sprites +@dirrm share/kde/apps/ktux +@dirrm share/kde/apps/kodo +@dirrm share/kde/apps/kmoon/pics +@dirrm share/kde/apps/kmoon +@comment dirrm share/kde/apps/kicker/applets +@comment dirrm share/kde/apps/kdesktop/programs +@dirrm share/kde/apps/kaphorism/aphorisms +@dirrm share/kde/apps/kaphorism +@dirrm share/kde/apps/amor/worm +@comment dirrm share/kde/apps/amor/tao +@dirrm share/kde/apps/amor/static +@dirrm share/kde/apps/amor/pingu +@dirrm share/kde/apps/amor/neko +@dirrm share/kde/apps/amor/ghost +@dirrm share/kde/apps/amor/eyes +@dirrm share/kde/apps/amor/blob +@dirrm share/kde/apps/amor/b +@comment dirrm share/kde/apps/amor +@comment dirrm share/kde/apps +@comment dirrm share/kde/applnk/Toys +@comment dirrm share/kde/applnk/System/ScreenSavers +@dirrm share/doc/kde/HTML/en/kworldclock +@dirrm share/doc/kde/HTML/en/kweather +@dirrm share/doc/kde/HTML/en/kteatime +@dirrm share/doc/kde/HTML/en/kscore +@dirrm share/doc/kde/HTML/en/kodo +@dirrm share/doc/kde/HTML/en/kmoon +@dirrm share/doc/kde/HTML/en/amor +@comment dirrm share/doc/kde/HTML/en +@comment dirrm lib/kde3 diff --git a/games/kdetoys3/distinfo b/games/kdetoys3/distinfo new file mode 100644 index 00000000000..a6894eb8c5d --- /dev/null +++ b/games/kdetoys3/distinfo @@ -0,0 +1,4 @@ +$NetBSD: distinfo,v 1.1.1.1.2.2 2002/06/23 18:46:08 jlam Exp $ + +SHA1 (kdetoys-3.0.1.tar.bz2) = 20c116aa076535cf7f43a5800fe4475a560f52ef +Size (kdetoys-3.0.1.tar.bz2) = 1410837 bytes diff --git a/games/prboom/Makefile b/games/prboom/Makefile index 75e9d29402a..0668986fa59 100644 --- a/games/prboom/Makefile +++ b/games/prboom/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/07/26 12:33:59 zuntum Exp $ +# $NetBSD: Makefile,v 1.1.1.1.2.1 2002/06/23 18:46:08 jlam Exp $ # DISTNAME= prboom-2.2.1 CATEGORIES= games -MASTER_SITES= http://prdownloads.sourceforge.net/prboom/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=prboom/} MAINTAINER= zuntum@netbsd.org HOMEPAGE= http://prboom.sourceforge.net/ diff --git a/games/quake3arena-demo/DESCR b/games/quake3arena-demo/DESCR index 296a3c48bb6..a4964fce558 100644 --- a/games/quake3arena-demo/DESCR +++ b/games/quake3arena-demo/DESCR @@ -1,12 +1,22 @@ -Quake III Arena, developed by the gaming wizards at id Software, is -the third installment of one of the most popular computer game +Quake III Arena, developed by the gaming wizards at id Software, +is the third installment of one of the most popular computer game franchises of all time. Organic caverns, gothic cathedrals and -futuristic spacescapes play host to Quake III Arena's unrivaled blend -of action, strategy and jaw-dropping technology as Linux gamers are -invited to square off against 32 of history's greatest warriors. Built -around a revolutionary new graphics engine capable of delivering mind -blowing 3D special effects including curved surfaces and volumetric -fog, Quake III Arena is the final word in deathmatching mayhem. +futuristic spacescapes play host to Quake III Arena's unrivaled +blend of action, strategy and jaw-dropping technology as Linux +gamers are invited to square off against 32 of history's greatest +warriors. Built around a revolutionary new graphics engine capable +of delivering mind blowing 3D special effects including curved +surfaces and volumetric fog, Quake III Arena is the final word in +deathmatching mayhem. This is the free demo version - a full version is available from Loki Games at http://quake3.lokigames.com/ + +Note that this requires that you have a 100% full OpenGL compliant +3-D video card and driver. Quake III Arena uses the OpenGL API for +3-D hardware acceleration. There is no software-only version of +the game. If your computer is not hardware accelerated with a game +compatible graphics card, you will NOT be able to run the Q3A demo. +Currently, only drivers for 3dfx based cards are included in the +demo install. For updates on GL drivers, in particular for the +Matrox G200/G400, see http://www.lokigames.com/support/gldrivers/. diff --git a/games/quake3arena/DESCR b/games/quake3arena/DESCR index 139145cc26f..3aff8240df0 100644 --- a/games/quake3arena/DESCR +++ b/games/quake3arena/DESCR @@ -1,12 +1,22 @@ -Quake III Arena, developed by the gaming wizards at id Software, is -the third installment of one of the most popular computer game +Quake III Arena, developed by the gaming wizards at id Software, +is the third installment of one of the most popular computer game franchises of all time. Organic caverns, gothic cathedrals and -futuristic spacescapes play host to Quake III Arena's unrivaled blend -of action, strategy and jaw-dropping technology as Linux gamers are -invited to square off against 32 of history's greatest warriors. Built -around a revolutionary new graphics engine capable of delivering mind -blowing 3D special effects including curved surfaces and volumetric -fog, Quake III Arena is the final word in deathmatching mayhem. +futuristic spacescapes play host to Quake III Arena's unrivaled +blend of action, strategy and jaw-dropping technology as Linux +gamers are invited to square off against 32 of history's greatest +warriors. Built around a revolutionary new graphics engine capable +of delivering mind blowing 3D special effects including curved +surfaces and volumetric fog, Quake III Arena is the final word in +deathmatching mayhem. -This is the binary only for the full version - the data files are not -included. +Note that this requires that you have a 100% full OpenGL compliant +3-D video card and driver. Quake III Arena uses the OpenGL API for +3-D hardware acceleration. There is no software-only version of +the game. If your computer is not hardware accelerated with a game +compatible graphics card, you will NOT be able to run the Q3A demo. +Currently, only drivers for 3dfx based cards are included in the +demo install. For updates on GL drivers, in particular for the +Matrox G200/G400, see http://www.lokigames.com/support/gldrivers/. + +This is the binary only for the full version - the data files are +not included. diff --git a/games/sl/Makefile b/games/sl/Makefile index 31c32b2b510..8846f6b042a 100644 --- a/games/sl/Makefile +++ b/games/sl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/03/27 03:19:58 hubertf Exp $ +# $NetBSD: Makefile,v 1.5.2.1 2002/06/23 18:46:10 jlam Exp $ # DISTNAME= sl @@ -15,7 +15,7 @@ MAINTAINER= minoura@netbsd.org HOMEPAGE= http://www.tkl.iis.u-tokyo.ac.jp/~toyoda/ COMMENT= Animated SL that runs across the terminal when you type `sl' instead of `ls' -BUILD_DEPENDS= nkf-1.7:../../japanese/nkf +BUILD_DEPENDS= nkf-1.7:../../converters/nkf post-build: nkf -e ${WRKSRC}/sl.1 > ${WRKSRC}/sl.1.euc diff --git a/games/xgalaga/Makefile b/games/xgalaga/Makefile index 12e43c112a0..b65c1adf215 100644 --- a/games/xgalaga/Makefile +++ b/games/xgalaga/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/11/29 01:12:33 hubertf Exp $ +# $NetBSD: Makefile,v 1.11.2.1 2002/06/23 18:46:11 jlam Exp $ # DISTNAME= xgalaga-2.0.34 @@ -12,10 +12,10 @@ COMMENT= Very fast true-to-the-original port of galaga for X11 USE_X11BASE= YES USE_XPM= YES -HAS_CONFIGURE= YES -CONFIGURE_ARGS+= --prefix=${X11PREFIX}/share/xgalaga -CONFIGURE_ARGS+= --exec-prefix=${X11PREFIX}/bin -CFLAGS+= -I${X11PREFIX}/include +GNU_CONFIGURE= YES +GNU_CONFIGURE_PREFIX= ${PREFIX}/share/xgalaga +CONFIGURE_ARGS+= --exec-prefix=${PREFIX}/bin +CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include CPPFLAGS+= ${CFLAGS} post-install: diff --git a/games/xrick/DESCR b/games/xrick/DESCR new file mode 100644 index 00000000000..6702efd0bf6 --- /dev/null +++ b/games/xrick/DESCR @@ -0,0 +1,10 @@ +A Rick Dangerous (TM) clone, a famous platform game many moons ago. +Legal status is a bit shrouded. From the enclosed README: + +** IMPORTANT NOTE ********************************************************** + +I have written the xrick code. However, graphics and maps and sounds +are by the authors of the original Rick Dangerous game, and "Rick +Dangerous" remains a trademark of its owner(s) -- maybe Core Design +(who wrote the game) or FireBird (who published it). I have not been +successful at contacting Core Design. diff --git a/games/xrick/Makefile b/games/xrick/Makefile new file mode 100644 index 00000000000..c411e323381 --- /dev/null +++ b/games/xrick/Makefile @@ -0,0 +1,35 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:46:12 jlam Exp $ +# + +DISTNAME= xrick-010808 +WRKSRC= ${WRKDIR}/xrick +CATEGORIES= games +MASTER_SITES= http://www.bigorno.net/xrick/ +EXTRACT_SUFX= .tgz + +MAINTAINER= pino@dohd.org +HOMEPAGE= http://www.bigorno.net/xrick/ +COMMENT= Rick Dangerous clone for X + +RESTRICTED= "Copyright of graphics, images, maps, and sounds is questionable." +NO_BIN_ON_CDROM= ${RESTRICTED} +NO_SRC_ON_CDROM= ${RESTRICTED} +NO_BIN_ON_FTP= ${RESTRICTED} +NO_SRC_ON_FTP= ${RESTRICTED} + +USE_GMAKE= YES +USE_BUILDLINK_ONLY= YES +HAS_CONFIGURE= YES + +CONFIGURE_SCRIPT= ./config + +post-extract: + cd ${WRKSRC} && ${GUNZIP_CMD} xrick.6.gz + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/xrick ${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/xrick.6 ${PREFIX}/man/man6 + +.include "../../devel/SDL/buildlink.mk" +.include "../../mk/x11.buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/games/xrick/PLIST b/games/xrick/PLIST new file mode 100644 index 00000000000..0cc1a6c2d65 --- /dev/null +++ b/games/xrick/PLIST @@ -0,0 +1,3 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.2.2 2002/06/23 18:46:12 jlam Exp $ +bin/xrick +man/man6/xrick.6 diff --git a/games/xrick/distinfo b/games/xrick/distinfo new file mode 100644 index 00000000000..d92c3e624de --- /dev/null +++ b/games/xrick/distinfo @@ -0,0 +1,4 @@ + +SHA1 (xrick-010808.tgz) = f6b344433a11eb7ffb85412ffc66e79cc8b66e75 +Size (xrick-010808.tgz) = 244991 bytes +SHA1 (patch-aa) = 99a518e9e190e581a9a445b11fc4e54d5ed9e26b diff --git a/games/xrick/patches/patch-aa b/games/xrick/patches/patch-aa new file mode 100644 index 00000000000..3c535fc22fe --- /dev/null +++ b/games/xrick/patches/patch-aa @@ -0,0 +1,42 @@ +$NetBSD: patch-aa,v 1.1.1.1.2.2 2002/06/23 18:46:14 jlam Exp $ + +--- config.orig Mon Aug 6 21:06:13 2001 ++++ config +@@ -57,20 +57,23 @@ + LDFLAGS="$LDFLAGS `sdl-config --libs`" + fi + +-POSDOT=`expr index $SDLVER '.'` +-POSDOTp=`expr $POSDOT - 1` +-POSDOTn=`expr $POSDOT + 1` +-SDL_MAJ=`expr substr $SDLVER 1 $POSDOTp` +-LEN=`expr length $SDLVER` +-LEN=`expr $LEN - $POSDOT` +-SDLVER=`expr substr $SDLVER $POSDOTn $LEN` +-POSDOT=`expr index $SDLVER '.'` +-POSDOTp=`expr $POSDOT - 1` +-POSDOTn=`expr $POSDOT + 1` +-SDL_MIN=`expr substr $SDLVER 1 $POSDOTp` +-LEN=`expr length $SDLVER` +-LEN=`expr $LEN - $POSDOT` +-SDL_MIC=`expr substr $SDLVER $POSDOTn $LEN` ++#POSDOT=`expr index $SDLVER '.'` ++#POSDOTp=`expr $POSDOT - 1` ++#POSDOTn=`expr $POSDOT + 1` ++#SDL_MAJ=`expr substr $SDLVER 1 $POSDOTp` ++SDL_MAJ=`echo $SDLVER | sed -e 's/\([0-9]*\).*/\1/'` ++#LEN=`expr length $SDLVER` ++#LEN=`expr $LEN - $POSDOT` ++#SDLVER=`expr substr $SDLVER $POSDOTn $LEN` ++#POSDOT=`expr index $SDLVER '.'` ++#POSDOTp=`expr $POSDOT - 1` ++#POSDOTn=`expr $POSDOT + 1` ++#SDL_MIN=`expr substr $SDLVER 1 $POSDOTp` ++SDL_MIN=`echo $SDLVER | sed -e 's/[0-9]\.\([0-9]*\).*/\1/'` ++#LEN=`expr length $SDLVER` ++#LEN=`expr $LEN - $POSDOT` ++#SDL_MIC=`expr substr $SDLVER $POSDOTn $LEN` ++SDL_MIC=`echo $SDLVER | sed -e 's/[0-9]\.[0-9]\.\([0-9]*\).*/\1/'` + + case "$TARGET" in + cygwin* | CYGWIN*) diff --git a/graphics/Makefile b/graphics/Makefile index e95c8070c17..cf95b726eed 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.187 2002/05/03 23:46:18 jtb Exp $ +# $NetBSD: Makefile,v 1.187.2.1 2002/06/23 18:46:14 jlam Exp $ # COMMENT= Graphics tools and libraries @@ -91,7 +91,9 @@ SUBDIR+= jhead SUBDIR+= jpeg SUBDIR+= kdegraphics SUBDIR+= kdegraphics2 +SUBDIR+= kdegraphics3 SUBDIR+= lcms +SUBDIR+= libart2 SUBDIR+= libexif SUBDIR+= libflash SUBDIR+= libgdgeda @@ -101,6 +103,7 @@ SUBDIR+= librsvg SUBDIR+= libungif SUBDIR+= libwmf SUBDIR+= magicpoint +SUBDIR+= mencoder SUBDIR+= mgl SUBDIR+= mng SUBDIR+= moz-flash @@ -108,7 +111,9 @@ SUBDIR+= mpeg-lib SUBDIR+= mpeg2codec SUBDIR+= mpeg_encode SUBDIR+= mpeg_play +SUBDIR+= mpgtx SUBDIR+= mplayer +SUBDIR+= mplayer-share SUBDIR+= mplex SUBDIR+= mtv SUBDIR+= ncview @@ -149,6 +154,7 @@ SUBDIR+= py-gdchart SUBDIR+= py-gimp SUBDIR+= py-imaging SUBDIR+= py-imagingtk +SUBDIR+= qiv SUBDIR+= qvplay SUBDIR+= rayshade SUBDIR+= ruby-opengl diff --git a/graphics/cdlabelgen/Makefile b/graphics/cdlabelgen/Makefile index 6367c7e7d03..890528b028c 100644 --- a/graphics/cdlabelgen/Makefile +++ b/graphics/cdlabelgen/Makefile @@ -1,11 +1,8 @@ -# $NetBSD: Makefile,v 1.5 2001/02/16 15:22:16 wiz Exp $ -# +# $NetBSD: Makefile,v 1.5.2.1 2002/06/23 18:46:15 jlam Exp $ DISTNAME= cdlabelgen-1.5.0 CATEGORIES= graphics -MASTER_SITES= http://www.red-bean.com/~bwf/software/cdlabelgen/ \ - ftp://ftp.red-bean.com/pub/bwf/ \ - ${MASTER_SITE_SUNSITE:=utils/disk-management/} +MASTER_SITES= http://www.red-bean.com/fitz/software/cdlabelgen/ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.red-bean.com/~bwf/software/cdlabelgen/ diff --git a/graphics/cdlabelgen/distinfo b/graphics/cdlabelgen/distinfo index 8e2bf897f84..c211c0df9b1 100644 --- a/graphics/cdlabelgen/distinfo +++ b/graphics/cdlabelgen/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.4 2002/04/23 08:16:03 wiz Exp $ +$NetBSD: distinfo,v 1.4.2.1 2002/06/23 18:46:16 jlam Exp $ -SHA1 (cdlabelgen-1.5.0.tar.gz) = 72cbe1e5f13ad0fb7ee990410120f21e3cb25de0 -Size (cdlabelgen-1.5.0.tar.gz) = 88718 bytes +SHA1 (cdlabelgen-1.5.0.tar.gz) = 5fba7a67b3f4c86cd879fa9dc231501c77ac8374 +Size (cdlabelgen-1.5.0.tar.gz) = 88979 bytes SHA1 (patch-aa) = f33817230b73212c31735f21596aa99a0f138400 SHA1 (patch-ab) = c7246d7b685450f38f985165431a531a7599c91d diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile index f934d82d166..656e70fa939 100644 --- a/graphics/dia/Makefile +++ b/graphics/dia/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2002/03/13 17:37:04 fredb Exp $ +# $NetBSD: Makefile,v 1.5.2.1 2002/06/23 18:46:17 jlam Exp $ DISTNAME= dia-0.88.1 PKGREVISION= 1 @@ -23,6 +23,7 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-gnome --enable-gnome-print +.include "../../print/gnome-print/buildlink.mk" .include "../../graphics/gdk-pixbuf/buildlink.mk" .include "../../x11/gnome-libs/buildlink.mk" .include "../../textproc/libxml/buildlink.mk" diff --git a/graphics/dumpmpeg/Makefile b/graphics/dumpmpeg/Makefile index 3f72147ed03..b3043a50c4c 100644 --- a/graphics/dumpmpeg/Makefile +++ b/graphics/dumpmpeg/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.3 2001/06/29 04:54:54 jlam Exp $ +# $NetBSD: Makefile,v 1.3.2.1 2002/06/23 18:46:17 jlam Exp $ # DISTNAME= dumpmpeg-0.6 CATEGORIES= graphics -MASTER_SITES= http://prdownloads.sourceforge.net/dumpmpeg/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dumpmpeg/} MAINTAINER= hubertf@netbsd.org HOMEPAGE= http://sourceforge.net/projects/dumpmpeg diff --git a/graphics/freetype2/Makefile b/graphics/freetype2/Makefile index 5fbc41a333a..4545df54cee 100644 --- a/graphics/freetype2/Makefile +++ b/graphics/freetype2/Makefile @@ -1,15 +1,15 @@ -# $NetBSD: Makefile,v 1.10.2.2 2002/06/21 23:05:19 jlam Exp $ +# $NetBSD: Makefile,v 1.10.2.3 2002/06/23 18:46:18 jlam Exp $ # DISTNAME= freetype-2.0.5 PKGNAME= freetype2-2.0.5 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=freetype/} \ - http://freetype.sourceforge.net/pub/freetype/freetype2/ \ - http://gd.tuwien.ac.at/publishing/freetype/freetype2/ \ - http://ftp.funet.fi/pub/mirrors/ftp.freetype.org/freetype2/ \ - http://ftp.sunet.se/pub/text-processing/freetype/freetype2/ \ - ftp://www.nigels.com/pub/freetype/freetype2/ + ftp://ftp.freetype.org/freetype/freetype2/ \ + ftp://ftp.ntua.gr/mirror/freetype/freetype2/ \ + ftp://ring.aist.go.jp/pub/graphics/freetype/freetype2/ \ + ftp://sunsite.cnlab-switch.ch/mirror/freetype/freetype2/ \ + http://gd.tuwien.ac.at/publishing/freetype/freetype2/ MAINTAINER= rh@netbsd.org HOMEPAGE= http://www.freetype.org/ diff --git a/graphics/fxtv/Makefile b/graphics/fxtv/Makefile index 94433cf8ae0..f651421d40a 100644 --- a/graphics/fxtv/Makefile +++ b/graphics/fxtv/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.16 2001/08/23 19:19:40 jlam Exp $ +# $NetBSD: Makefile,v 1.16.2.1 2002/06/23 18:46:18 jlam Exp $ DISTNAME= fxtv-1.03 +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${HOMEPAGE} EXTRACT_SUFX= .tgz diff --git a/graphics/fxtv/distinfo b/graphics/fxtv/distinfo index db9a9226e3c..b3112e00966 100644 --- a/graphics/fxtv/distinfo +++ b/graphics/fxtv/distinfo @@ -1,9 +1,11 @@ -$NetBSD: distinfo,v 1.2 2001/04/21 09:54:12 wiz Exp $ +$NetBSD: distinfo,v 1.2.2.1 2002/06/23 18:46:19 jlam Exp $ SHA1 (fxtv-1.03.tgz) = 2ed9f2bee879a931c7f963a4ad7d07ef9cd297f9 Size (fxtv-1.03.tgz) = 198669 bytes SHA1 (patch-aa) = 00463e17d9094d4d8fd7e67ced83d6429dc4a961 SHA1 (patch-ab) = a62c497255063a88b7d240e902a45c85f59f84b0 -SHA1 (patch-ac) = dd02ab138e3009436c0144ca19d4ada20eeab022 +SHA1 (patch-ac) = 27a825287c17d1cc957fb89ba2f665c01f998c15 SHA1 (patch-ad) = 283be930d67085accf3876924bb69068eed7b5a4 SHA1 (patch-ae) = db041f1c2bdbfe2b3da95d0d798fc4eb4f63d633 +SHA1 (patch-af) = 50ab2d960955a8e97b6b56265195ec325b206cf9 +SHA1 (patch-ag) = 126e1fab604038460fd79cc3487b1b1e30497742 diff --git a/graphics/fxtv/patches/patch-ac b/graphics/fxtv/patches/patch-ac index 812153220b2..bb86d071e1c 100644 --- a/graphics/fxtv/patches/patch-ac +++ b/graphics/fxtv/patches/patch-ac @@ -1,12 +1,12 @@ -$NetBSD: patch-ac,v 1.2 2001/02/13 21:45:07 tron Exp $ +$NetBSD: patch-ac,v 1.2.2.1 2002/06/23 18:46:19 jlam Exp $ --- tvaudio.c.orig Mon Feb 12 15:56:29 2001 -+++ tvaudio.c Tue Feb 13 22:39:48 2001 ++++ tvaudio.c @@ -107,7 +107,11 @@ #ifdef SOUND_MIXER_VIDEO else if ( STREQ( buf, "VIDEO" ) ) { Mixer_dev_id = SOUND_MIXER_VIDEO; -+#ifdef __NetBSD__ ++#ifndef SOUND_MASK_VIDEO + Mixer_dev_mask = 1 << SOUND_MIXER_VIDEO; +#else Mixer_dev_mask = SOUND_MASK_VIDEO; diff --git a/graphics/fxtv/patches/patch-af b/graphics/fxtv/patches/patch-af new file mode 100644 index 00000000000..7f08896ddeb --- /dev/null +++ b/graphics/fxtv/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.3.2.2 2002/06/23 18:46:20 jlam Exp $ + +--- tvutil.c.orig Mon May 13 13:43:42 2002 ++++ tvutil.c Mon May 13 13:44:18 2002 +@@ -112,7 +112,7 @@ + #elif defined(__bsdi__) + int mib[2] = { CTL_KERN, KERN_MAXFILES }; + #elif defined(__NetBSD__) +- int mib[2] = { CTL_KERN, OPEN_MAX }; ++ int mib[2] = { CTL_KERN, KERN_MAXFILES }; + #elif defined(__OpenBSD__) + int mib[2] = { CTL_KERN, OPEN_MAX }; + #endif diff --git a/graphics/fxtv/patches/patch-ag b/graphics/fxtv/patches/patch-ag new file mode 100644 index 00000000000..a74bee74dd1 --- /dev/null +++ b/graphics/fxtv/patches/patch-ag @@ -0,0 +1,15 @@ +$NetBSD: patch-ag,v 1.3.2.2 2002/06/23 18:46:20 jlam Exp $ + +--- fxtv_cnvt.sh.orig Mon May 13 13:59:26 2002 ++++ fxtv_cnvt.sh Mon May 13 13:59:54 2002 +@@ -181,8 +181,8 @@ + + # Do we need an intermediate file? + if [ $mpeg_enc = YES ]; then +- out_soxfn="$out_fnbase.aiff" +- out_soxfmt="AIFF" ++ out_soxfn="$out_fnbase.raw" ++ out_soxfmt="RAW" + else + out_soxfn="$GAout_fn" + out_soxfmt="$out_fmt" diff --git a/graphics/gdk-pixbuf-gnome/Makefile b/graphics/gdk-pixbuf-gnome/Makefile index 05e23b04586..341ea30baab 100644 --- a/graphics/gdk-pixbuf-gnome/Makefile +++ b/graphics/gdk-pixbuf-gnome/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.14 2002/04/10 01:32:22 jlam Exp $ +# $NetBSD: Makefile,v 1.14.2.1 2002/06/23 18:46:23 jlam Exp $ PKGNAME= ${DISTNAME:S/gdk-pixbuf-/gdk-pixbuf-gnome-/} -PKGREVISION= 1 COMMENT= the GNOME image loading library GNOME canvas support add-on CONFLICTS+= gdk-pixbuf<0.10.1 @@ -13,7 +12,7 @@ BUILDLINK_DEPENDS.gdk-pixbuf= gdk-pixbuf>=0.11.0nb1 do-install: ${INSTALL_DATA} ${WRKSRC}/gdk-pixbuf/gnome-canvas-pixbuf.h \ - ${PREFIX}/include/gdk-pixbuf + ${PREFIX}/include/gdk-pixbuf-1.0/gdk-pixbuf ${INSTALL_DATA} ${WRKSRC}/gnomecanvaspixbufConf.sh \ ${PREFIX}/lib cd ${WRKSRC}/gdk-pixbuf && \ diff --git a/graphics/gdk-pixbuf-gnome/PLIST b/graphics/gdk-pixbuf-gnome/PLIST index 63f1b2bbc45..cfc6e0d248b 100644 --- a/graphics/gdk-pixbuf-gnome/PLIST +++ b/graphics/gdk-pixbuf-gnome/PLIST @@ -1,5 +1,5 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:50:51 zuntum Exp $ -include/gdk-pixbuf/gnome-canvas-pixbuf.h +@comment $NetBSD: PLIST,v 1.1.2.1 2002/06/23 18:46:23 jlam Exp $ +include/gdk-pixbuf-1.0/gdk-pixbuf/gnome-canvas-pixbuf.h lib/gnomecanvaspixbufConf.sh lib/libgnomecanvaspixbuf.so.1.0 lib/libgnomecanvaspixbuf.so.1 @@ -9,8 +9,14 @@ lib/libgnomecanvaspixbuf.a share/gnome/html/gdk-pixbuf/a2605.html share/gnome/html/gdk-pixbuf/a3640.html share/gnome/html/gdk-pixbuf/a3652.html +share/gnome/html/gdk-pixbuf/a3657.html share/gnome/html/gdk-pixbuf/a3694.html +share/gnome/html/gdk-pixbuf/a3696.html share/gnome/html/gdk-pixbuf/a3716.html +share/gnome/html/gdk-pixbuf/x3676.html +share/gnome/html/gdk-pixbuf/x3715.html +share/gnome/html/gdk-pixbuf/x3728.html +share/gnome/html/gdk-pixbuf/x3767.html share/gnome/html/gdk-pixbuf/book1.html share/gnome/html/gdk-pixbuf/compiling.html share/gnome/html/gdk-pixbuf/extra-configuration-options.html @@ -30,7 +36,6 @@ share/gnome/html/gdk-pixbuf/gdk-pixbuf-util.html share/gnome/html/gdk-pixbuf/gdkpixbufloader.html share/gnome/html/gdk-pixbuf/gnomecanvaspixbuf.html share/gnome/html/gdk-pixbuf/index.html -share/gnome/html/gdk-pixbuf/index.sgml share/gnome/html/gdk-pixbuf/license.html share/gnome/html/gdk-pixbuf/r15.html share/gnome/html/gdk-pixbuf/r27.html diff --git a/graphics/gdk-pixbuf-gnome/buildlink.mk b/graphics/gdk-pixbuf-gnome/buildlink.mk index 00e77a0ec90..39121c8f4d6 100644 --- a/graphics/gdk-pixbuf-gnome/buildlink.mk +++ b/graphics/gdk-pixbuf-gnome/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.3 2002/03/13 17:37:07 fredb Exp $ +# $NetBSD: buildlink.mk,v 1.3.2.1 2002/06/23 18:46:23 jlam Exp $ # # This Makefile fragment is included by packages that use gdk-pixbuf-gnome. # @@ -22,7 +22,7 @@ DEPENDS+= ${BUILDLINK_DEPENDS.gdk-pixbuf-gnome}:../../graphics/gdk-pixbuf-gnome EVAL_PREFIX+= BUILDLINK_PREFIX.gdk-pixbuf-gnome=gdk-pixbuf-gnome BUILDLINK_PREFIX.gdk-pixbuf-gnome_DEFAULT= ${X11PREFIX} -BUILDLINK_FILES.gdk-pixbuf-gnome= include/gdk-pixbuf/gnome-canvas-pixbuf.h +BUILDLINK_FILES.gdk-pixbuf-gnome= include/gdk-pixbuf-1.0/gdk-pixbuf/gnome-canvas-pixbuf.h BUILDLINK_FILES.gdk-pixbuf-gnome+= lib/libgnomecanvaspixbuf.* .include "../../graphics/gdk-pixbuf/buildlink.mk" diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile index 1f8574ff437..1a431cd79b9 100644 --- a/graphics/gdk-pixbuf/Makefile +++ b/graphics/gdk-pixbuf/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.20.2.2 2002/06/21 23:05:21 jlam Exp $ +# $NetBSD: Makefile,v 1.20.2.3 2002/06/23 18:46:21 jlam Exp $ # PKGNAME= ${DISTNAME} -PKGREVISION= 1 COMMENT= the GNOME image loading library USE_BUILDLINK2= # defined diff --git a/graphics/gdk-pixbuf/Makefile.common b/graphics/gdk-pixbuf/Makefile.common index ce049ad0372..2f37edc2874 100644 --- a/graphics/gdk-pixbuf/Makefile.common +++ b/graphics/gdk-pixbuf/Makefile.common @@ -1,21 +1,22 @@ -# $NetBSD: Makefile.common,v 1.21.2.1 2002/05/11 02:09:10 jlam Exp $ +# $NetBSD: Makefile.common,v 1.21.2.2 2002/06/23 18:46:21 jlam Exp $ # -DISTNAME= gdk-pixbuf-0.11.0 +DISTNAME= gdk-pixbuf-0.17.0 CATEGORIES= graphics devel MASTER_SITES= ${MASTER_SITE_GNOME:=unstable/sources/gdk-pixbuf/} MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.gnome.org/ +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf BUILD_DEPENDS+= automake>=1.4:../../devel/automake -USE_GMAKE= # defined -USE_X11BASE= # defined -USE_LIBTOOL= # defined +USE_GMAKE= YES +USE_X11BASE= YES +USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig -GNU_CONFIGURE= # defined +GNU_CONFIGURE= YES CONFIGURE_ENV+= path_rgb_txt="${X11BASE}/lib/X11/rgb.txt" M4= ${LOCALBASE}/bin/gm4 diff --git a/graphics/gdk-pixbuf/PLIST b/graphics/gdk-pixbuf/PLIST index 5f2f4da3c8e..0d47fde57a0 100644 --- a/graphics/gdk-pixbuf/PLIST +++ b/graphics/gdk-pixbuf/PLIST @@ -1,10 +1,10 @@ -@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:42 skrll Exp $ +@comment $NetBSD: PLIST,v 1.2.2.1 2002/06/23 18:46:21 jlam Exp $ bin/gdk-pixbuf-config -include/gdk-pixbuf/gdk-pixbuf.h -include/gdk-pixbuf/gdk-pixbuf-loader.h -include/gdk-pixbuf/gdk-pixbuf-features.h -include/gdk-pixbuf/gdk-pixbuf-xlib.h -include/gdk-pixbuf/gdk-pixbuf-xlibrgb.h +include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf-features.h +include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf-loader.h +include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf-xlib.h +include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf-xlibrgb.h +include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf.h lib/libgdk_pixbuf.so.2.0 lib/libgdk_pixbuf.so.2 lib/libgdk_pixbuf.so @@ -50,6 +50,7 @@ lib/gdk_pixbuf_xlibConf.sh share/aclocal/gdk-pixbuf.m4 @dirrm lib/gdk-pixbuf/loaders @dirrm lib/gdk-pixbuf -@dirrm include/gdk-pixbuf +@dirrm include/gdk-pixbuf-1.0/gdk-pixbuf +@dirrm include/gdk-pixbuf-1.0 @exec test %D = ${LOCALBASE} || ln -s %D/share/aclocal/gdk-pixbuf.m4 ${LOCALBASE}/share/aclocal/gdk-pixbuf.m4 @unexec test %D = ${LOCALBASE} || ${RM} -f ${LOCALBASE}/share/aclocal/gdk-pixbuf.m4 diff --git a/graphics/gdk-pixbuf/buildlink.mk b/graphics/gdk-pixbuf/buildlink.mk index 9b254b27746..bf532687b1e 100644 --- a/graphics/gdk-pixbuf/buildlink.mk +++ b/graphics/gdk-pixbuf/buildlink.mk @@ -1,10 +1,12 @@ -# $NetBSD: buildlink.mk,v 1.12 2002/03/13 17:37:07 fredb Exp $ +# $NetBSD: buildlink.mk,v 1.12.2.1 2002/06/23 18:46:21 jlam Exp $ # # This Makefile fragment is included by packages that use gdk-pixbuf. # +# This file was created automatically using createbuildlink 1.5. +# # To use this Makefile fragment, simply: # -# (1) Optionally define BUILDLINK_DEPENDS.gkd-pixbuf to the dependency version +# (1) Optionally define BUILDLINK_DEPENDS.gdk-pixbuf to the dependency pattern # for the version of gdk-pixbuf desired. # (2) Include this Makefile fragment in the package Makefile, # (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header @@ -17,39 +19,77 @@ GDK_PIXBUF_BUILDLINK_MK= # defined .include "../../mk/bsd.buildlink.mk" -BUILDLINK_DEPENDS.gdk-pixbuf?= gdk-pixbuf>=0.11.0nb1 +BUILDLINK_DEPENDS.gdk-pixbuf?= gdk-pixbuf>=0.17.0 DEPENDS+= ${BUILDLINK_DEPENDS.gdk-pixbuf}:../../graphics/gdk-pixbuf -EVAL_PREFIX+= BUILDLINK_PREFIX.gdk-pixbuf=gdk-pixbuf +EVAL_PREFIX+= BUILDLINK_PREFIX.gdk-pixbuf=gdk-pixbuf BUILDLINK_PREFIX.gdk-pixbuf_DEFAULT= ${X11PREFIX} -BUILDLINK_FILES.gdk-pixbuf= include/gdk-pixbuf/* +BUILDLINK_FILES.gdk-pixbuf+= include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf-features.h +BUILDLINK_FILES.gdk-pixbuf+= include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf-loader.h +BUILDLINK_FILES.gdk-pixbuf+= include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf-xlib.h +BUILDLINK_FILES.gdk-pixbuf+= include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf-xlibrgb.h +BUILDLINK_FILES.gdk-pixbuf+= include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf.h +BUILDLINK_FILES.gdk-pixbuf+= lib/gdk-pixbuf/loaders/libpixbufloader-bmp.* +BUILDLINK_FILES.gdk-pixbuf+= lib/gdk-pixbuf/loaders/libpixbufloader-gif.* +BUILDLINK_FILES.gdk-pixbuf+= lib/gdk-pixbuf/loaders/libpixbufloader-ico.* +BUILDLINK_FILES.gdk-pixbuf+= lib/gdk-pixbuf/loaders/libpixbufloader-jpeg.* +BUILDLINK_FILES.gdk-pixbuf+= lib/gdk-pixbuf/loaders/libpixbufloader-png.* +BUILDLINK_FILES.gdk-pixbuf+= lib/gdk-pixbuf/loaders/libpixbufloader-pnm.* +BUILDLINK_FILES.gdk-pixbuf+= lib/gdk-pixbuf/loaders/libpixbufloader-ras.* +BUILDLINK_FILES.gdk-pixbuf+= lib/gdk-pixbuf/loaders/libpixbufloader-tiff.* +BUILDLINK_FILES.gdk-pixbuf+= lib/gdk-pixbuf/loaders/libpixbufloader-xbm.* +BUILDLINK_FILES.gdk-pixbuf+= lib/gdk-pixbuf/loaders/libpixbufloader-xpm.* +BUILDLINK_FILES.gdk-pixbuf+= lib/gdk_pixbufConf.sh +BUILDLINK_FILES.gdk-pixbuf+= lib/gdk_pixbuf_xlibConf.sh BUILDLINK_FILES.gdk-pixbuf+= lib/libgdk_pixbuf.* BUILDLINK_FILES.gdk-pixbuf+= lib/libgdk_pixbuf_xlib.* +# The gdk-pixbuf headers should be found at the usual location. +BUILDLINK_TRANSFORM.gdk-pixbuf= -e "s|/include/gdk-pixbuf-1.0/|/include/|g" +BUILDLINK_CONFIG_WRAPPER_SED+= \ + -e "s|-I${BUILDLINK_PREFIX.gdk-pixbuf}/include/gdk-pixbuf-1.0 |-I${BUILDLINK_DIR}/include/gdk-pixbuf-1.0 -I${BUILDLINK_DIR}/include/ |g" + .include "../../graphics/jpeg/buildlink.mk" .include "../../graphics/png/buildlink.mk" .include "../../graphics/tiff/buildlink.mk" .include "../../x11/gtk/buildlink.mk" BUILDLINK_TARGETS.gdk-pixbuf= gdk-pixbuf-buildlink -BUILDLINK_TARGETS.gdk-pixbuf+= gdk-pixbuf-buildlink-config-wrapper +BUILDLINK_TARGETS.gdk-pixbuf+= gdk-pixbuf-gdk-pixbuf-buildlink-config-wrapper BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.gdk-pixbuf} -BUILDLINK_CONFIG.gdk-pixbuf= \ - ${BUILDLINK_PREFIX.gdk-pixbuf}/bin/gdk-pixbuf-config -BUILDLINK_CONFIG_WRAPPER.gdk-pixbuf= \ - ${BUILDLINK_DIR}/bin/gdk-pixbuf-config -REPLACE_BUILDLINK_SED+= \ - -e "s|${BUILDLINK_CONFIG_WRAPPER.gdk-pixbuf}|${BUILDLINK_CONFIG.gdk-pixbuf}|g" +BUILDLINK_CONFIG.gdk-pixbuf-gdk-pixbuf= \ + ${BUILDLINK_PREFIX.gdk-pixbuf}/bin/gdk-pixbuf-config +BUILDLINK_CONFIG_WRAPPER.gdk-pixbuf-gdk-pixbuf= \ + ${BUILDLINK_DIR}/bin/gdk-pixbuf-config +REPLACE_BUILDLINK_SED+= \ + -e "s|${BUILDLINK_CONFIG_WRAPPER.gdk-pixbuf-gdk-pixbuf}|${BUILDLINK_CONFIG.gdk-pixbuf-gdk-pixbuf}|g" + +BUILDLINK_CONFIG_WRAPPER_SED+= \ + -e "s|-I[ ]*${BUILDLINK_PREFIX.gdk-pixbuf}/include/gdk-pixbuf-1.0/gdk-pixbuf|-I${BUILDLINK_DIR}/include/gdk-pixbuf-1.0/gdk-pixbuf|g" +REPLACE_BUILDLINK_SED+= \ + -e "s|-I${BUILDLINK_DIR}/include/gdk-pixbuf-1.0/gdk-pixbuf|-I${BUILDLINK_PREFIX.gdk-pixbuf}/include/gdk-pixbuf-1.0/gdk-pixbuf|g" +BUILDLINK_CONFIG_WRAPPER_SED+= \ + -e "s|-I[ ]*${BUILDLINK_PREFIX.gdk-pixbuf}/include/gdk-pixbuf-1.0|-I${BUILDLINK_DIR}/include/gdk-pixbuf-1.0|g" +REPLACE_BUILDLINK_SED+= \ + -e "s|-I${BUILDLINK_DIR}/include/gdk-pixbuf-1.0|-I${BUILDLINK_PREFIX.gdk-pixbuf}/include/gdk-pixbuf-1.0|g" +BUILDLINK_CONFIG_WRAPPER_SED+= \ + -e "s|-L[ ]*${BUILDLINK_PREFIX.gdk-pixbuf}/lib/gdk-pixbuf/loaders|-L${BUILDLINK_DIR}/lib/gdk-pixbuf/loaders|g" +REPLACE_BUILDLINK_SED+= \ + -e "s|-L${BUILDLINK_DIR}/lib/gdk-pixbuf/loaders|-L${BUILDLINK_PREFIX.gdk-pixbuf}/lib/gdk-pixbuf/loaders|g" +BUILDLINK_CONFIG_WRAPPER_SED+= \ + -e "s|-L[ ]*${BUILDLINK_PREFIX.gdk-pixbuf}/lib/gdk-pixbuf|-L${BUILDLINK_DIR}/lib/gdk-pixbuf|g" +REPLACE_BUILDLINK_SED+= \ + -e "s|-L${BUILDLINK_DIR}/lib/gdk-pixbuf|-L${BUILDLINK_PREFIX.gdk-pixbuf}/lib/gdk-pixbuf|g" .if defined(USE_CONFIG_WRAPPER) -GDK_PIXBUF_CONFIG?= ${BUILDLINK_CONFIG_WRAPPER.gdk-pixbuf} -CONFIGURE_ENV+= GDK_PIXBUF_CONFIG="${GDK_PIXBUF_CONFIG}" -MAKE_ENV+= GDK_PIXBUF_CONFIG="${GDK_PIXBUF_CONFIG}" +GDK_PIXBUF_GDK_PIXBUF_CONFIG?= ${BUILDLINK_CONFIG_WRAPPER.gdk-pixbuf-gdk-pixbuf} +CONFIGURE_ENV+= GDK_PIXBUF_GDK_PIXBUF_CONFIG="${GDK_PIXBUF_GDK_PIXBUF_CONFIG}" +MAKE_ENV+= GDK_PIXBUF_GDK_PIXBUF_CONFIG="${GDK_PIXBUF_GDK_PIXBUF_CONFIG}" .endif -pre-configure: ${BUILDLINK_TARGETS.gdk-pixbuf} +pre-configure: ${BUILDLINK_TARGETS} gdk-pixbuf-buildlink: _BUILDLINK_USE -gdk-pixbuf-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE +gdk-pixbuf-gdk-pixbuf-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE .endif # GDK_PIXBUF_BUILDLINK_MK diff --git a/graphics/gdk-pixbuf/distinfo b/graphics/gdk-pixbuf/distinfo index 12dc1a60602..f63db6bb24e 100644 --- a/graphics/gdk-pixbuf/distinfo +++ b/graphics/gdk-pixbuf/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.5.2.1 2002/05/11 02:09:11 jlam Exp $ +$NetBSD: distinfo,v 1.5.2.2 2002/06/23 18:46:22 jlam Exp $ -SHA1 (gdk-pixbuf-0.11.0.tar.gz) = cddc0cccc246c910312b53e9e7f8dc1f63a2ef1f -Size (gdk-pixbuf-0.11.0.tar.gz) = 459728 bytes -SHA1 (patch-ac) = efeb07a327c866bee7ddddbd94a7fae214e4c4d8 -SHA1 (patch-ad) = 8841c915841c2ec71082a8894b12038b97bb2088 -SHA1 (patch-ae) = 325a6c74977aa92fb9ad0ad5d9247cd665023f26 +SHA1 (gdk-pixbuf-0.17.0.tar.gz) = afff9706b5ff81bb1eaf631507ed331e0a5b7313 +Size (gdk-pixbuf-0.17.0.tar.gz) = 547194 bytes +SHA1 (patch-ac) = 16fc33898fc1cb10b3e11ee26e7ea046d1f68032 +SHA1 (patch-ad) = 4a16e30eda46b55f51f87785e5f76ea33d3bd8ed +SHA1 (patch-ae) = 2edd8fdd72d5dfaecc92974c6930e5d175e3b69f diff --git a/graphics/gdk-pixbuf/patches/patch-ac b/graphics/gdk-pixbuf/patches/patch-ac index 132e873088c..4e8f4c7dc57 100644 --- a/graphics/gdk-pixbuf/patches/patch-ac +++ b/graphics/gdk-pixbuf/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.3 2000/10/18 00:00:00 jlam Exp $ +$NetBSD: patch-ac,v 1.3.2.1 2002/06/23 18:46:22 jlam Exp $ ---- gdk-pixbuf-config.in.orig Mon Apr 10 21:56:56 2000 +--- gdk-pixbuf-config.in.orig Thu Oct 25 04:00:14 2001 +++ gdk-pixbuf-config.in -@@ -46,7 +46,7 @@ +@@ -44,7 +44,7 @@ ;; --libs) libdirs=-L@libdir@ diff --git a/graphics/gdk-pixbuf/patches/patch-ad b/graphics/gdk-pixbuf/patches/patch-ad index dc2ef46a105..69784751e64 100644 --- a/graphics/gdk-pixbuf/patches/patch-ad +++ b/graphics/gdk-pixbuf/patches/patch-ad @@ -1,14 +1,14 @@ -$NetBSD: patch-ad,v 1.2 2001/03/18 04:33:54 mjl Exp $ +$NetBSD: patch-ad,v 1.2.2.1 2002/06/23 18:46:22 jlam Exp $ ---- gdk-pixbuf/Makefile.am.orig Thu Mar 1 00:05:34 2001 -+++ gdk-pixbuf/Makefile.am Sun Mar 18 04:57:50 2001 +--- gdk-pixbuf/Makefile.am.orig Fri Jan 4 12:54:48 2002 ++++ gdk-pixbuf/Makefile.am @@ -24,70 +24,70 @@ # The PNG plugin. # libpixbufloader_png_la_SOURCES = io-png.c -libpixbufloader_png_la_LDFLAGS = -version-info 1:0:0 -module +libpixbufloader_png_la_LDFLAGS = -module -avoid-version - libpixbufloader_png_la_LIBADD = $(LIBPNG) + libpixbufloader_png_la_LIBADD = $(LIBPNG) libgdk_pixbuf.la $(GTK_LIBS) # # The JPEG loader @@ -16,7 +16,7 @@ $NetBSD: patch-ad,v 1.2 2001/03/18 04:33:54 mjl Exp $ libpixbufloader_jpeg_la_SOURCES = io-jpeg.c -libpixbufloader_jpeg_la_LDFLAGS = -version-info 1:0:0 -module +libpixbufloader_jpeg_la_LDFLAGS = -module -avoid-version - libpixbufloader_jpeg_la_LIBADD = $(LIBJPEG) + libpixbufloader_jpeg_la_LIBADD = $(LIBJPEG) libgdk_pixbuf.la $(GTK_LIBS) # # The XPM loader @@ -24,7 +24,7 @@ $NetBSD: patch-ad,v 1.2 2001/03/18 04:33:54 mjl Exp $ libpixbufloader_xpm_la_SOURCES = io-xpm.c -libpixbufloader_xpm_la_LDFLAGS = -version-info 1:0:0 -module +libpixbufloader_xpm_la_LDFLAGS = -module -avoid-version - libpixbufloader_xpm_la_LIBADD = + libpixbufloader_xpm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) # # The GIF loader @@ -32,7 +32,7 @@ $NetBSD: patch-ad,v 1.2 2001/03/18 04:33:54 mjl Exp $ libpixbufloader_gif_la_SOURCES = io-gif.c -libpixbufloader_gif_la_LDFLAGS = -version-info 1:0:0 -module +libpixbufloader_gif_la_LDFLAGS = -module -avoid-version - libpixbufloader_gif_la_LIBADD = + libpixbufloader_gif_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) # # The ICO loader @@ -40,7 +40,7 @@ $NetBSD: patch-ad,v 1.2 2001/03/18 04:33:54 mjl Exp $ libpixbufloader_ico_la_SOURCES = io-ico.c -libpixbufloader_ico_la_LDFLAGS = -version-info 1:0:0 -module +libpixbufloader_ico_la_LDFLAGS = -module -avoid-version - libpixbufloader_ico_la_LIBADD = + libpixbufloader_ico_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) # # The RAS loader @@ -48,7 +48,7 @@ $NetBSD: patch-ad,v 1.2 2001/03/18 04:33:54 mjl Exp $ libpixbufloader_ras_la_SOURCES = io-ras.c -libpixbufloader_ras_la_LDFLAGS = -version-info 1:0:0 -module +libpixbufloader_ras_la_LDFLAGS = -module -avoid-version - libpixbufloader_ras_la_LIBADD = + libpixbufloader_ras_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) # # The TIFF loader @@ -56,7 +56,7 @@ $NetBSD: patch-ad,v 1.2 2001/03/18 04:33:54 mjl Exp $ libpixbufloader_tiff_la_SOURCES = io-tiff.c -libpixbufloader_tiff_la_LDFLAGS = -version-info 1:0:0 -module +libpixbufloader_tiff_la_LDFLAGS = -module -avoid-version - libpixbufloader_tiff_la_LIBADD = $(LIBTIFF) + libpixbufloader_tiff_la_LIBADD = $(LIBTIFF) libgdk_pixbuf.la $(GTK_LIBS) # # The PNM loader @@ -64,7 +64,7 @@ $NetBSD: patch-ad,v 1.2 2001/03/18 04:33:54 mjl Exp $ libpixbufloader_pnm_la_SOURCES = io-pnm.c -libpixbufloader_pnm_la_LDFLAGS = -version-info 1:0:0 -module +libpixbufloader_pnm_la_LDFLAGS = -module -avoid-version - libpixbufloader_pnm_la_LIBADD = + libpixbufloader_pnm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) # # The BMP loader @@ -72,7 +72,7 @@ $NetBSD: patch-ad,v 1.2 2001/03/18 04:33:54 mjl Exp $ libpixbufloader_bmp_la_SOURCES = io-bmp.c -libpixbufloader_bmp_la_LDFLAGS = -version-info 1:0:0 -module +libpixbufloader_bmp_la_LDFLAGS = -module -avoid-version - libpixbufloader_bmp_la_LIBADD = + libpixbufloader_bmp_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) # # The XBM loader @@ -80,6 +80,6 @@ $NetBSD: patch-ad,v 1.2 2001/03/18 04:33:54 mjl Exp $ libpixbufloader_xbm_la_SOURCES = io-xbm.c -libpixbufloader_xbm_la_LDFLAGS = -version-info 1:0:0 -module +libpixbufloader_xbm_la_LDFLAGS = -module -avoid-version - libpixbufloader_xbm_la_LIBADD = + libpixbufloader_xbm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) if HAVE_PNG diff --git a/graphics/gdk-pixbuf/patches/patch-ae b/graphics/gdk-pixbuf/patches/patch-ae index 8628e957b15..08c779347e0 100644 --- a/graphics/gdk-pixbuf/patches/patch-ae +++ b/graphics/gdk-pixbuf/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.2.2.1 2002/05/11 02:09:11 jlam Exp $ +$NetBSD: patch-ae,v 1.2.2.2 2002/06/23 18:46:22 jlam Exp $ ---- configure.in.orig Thu Apr 26 15:46:16 2001 -+++ configure.in Wed Feb 27 01:35:59 2002 -@@ -142,6 +142,7 @@ +--- configure.in.orig Thu Apr 18 18:48:40 2002 ++++ configure.in +@@ -128,6 +128,7 @@ dnl Check for location of rgb.txt file (works without, but better with) AC_MSG_CHECKING([for location of rgb.txt database]) @@ -10,7 +10,7 @@ $NetBSD: patch-ae,v 1.2.2.1 2002/05/11 02:09:11 jlam Exp $ dnl default to this.. path_rgb_txt=/usr/lib/X11/rgb.txt -@@ -154,6 +155,7 @@ +@@ -140,6 +141,7 @@ break fi done diff --git a/graphics/gmplayer/Makefile b/graphics/gmplayer/Makefile index 10dad6ef11d..28d47140152 100644 --- a/graphics/gmplayer/Makefile +++ b/graphics/gmplayer/Makefile @@ -1,16 +1,12 @@ -# $NetBSD: Makefile,v 1.5 2002/05/03 18:00:50 fredb Exp $ +# $NetBSD: Makefile,v 1.5.2.1 2002/06/23 18:46:24 jlam Exp $ -.include "../../graphics/mplayer/Makefile.common" +.include "../../graphics/mplayer-share/Makefile.common" PKGNAME= gmplayer-${MPLAYER_PKG_VERSION} -MASTER_SITES+= http://www.mplayerhq.hu/MPlayer/Skin/ \ - http://www2.mplayerhq.hu/MPlayer/releases/ \ +SKIN_SITES= http://www.mplayerhq.hu/MPlayer/Skin/ \ http://www2.mplayerhq.hu/MPlayer/Skin/ \ - ftp://ftp.mplayerhq.hu/MPlayer/releases/ \ ftp://ftp.mplayerhq.hu/MPlayer/Skin/ \ - ftp://ftp2.mplayerhq.hu/MPlayer/releases/ \ ftp://ftp2.mplayerhq.hu/MPlayer/Skin/ -DIST_SUBDIR= gmplayer COMMENT= Software only MPEG-1/2/4 video decoder with a GTK+ interface @@ -31,34 +27,34 @@ SKINS += default${EXTRACT_SUFX} \ netscape4${EXTRACT_SUFX} \ CubicPlayer${EXTRACT_SUFX} \ AlienMind${EXTRACT_SUFX} \ - CornerMP${EXTRACT_SUFX} + CornerMP${EXTRACT_SUFX} \ + CornerMP-aqua${EXTRACT_SUFX} \ + hwswskin${EXTRACT_SUFX} + +.if !defined(SITES_default.tar.bz2) +.for skin in ${SKINS} +SITES_${skin}= ${SKIN_SITES} +.endfor +.endif DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} DISTFILES+= ${SKINS} CONFIGURE_ARGS+= --enable-gui -CONFIGURE_ARGS+= --datadir=${PREFIX}/share/gmplayer +CONFIGURE_ARGS+= --disable-mencoder do-install: ${INSTALL_PROGRAM} ${WRKSRC}/mplayer ${PREFIX}/bin/gmplayer - ${INSTALL_MAN} ${WRKSRC}/DOCS/mplayer.1 ${PREFIX}/man/man1/gmplayer.1 - ${INSTALL_DATA_DIR} ${PREFIX}/share/gmplayer - ${INSTALL_DATA} ${WRKSRC}/etc/codecs.conf ${PREFIX}/share/gmplayer - ${CP} -R ${WRKSRC}/DOCS ${PREFIX}/share/gmplayer - ${INSTALL_DATA_DIR} ${PREFIX}/share/gmplayer/Skin + ${LN} -s ${PREFIX}/man/man1/mplayer.1 ${PREFIX}/man/man1/gmplayer.1 + ${INSTALL_DATA_DIR} ${PREFIX}/share/mplayer/Skin .for SKIN in ${SKINS} @${ECHO_MSG} "Installing skin ${SKIN}..." - @${GTAR} xCzf ${PREFIX}/share/gmplayer/Skin/ ${DISTDIR}/${DIST_SUBDIR}/${SKIN} + @${GTAR} xCzf ${PREFIX}/share/mplayer/Skin/ ${DISTDIR}/${DIST_SUBDIR}/${SKIN} .endfor - @${CHMOD} -R a+r ${PREFIX}/share/gmplayer/Skin - @${CHMOD} a+rx ${PREFIX}/share/gmplayer/Skin/* + @${CHMOD} -R a+r ${PREFIX}/share/mplayer/Skin + @${CHMOD} a+rx ${PREFIX}/share/mplayer/Skin/* -.include "../../audio/lame/buildlink.mk" -.include "../../devel/SDL/buildlink.mk" -.include "../../graphics/jpeg/buildlink.mk" -.include "../../graphics/png/buildlink.mk" -.include "../../misc/libdvdread/buildlink.mk" +.include "../../audio/nas/buildlink.mk" .include "../../x11/gtk/buildlink.mk" -.include "../../mk/ossaudio.buildlink.mk" -.include "../../mk/pthread.buildlink.mk" +.include "../../graphics/mplayer-share/Makefile.depends" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/gmplayer/PLIST b/graphics/gmplayer/PLIST index 0b156bb4817..9d950e87076 100644 --- a/graphics/gmplayer/PLIST +++ b/graphics/gmplayer/PLIST @@ -1,585 +1,529 @@ -@comment $NetBSD: PLIST,v 1.3 2002/05/06 11:13:44 wiz Exp $ +@comment $NetBSD: PLIST,v 1.3.2.1 2002/06/23 18:46:24 jlam Exp $ bin/gmplayer man/man1/gmplayer.1 -share/gmplayer/DOCS/DVB -share/gmplayer/DOCS/DXR3 -share/gmplayer/DOCS/French/bugreports.html -share/gmplayer/DOCS/French/cd-dvd.html -share/gmplayer/DOCS/French/codecs.html -share/gmplayer/DOCS/French/documentation.html -share/gmplayer/DOCS/French/exemple.conf -share/gmplayer/DOCS/French/faq.html -share/gmplayer/DOCS/French/skin-fr.html -share/gmplayer/DOCS/French/sound.html -share/gmplayer/DOCS/French/video.html -share/gmplayer/DOCS/German/bugreports.html -share/gmplayer/DOCS/German/cd-dvd.html -share/gmplayer/DOCS/German/codecs.html -share/gmplayer/DOCS/German/documentation.html -share/gmplayer/DOCS/German/encoding.html -share/gmplayer/DOCS/German/faq.html -share/gmplayer/DOCS/German/formats.html -share/gmplayer/DOCS/German/gcc-2.96-3.0.html -share/gmplayer/DOCS/German/mencoder.1 -share/gmplayer/DOCS/German/mplayer.1 -share/gmplayer/DOCS/German/sound.html -share/gmplayer/DOCS/German/video.html -share/gmplayer/DOCS/Hungarian/bugreports.html -share/gmplayer/DOCS/Hungarian/cd-dvd.html -share/gmplayer/DOCS/Hungarian/codecs.html -share/gmplayer/DOCS/Hungarian/documentation.html -share/gmplayer/DOCS/Hungarian/encoding.html -share/gmplayer/DOCS/Hungarian/example.conf -share/gmplayer/DOCS/Hungarian/faq.html -share/gmplayer/DOCS/Hungarian/formats.html -share/gmplayer/DOCS/Hungarian/mplayer.1 -share/gmplayer/DOCS/Hungarian/skin-hu.html -share/gmplayer/DOCS/Hungarian/sound.html -share/gmplayer/DOCS/Hungarian/video.html -share/gmplayer/DOCS/Italian/bugreports.html -share/gmplayer/DOCS/Italian/cd-dvd.html -share/gmplayer/DOCS/Italian/codecs.html -share/gmplayer/DOCS/Italian/documentation.html -share/gmplayer/DOCS/Italian/encoding.html -share/gmplayer/DOCS/Italian/faq.html -share/gmplayer/DOCS/Italian/formats.html -share/gmplayer/DOCS/Italian/gcc-2.96-3.0.html -share/gmplayer/DOCS/Italian/skin-it.html -share/gmplayer/DOCS/Italian/sound.html -share/gmplayer/DOCS/Italian/users_against_developers.html -share/gmplayer/DOCS/Italian/video.html -share/gmplayer/DOCS/Polish/DVB -share/gmplayer/DOCS/Polish/DXR3 -share/gmplayer/DOCS/Polish/bugreports.html -share/gmplayer/DOCS/Polish/cd-dvd.html -share/gmplayer/DOCS/Polish/codecs-in.html -share/gmplayer/DOCS/Polish/codecs.html -share/gmplayer/DOCS/Polish/documentation.html -share/gmplayer/DOCS/Polish/encoding.html -share/gmplayer/DOCS/Polish/faq.html -share/gmplayer/DOCS/Polish/formats.html -share/gmplayer/DOCS/Polish/gcc-2.96-3.0.html -share/gmplayer/DOCS/Polish/mencoder.1 -share/gmplayer/DOCS/Polish/mplayer.1 -share/gmplayer/DOCS/Polish/skin-en.html -share/gmplayer/DOCS/Polish/sound.html -share/gmplayer/DOCS/Polish/users_against_developers.html -share/gmplayer/DOCS/Polish/video.html -share/gmplayer/DOCS/bugreports.html -share/gmplayer/DOCS/cd-dvd.html -share/gmplayer/DOCS/codecs-in.html -share/gmplayer/DOCS/codecs.html -share/gmplayer/DOCS/documentation.html -share/gmplayer/DOCS/encoding.html -share/gmplayer/DOCS/faq.html -share/gmplayer/DOCS/formats.html -share/gmplayer/DOCS/gcc-2.96-3.0.html -share/gmplayer/DOCS/mencoder.1 -share/gmplayer/DOCS/mplayer.1 -share/gmplayer/DOCS/skin-en.html -share/gmplayer/DOCS/sound.html -share/gmplayer/DOCS/tech/TODO -share/gmplayer/DOCS/tech/codec-devel.txt -share/gmplayer/DOCS/tech/codecs.conf.txt -share/gmplayer/DOCS/tech/colorspaces.txt -share/gmplayer/DOCS/tech/cvs-howto.txt -share/gmplayer/DOCS/tech/dr-methods.txt -share/gmplayer/DOCS/tech/formats-hun.txt -share/gmplayer/DOCS/tech/formats.txt -share/gmplayer/DOCS/tech/hwac3.txt -share/gmplayer/DOCS/tech/libvo.txt -share/gmplayer/DOCS/tech/libvo2.txt -share/gmplayer/DOCS/tech/mpsub.sub -share/gmplayer/DOCS/tech/osd.txt -share/gmplayer/DOCS/tech/patches.txt -share/gmplayer/DOCS/tech/playtree -share/gmplayer/DOCS/tech/playtree-hun -share/gmplayer/DOCS/tech/tech-eng.txt -share/gmplayer/DOCS/tech/vidix.txt -share/gmplayer/DOCS/tech/vop.txt -share/gmplayer/DOCS/users_against_developers.html -share/gmplayer/DOCS/video.html -share/gmplayer/Skin/AlienMind/README -share/gmplayer/Skin/AlienMind/VERSION -share/gmplayer/Skin/AlienMind/balance.png -share/gmplayer/Skin/AlienMind/eqb.png -share/gmplayer/Skin/AlienMind/exit.png -share/gmplayer/Skin/AlienMind/font.fnt -share/gmplayer/Skin/AlienMind/font.png -share/gmplayer/Skin/AlienMind/iconify.png -share/gmplayer/Skin/AlienMind/load.png -share/gmplayer/Skin/AlienMind/loop.png -share/gmplayer/Skin/AlienMind/main.png -share/gmplayer/Skin/AlienMind/menu.png -share/gmplayer/Skin/AlienMind/menubutt.png -share/gmplayer/Skin/AlienMind/menus.png -share/gmplayer/Skin/AlienMind/next.png -share/gmplayer/Skin/AlienMind/numbers.fnt -share/gmplayer/Skin/AlienMind/numbers.png -share/gmplayer/Skin/AlienMind/pause.png -share/gmplayer/Skin/AlienMind/play.png -share/gmplayer/Skin/AlienMind/plb.png -share/gmplayer/Skin/AlienMind/pos.png -share/gmplayer/Skin/AlienMind/prev.png -share/gmplayer/Skin/AlienMind/shuffle.png -share/gmplayer/Skin/AlienMind/skin -share/gmplayer/Skin/AlienMind/stop.png -share/gmplayer/Skin/AlienMind/sub.png -share/gmplayer/Skin/AlienMind/volume.png -share/gmplayer/Skin/BlueHeart/README -share/gmplayer/Skin/BlueHeart/VERSION -share/gmplayer/Skin/BlueHeart/eq.png -share/gmplayer/Skin/BlueHeart/eqb.png -share/gmplayer/Skin/BlueHeart/exit.png -share/gmplayer/Skin/BlueHeart/font.fnt -share/gmplayer/Skin/BlueHeart/font.png -share/gmplayer/Skin/BlueHeart/iconify.png -share/gmplayer/Skin/BlueHeart/load.png -share/gmplayer/Skin/BlueHeart/main.png -share/gmplayer/Skin/BlueHeart/menu.png -share/gmplayer/Skin/BlueHeart/menubutt.png -share/gmplayer/Skin/BlueHeart/menus.png -share/gmplayer/Skin/BlueHeart/next.png -share/gmplayer/Skin/BlueHeart/pause.png -share/gmplayer/Skin/BlueHeart/play.png -share/gmplayer/Skin/BlueHeart/plb.png -share/gmplayer/Skin/BlueHeart/pos.png -share/gmplayer/Skin/BlueHeart/prev.png -share/gmplayer/Skin/BlueHeart/skin -share/gmplayer/Skin/BlueHeart/stop.png -share/gmplayer/Skin/BlueHeart/sub.png -share/gmplayer/Skin/BlueHeart/symbols.fnt -share/gmplayer/Skin/BlueHeart/symbols.png -share/gmplayer/Skin/CornerMP/README -share/gmplayer/Skin/CornerMP/about.png -share/gmplayer/Skin/CornerMP/back.png -share/gmplayer/Skin/CornerMP/eqls.png -share/gmplayer/Skin/CornerMP/exit.png -share/gmplayer/Skin/CornerMP/font.fnt -share/gmplayer/Skin/CornerMP/font.png -share/gmplayer/Skin/CornerMP/forwd.png -share/gmplayer/Skin/CornerMP/full.png -share/gmplayer/Skin/CornerMP/icnf.png -share/gmplayer/Skin/CornerMP/load.png -share/gmplayer/Skin/CornerMP/main.png -share/gmplayer/Skin/CornerMP/menu.png -share/gmplayer/Skin/CornerMP/menu_ko.png -share/gmplayer/Skin/CornerMP/menus.png -share/gmplayer/Skin/CornerMP/menus_ko.png -share/gmplayer/Skin/CornerMP/next.png -share/gmplayer/Skin/CornerMP/pause.png -share/gmplayer/Skin/CornerMP/play.png -share/gmplayer/Skin/CornerMP/plst.png -share/gmplayer/Skin/CornerMP/pos.png -share/gmplayer/Skin/CornerMP/prev.png -share/gmplayer/Skin/CornerMP/skin -share/gmplayer/Skin/CornerMP/stop.png -share/gmplayer/Skin/CornerMP/sub.png -share/gmplayer/Skin/CornerMP/subt.png -share/gmplayer/Skin/CornerMP/symbols.fnt -share/gmplayer/Skin/CornerMP/symbols.png -share/gmplayer/Skin/CornerMP/vol.png -share/gmplayer/Skin/CubicPlayer/README -share/gmplayer/Skin/CubicPlayer/VERSION -share/gmplayer/Skin/CubicPlayer/balance.png -share/gmplayer/Skin/CubicPlayer/font.fnt -share/gmplayer/Skin/CubicPlayer/font.png -share/gmplayer/Skin/CubicPlayer/main.png -share/gmplayer/Skin/CubicPlayer/menu.png -share/gmplayer/Skin/CubicPlayer/menus.png -share/gmplayer/Skin/CubicPlayer/open.png -share/gmplayer/Skin/CubicPlayer/play.png -share/gmplayer/Skin/CubicPlayer/seekbar.png -share/gmplayer/Skin/CubicPlayer/skin -share/gmplayer/Skin/CubicPlayer/stop.png -share/gmplayer/Skin/CubicPlayer/sub.png -share/gmplayer/Skin/Cyrus/README -share/gmplayer/Skin/Cyrus/VERSION -share/gmplayer/Skin/Cyrus/eq.png -share/gmplayer/Skin/Cyrus/eqb.png -share/gmplayer/Skin/Cyrus/exit.png -share/gmplayer/Skin/Cyrus/font.fnt -share/gmplayer/Skin/Cyrus/font.png -share/gmplayer/Skin/Cyrus/iconify.png -share/gmplayer/Skin/Cyrus/load.png -share/gmplayer/Skin/Cyrus/main.png -share/gmplayer/Skin/Cyrus/menu.png -share/gmplayer/Skin/Cyrus/menubutt.png -share/gmplayer/Skin/Cyrus/menus.png -share/gmplayer/Skin/Cyrus/next.png -share/gmplayer/Skin/Cyrus/pause.png -share/gmplayer/Skin/Cyrus/play.png -share/gmplayer/Skin/Cyrus/plb.png -share/gmplayer/Skin/Cyrus/pos.png -share/gmplayer/Skin/Cyrus/posbar.png -share/gmplayer/Skin/Cyrus/prev.png -share/gmplayer/Skin/Cyrus/readme -share/gmplayer/Skin/Cyrus/skin -share/gmplayer/Skin/Cyrus/stop.png -share/gmplayer/Skin/Cyrus/sub.png -share/gmplayer/Skin/Cyrus/symbols.fnt -share/gmplayer/Skin/Cyrus/symbols.png -share/gmplayer/Skin/MidnightLove/README -share/gmplayer/Skin/MidnightLove/VERSION -share/gmplayer/Skin/MidnightLove/eq.png -share/gmplayer/Skin/MidnightLove/eqb.png -share/gmplayer/Skin/MidnightLove/exit.png -share/gmplayer/Skin/MidnightLove/font.fnt -share/gmplayer/Skin/MidnightLove/font.png -share/gmplayer/Skin/MidnightLove/iconify.png -share/gmplayer/Skin/MidnightLove/load.png -share/gmplayer/Skin/MidnightLove/main.png -share/gmplayer/Skin/MidnightLove/maximize.png -share/gmplayer/Skin/MidnightLove/menu.png -share/gmplayer/Skin/MidnightLove/menubutt.png -share/gmplayer/Skin/MidnightLove/menus.png -share/gmplayer/Skin/MidnightLove/next.png -share/gmplayer/Skin/MidnightLove/pause.png -share/gmplayer/Skin/MidnightLove/play.png -share/gmplayer/Skin/MidnightLove/plb.png -share/gmplayer/Skin/MidnightLove/pos.png -share/gmplayer/Skin/MidnightLove/prev.png -share/gmplayer/Skin/MidnightLove/skin -share/gmplayer/Skin/MidnightLove/stop.png -share/gmplayer/Skin/MidnightLove/sub.png -share/gmplayer/Skin/MidnightLove/symbols.fnt -share/gmplayer/Skin/MidnightLove/symbols.png -share/gmplayer/Skin/WindowsMediaPlayer6/README -share/gmplayer/Skin/WindowsMediaPlayer6/VERSION -share/gmplayer/Skin/WindowsMediaPlayer6/close.png -share/gmplayer/Skin/WindowsMediaPlayer6/font.fnt -share/gmplayer/Skin/WindowsMediaPlayer6/font.png -share/gmplayer/Skin/WindowsMediaPlayer6/main.png -share/gmplayer/Skin/WindowsMediaPlayer6/maximize.png -share/gmplayer/Skin/WindowsMediaPlayer6/menu.png -share/gmplayer/Skin/WindowsMediaPlayer6/menus.png -share/gmplayer/Skin/WindowsMediaPlayer6/minimize.png -share/gmplayer/Skin/WindowsMediaPlayer6/pause.png -share/gmplayer/Skin/WindowsMediaPlayer6/play.png -share/gmplayer/Skin/WindowsMediaPlayer6/pos.png -share/gmplayer/Skin/WindowsMediaPlayer6/skin -share/gmplayer/Skin/WindowsMediaPlayer6/stop.png -share/gmplayer/Skin/WindowsMediaPlayer6/sub.png -share/gmplayer/Skin/WindowsMediaPlayer6/sub.png.win -share/gmplayer/Skin/WindowsMediaPlayer6/symbols.fnt -share/gmplayer/Skin/WindowsMediaPlayer6/symbols.png -share/gmplayer/Skin/WindowsMediaPlayer6/vol.png -share/gmplayer/Skin/avifile/README -share/gmplayer/Skin/avifile/VERSION -share/gmplayer/Skin/avifile/alap.png -share/gmplayer/Skin/avifile/font.fnt -share/gmplayer/Skin/avifile/font.png -share/gmplayer/Skin/avifile/help.png -share/gmplayer/Skin/avifile/load.png -share/gmplayer/Skin/avifile/menu.png -share/gmplayer/Skin/avifile/menus.png -share/gmplayer/Skin/avifile/mute.png -share/gmplayer/Skin/avifile/pause.png -share/gmplayer/Skin/avifile/play.png -share/gmplayer/Skin/avifile/pos.png -share/gmplayer/Skin/avifile/skin -share/gmplayer/Skin/avifile/stop.png -share/gmplayer/Skin/avifile/sub.png -share/gmplayer/Skin/avifile/symbols.fnt -share/gmplayer/Skin/avifile/symbols.png -share/gmplayer/Skin/avifile/volume.png -share/gmplayer/Skin/default/README -share/gmplayer/Skin/default/VERSION -share/gmplayer/Skin/default/about.png -share/gmplayer/Skin/default/back.png -share/gmplayer/Skin/default/eq.png -share/gmplayer/Skin/default/eqb.png -share/gmplayer/Skin/default/exit.png -share/gmplayer/Skin/default/font.fnt -share/gmplayer/Skin/default/font.png -share/gmplayer/Skin/default/forward.png -share/gmplayer/Skin/default/fsb.png -share/gmplayer/Skin/default/iconify.png -share/gmplayer/Skin/default/load.png -share/gmplayer/Skin/default/main.png -share/gmplayer/Skin/default/menu.png -share/gmplayer/Skin/default/menus.png -share/gmplayer/Skin/default/next.png -share/gmplayer/Skin/default/pause.png -share/gmplayer/Skin/default/play.png -share/gmplayer/Skin/default/plb.png -share/gmplayer/Skin/default/pos.png -share/gmplayer/Skin/default/prev.png -share/gmplayer/Skin/default/skin -share/gmplayer/Skin/default/stop.png -share/gmplayer/Skin/default/sub.png -share/gmplayer/Skin/default/subload.png -share/gmplayer/Skin/default/symbols.fnt -share/gmplayer/Skin/default/symbols.png -share/gmplayer/Skin/default/volume.png -share/gmplayer/Skin/mentalic/VERSION -share/gmplayer/Skin/mentalic/about.png -share/gmplayer/Skin/mentalic/back.png -share/gmplayer/Skin/mentalic/exit.png -share/gmplayer/Skin/mentalic/font.fnt -share/gmplayer/Skin/mentalic/font.png -share/gmplayer/Skin/mentalic/forward.png -share/gmplayer/Skin/mentalic/fsb.png -share/gmplayer/Skin/mentalic/iconify.png -share/gmplayer/Skin/mentalic/load.png -share/gmplayer/Skin/mentalic/main.png -share/gmplayer/Skin/mentalic/menu.png -share/gmplayer/Skin/mentalic/menus.png -share/gmplayer/Skin/mentalic/next.png -share/gmplayer/Skin/mentalic/pause.png -share/gmplayer/Skin/mentalic/play.png -share/gmplayer/Skin/mentalic/pos.png -share/gmplayer/Skin/mentalic/prev.png -share/gmplayer/Skin/mentalic/skin -share/gmplayer/Skin/mentalic/stop.png -share/gmplayer/Skin/mentalic/sub.png -share/gmplayer/Skin/mentalic/symbols.fnt -share/gmplayer/Skin/mentalic/symbols.png -share/gmplayer/Skin/mentalic/symbolsV.fnt -share/gmplayer/Skin/mentalic/symbolsV.png -share/gmplayer/Skin/mentalic/volume.png -share/gmplayer/Skin/netscape4/README -share/gmplayer/Skin/netscape4/VERSION -share/gmplayer/Skin/netscape4/bookmark.png -share/gmplayer/Skin/netscape4/font.fnt -share/gmplayer/Skin/netscape4/font.png -share/gmplayer/Skin/netscape4/fwd.png -share/gmplayer/Skin/netscape4/home.png -share/gmplayer/Skin/netscape4/main.png -share/gmplayer/Skin/netscape4/menu.png -share/gmplayer/Skin/netscape4/menus.png -share/gmplayer/Skin/netscape4/mynet.png -share/gmplayer/Skin/netscape4/n.png -share/gmplayer/Skin/netscape4/on.png -share/gmplayer/Skin/netscape4/print.png -share/gmplayer/Skin/netscape4/reload.png -share/gmplayer/Skin/netscape4/rew.png -share/gmplayer/Skin/netscape4/search.png -share/gmplayer/Skin/netscape4/security.png -share/gmplayer/Skin/netscape4/shop.png -share/gmplayer/Skin/netscape4/skin -share/gmplayer/Skin/netscape4/stop.png -share/gmplayer/Skin/netscape4/sub.png -share/gmplayer/Skin/neutron/README -share/gmplayer/Skin/neutron/VERSION -share/gmplayer/Skin/neutron/about.png -share/gmplayer/Skin/neutron/back.png -share/gmplayer/Skin/neutron/eqb.png -share/gmplayer/Skin/neutron/exit.png -share/gmplayer/Skin/neutron/font.fnt -share/gmplayer/Skin/neutron/font.png -share/gmplayer/Skin/neutron/forward.png -share/gmplayer/Skin/neutron/fsb.png -share/gmplayer/Skin/neutron/iconify.png -share/gmplayer/Skin/neutron/load.png -share/gmplayer/Skin/neutron/main.png -share/gmplayer/Skin/neutron/menu.png -share/gmplayer/Skin/neutron/menus.png -share/gmplayer/Skin/neutron/mute.png -share/gmplayer/Skin/neutron/next.png -share/gmplayer/Skin/neutron/pause.png -share/gmplayer/Skin/neutron/play.png -share/gmplayer/Skin/neutron/plb.png -share/gmplayer/Skin/neutron/pos.png -share/gmplayer/Skin/neutron/pref.png -share/gmplayer/Skin/neutron/prev.png -share/gmplayer/Skin/neutron/skin -share/gmplayer/Skin/neutron/stop.png -share/gmplayer/Skin/neutron/sub.png -share/gmplayer/Skin/neutron/symbols.fnt -share/gmplayer/Skin/neutron/symbols.png -share/gmplayer/Skin/neutron/volume.png -share/gmplayer/Skin/phony/README -share/gmplayer/Skin/phony/VERSION -share/gmplayer/Skin/phony/about.png -share/gmplayer/Skin/phony/back.png -share/gmplayer/Skin/phony/exit.png -share/gmplayer/Skin/phony/font2.fnt -share/gmplayer/Skin/phony/font2.png -share/gmplayer/Skin/phony/forward.png -share/gmplayer/Skin/phony/load.png -share/gmplayer/Skin/phony/main.png -share/gmplayer/Skin/phony/menu.png -share/gmplayer/Skin/phony/menus.png -share/gmplayer/Skin/phony/mute.png -share/gmplayer/Skin/phony/next.png -share/gmplayer/Skin/phony/pause.png -share/gmplayer/Skin/phony/play.png -share/gmplayer/Skin/phony/pos.png -share/gmplayer/Skin/phony/prev.png -share/gmplayer/Skin/phony/progress.png -share/gmplayer/Skin/phony/skin -share/gmplayer/Skin/phony/small-bright.png -share/gmplayer/Skin/phony/small.png -share/gmplayer/Skin/phony/stop.png -share/gmplayer/Skin/phony/sub2.png -share/gmplayer/Skin/phony/symbols2.fnt -share/gmplayer/Skin/phony/symbols2.png -share/gmplayer/Skin/phony/volume.png -share/gmplayer/Skin/phony/zoom.png -share/gmplayer/Skin/plastic/README -share/gmplayer/Skin/plastic/VERSION -share/gmplayer/Skin/plastic/about.png -share/gmplayer/Skin/plastic/back.png -share/gmplayer/Skin/plastic/eqb.png -share/gmplayer/Skin/plastic/exit.png -share/gmplayer/Skin/plastic/font.fnt -share/gmplayer/Skin/plastic/font.png -share/gmplayer/Skin/plastic/forward.png -share/gmplayer/Skin/plastic/fsb.png -share/gmplayer/Skin/plastic/iconify.png -share/gmplayer/Skin/plastic/load.png -share/gmplayer/Skin/plastic/main.png -share/gmplayer/Skin/plastic/menu.png -share/gmplayer/Skin/plastic/menus.png -share/gmplayer/Skin/plastic/next.png -share/gmplayer/Skin/plastic/pause.png -share/gmplayer/Skin/plastic/play.png -share/gmplayer/Skin/plastic/plb.png -share/gmplayer/Skin/plastic/pos.png -share/gmplayer/Skin/plastic/prev.png -share/gmplayer/Skin/plastic/skin -share/gmplayer/Skin/plastic/stop.png -share/gmplayer/Skin/plastic/sub.png -share/gmplayer/Skin/plastic/subt.png -share/gmplayer/Skin/plastic/symbols.fnt -share/gmplayer/Skin/plastic/symbols.png -share/gmplayer/Skin/plastic/volume.png -share/gmplayer/Skin/proton/README -share/gmplayer/Skin/proton/VERSION -share/gmplayer/Skin/proton/about.png -share/gmplayer/Skin/proton/equel.png -share/gmplayer/Skin/proton/exit.png -share/gmplayer/Skin/proton/ff.png -share/gmplayer/Skin/proton/font.fnt -share/gmplayer/Skin/proton/font.png -share/gmplayer/Skin/proton/fullscr.png -share/gmplayer/Skin/proton/icon.png -share/gmplayer/Skin/proton/knob.png -share/gmplayer/Skin/proton/main.png -share/gmplayer/Skin/proton/menu.png -share/gmplayer/Skin/proton/menus.png -share/gmplayer/Skin/proton/mute.png -share/gmplayer/Skin/proton/next.png -share/gmplayer/Skin/proton/open.png -share/gmplayer/Skin/proton/pause.png -share/gmplayer/Skin/proton/play.png -share/gmplayer/Skin/proton/playl.png -share/gmplayer/Skin/proton/pref.png -share/gmplayer/Skin/proton/prev.png -share/gmplayer/Skin/proton/rew.png -share/gmplayer/Skin/proton/skin -share/gmplayer/Skin/proton/slider.png -share/gmplayer/Skin/proton/stop.png -share/gmplayer/Skin/proton/sub.png -share/gmplayer/Skin/proton/symbols.fnt -share/gmplayer/Skin/proton/symbols.png -share/gmplayer/Skin/slim/about.png -share/gmplayer/Skin/slim/back.png -share/gmplayer/Skin/slim/double.png -share/gmplayer/Skin/slim/exit.png -share/gmplayer/Skin/slim/font.fnt -share/gmplayer/Skin/slim/font.png -share/gmplayer/Skin/slim/forward.png -share/gmplayer/Skin/slim/fsb.png -share/gmplayer/Skin/slim/iconify.png -share/gmplayer/Skin/slim/load.png -share/gmplayer/Skin/slim/main.png -share/gmplayer/Skin/slim/menu.png -share/gmplayer/Skin/slim/menus.png -share/gmplayer/Skin/slim/next.png -share/gmplayer/Skin/slim/normal.png -share/gmplayer/Skin/slim/pause.png -share/gmplayer/Skin/slim/play.png -share/gmplayer/Skin/slim/plb.png -share/gmplayer/Skin/slim/pos.png -share/gmplayer/Skin/slim/pref.png -share/gmplayer/Skin/slim/prev.png -share/gmplayer/Skin/slim/skin -share/gmplayer/Skin/slim/stop.png -share/gmplayer/Skin/slim/sub.png -share/gmplayer/Skin/slim/subt.png -share/gmplayer/Skin/slim/symbols.fnt -share/gmplayer/Skin/slim/symbols.png -share/gmplayer/Skin/slim/volume.png -share/gmplayer/Skin/xanim/README -share/gmplayer/Skin/xanim/VERSION -share/gmplayer/Skin/xanim/back.png -share/gmplayer/Skin/xanim/back2.png -share/gmplayer/Skin/xanim/back3.png -share/gmplayer/Skin/xanim/exit.png -share/gmplayer/Skin/xanim/ff2.png -share/gmplayer/Skin/xanim/ff3.png -share/gmplayer/Skin/xanim/grab.png -share/gmplayer/Skin/xanim/main.png -share/gmplayer/Skin/xanim/menu.png -share/gmplayer/Skin/xanim/menus.png -share/gmplayer/Skin/xanim/minus.png -share/gmplayer/Skin/xanim/o.png -share/gmplayer/Skin/xanim/play.png -share/gmplayer/Skin/xanim/plus.png -share/gmplayer/Skin/xanim/skin -share/gmplayer/Skin/xanim/stop.png -share/gmplayer/Skin/xanim/sub.png -share/gmplayer/Skin/xanim/vol.png -share/gmplayer/Skin/xanim/volbar.png -share/gmplayer/Skin/xanim/volmin.png -share/gmplayer/Skin/xanim/volplus.png -share/gmplayer/Skin/xine-lcd/README -share/gmplayer/Skin/xine-lcd/VERSION -share/gmplayer/Skin/xine-lcd/close.png -share/gmplayer/Skin/xine-lcd/dvd.png -share/gmplayer/Skin/xine-lcd/eject.png -share/gmplayer/Skin/xine-lcd/ffwd.png -share/gmplayer/Skin/xine-lcd/font.fnt -share/gmplayer/Skin/xine-lcd/font.png -share/gmplayer/Skin/xine-lcd/fullsc.png -share/gmplayer/Skin/xine-lcd/main-jo.png -share/gmplayer/Skin/xine-lcd/main.png -share/gmplayer/Skin/xine-lcd/menu.png -share/gmplayer/Skin/xine-lcd/menus.png -share/gmplayer/Skin/xine-lcd/minus.png -share/gmplayer/Skin/xine-lcd/next.png -share/gmplayer/Skin/xine-lcd/pause.png -share/gmplayer/Skin/xine-lcd/play.png -share/gmplayer/Skin/xine-lcd/playlist.png -share/gmplayer/Skin/xine-lcd/plbutton.png -share/gmplayer/Skin/xine-lcd/plus.png -share/gmplayer/Skin/xine-lcd/poti.png -share/gmplayer/Skin/xine-lcd/power.png -share/gmplayer/Skin/xine-lcd/pref.png -share/gmplayer/Skin/xine-lcd/prev.png -share/gmplayer/Skin/xine-lcd/rewind.png -share/gmplayer/Skin/xine-lcd/seekbar.png -share/gmplayer/Skin/xine-lcd/skin -share/gmplayer/Skin/xine-lcd/stop.png -share/gmplayer/Skin/xine-lcd/sub.png -share/gmplayer/Skin/xine-lcd/volume.png -share/gmplayer/codecs.conf -@dirrm share/gmplayer/Skin/xine-lcd -@dirrm share/gmplayer/Skin/xanim -@dirrm share/gmplayer/Skin/slim -@dirrm share/gmplayer/Skin/proton -@dirrm share/gmplayer/Skin/plastic -@dirrm share/gmplayer/Skin/phony -@dirrm share/gmplayer/Skin/neutron -@dirrm share/gmplayer/Skin/netscape4 -@dirrm share/gmplayer/Skin/mentalic -@dirrm share/gmplayer/Skin/default -@dirrm share/gmplayer/Skin/avifile -@dirrm share/gmplayer/Skin/WindowsMediaPlayer6 -@dirrm share/gmplayer/Skin/MidnightLove -@dirrm share/gmplayer/Skin/Cyrus -@dirrm share/gmplayer/Skin/CubicPlayer -@dirrm share/gmplayer/Skin/CornerMP -@dirrm share/gmplayer/Skin/BlueHeart -@dirrm share/gmplayer/Skin/AlienMind -@dirrm share/gmplayer/Skin -@dirrm share/gmplayer/DOCS/tech -@dirrm share/gmplayer/DOCS/Polish -@dirrm share/gmplayer/DOCS/Italian -@dirrm share/gmplayer/DOCS/Hungarian -@dirrm share/gmplayer/DOCS/German -@dirrm share/gmplayer/DOCS/French -@dirrm share/gmplayer/DOCS -@dirrm share/gmplayer +share/mplayer/Skin/AlienMind/README +share/mplayer/Skin/AlienMind/VERSION +share/mplayer/Skin/AlienMind/balance.png +share/mplayer/Skin/AlienMind/eqb.png +share/mplayer/Skin/AlienMind/exit.png +share/mplayer/Skin/AlienMind/font.fnt +share/mplayer/Skin/AlienMind/font.png +share/mplayer/Skin/AlienMind/iconify.png +share/mplayer/Skin/AlienMind/load.png +share/mplayer/Skin/AlienMind/loop.png +share/mplayer/Skin/AlienMind/main.png +share/mplayer/Skin/AlienMind/menu.png +share/mplayer/Skin/AlienMind/menubutt.png +share/mplayer/Skin/AlienMind/menus.png +share/mplayer/Skin/AlienMind/next.png +share/mplayer/Skin/AlienMind/numbers.fnt +share/mplayer/Skin/AlienMind/numbers.png +share/mplayer/Skin/AlienMind/pause.png +share/mplayer/Skin/AlienMind/play.png +share/mplayer/Skin/AlienMind/plb.png +share/mplayer/Skin/AlienMind/pos.png +share/mplayer/Skin/AlienMind/prev.png +share/mplayer/Skin/AlienMind/shuffle.png +share/mplayer/Skin/AlienMind/skin +share/mplayer/Skin/AlienMind/stop.png +share/mplayer/Skin/AlienMind/sub.png +share/mplayer/Skin/AlienMind/volume.png +share/mplayer/Skin/BlueHeart/README +share/mplayer/Skin/BlueHeart/VERSION +share/mplayer/Skin/BlueHeart/eq.png +share/mplayer/Skin/BlueHeart/eqb.png +share/mplayer/Skin/BlueHeart/exit.png +share/mplayer/Skin/BlueHeart/font.fnt +share/mplayer/Skin/BlueHeart/font.png +share/mplayer/Skin/BlueHeart/iconify.png +share/mplayer/Skin/BlueHeart/load.png +share/mplayer/Skin/BlueHeart/main.png +share/mplayer/Skin/BlueHeart/menu.png +share/mplayer/Skin/BlueHeart/menubutt.png +share/mplayer/Skin/BlueHeart/menus.png +share/mplayer/Skin/BlueHeart/next.png +share/mplayer/Skin/BlueHeart/pause.png +share/mplayer/Skin/BlueHeart/play.png +share/mplayer/Skin/BlueHeart/plb.png +share/mplayer/Skin/BlueHeart/pos.png +share/mplayer/Skin/BlueHeart/prev.png +share/mplayer/Skin/BlueHeart/skin +share/mplayer/Skin/BlueHeart/stop.png +share/mplayer/Skin/BlueHeart/sub.png +share/mplayer/Skin/BlueHeart/symbols.fnt +share/mplayer/Skin/BlueHeart/symbols.png +share/mplayer/Skin/CornerMP-aqua/README +share/mplayer/Skin/CornerMP-aqua/about.png +share/mplayer/Skin/CornerMP-aqua/back.png +share/mplayer/Skin/CornerMP-aqua/eqls.png +share/mplayer/Skin/CornerMP-aqua/exit.png +share/mplayer/Skin/CornerMP-aqua/font.fnt +share/mplayer/Skin/CornerMP-aqua/font.png +share/mplayer/Skin/CornerMP-aqua/forwd.png +share/mplayer/Skin/CornerMP-aqua/full.png +share/mplayer/Skin/CornerMP-aqua/icnf.png +share/mplayer/Skin/CornerMP-aqua/load.png +share/mplayer/Skin/CornerMP-aqua/main.png +share/mplayer/Skin/CornerMP-aqua/menu.png +share/mplayer/Skin/CornerMP-aqua/menu_ko.png +share/mplayer/Skin/CornerMP-aqua/menus.png +share/mplayer/Skin/CornerMP-aqua/menus_ko.png +share/mplayer/Skin/CornerMP-aqua/next.png +share/mplayer/Skin/CornerMP-aqua/pause.png +share/mplayer/Skin/CornerMP-aqua/play.png +share/mplayer/Skin/CornerMP-aqua/plst.png +share/mplayer/Skin/CornerMP-aqua/pos.png +share/mplayer/Skin/CornerMP-aqua/prev.png +share/mplayer/Skin/CornerMP-aqua/skin +share/mplayer/Skin/CornerMP-aqua/stop.png +share/mplayer/Skin/CornerMP-aqua/sub.png +share/mplayer/Skin/CornerMP-aqua/subt.png +share/mplayer/Skin/CornerMP-aqua/symbols.fnt +share/mplayer/Skin/CornerMP-aqua/symbols.png +share/mplayer/Skin/CornerMP-aqua/vol.png +share/mplayer/Skin/CornerMP/README +share/mplayer/Skin/CornerMP/about.png +share/mplayer/Skin/CornerMP/back.png +share/mplayer/Skin/CornerMP/eqls.png +share/mplayer/Skin/CornerMP/exit.png +share/mplayer/Skin/CornerMP/font.fnt +share/mplayer/Skin/CornerMP/font.png +share/mplayer/Skin/CornerMP/forwd.png +share/mplayer/Skin/CornerMP/full.png +share/mplayer/Skin/CornerMP/icnf.png +share/mplayer/Skin/CornerMP/load.png +share/mplayer/Skin/CornerMP/main.png +share/mplayer/Skin/CornerMP/menu.png +share/mplayer/Skin/CornerMP/menu_ko.png +share/mplayer/Skin/CornerMP/menus.png +share/mplayer/Skin/CornerMP/menus_ko.png +share/mplayer/Skin/CornerMP/next.png +share/mplayer/Skin/CornerMP/pause.png +share/mplayer/Skin/CornerMP/play.png +share/mplayer/Skin/CornerMP/plst.png +share/mplayer/Skin/CornerMP/pos.png +share/mplayer/Skin/CornerMP/prev.png +share/mplayer/Skin/CornerMP/skin +share/mplayer/Skin/CornerMP/stop.png +share/mplayer/Skin/CornerMP/sub.png +share/mplayer/Skin/CornerMP/subt.png +share/mplayer/Skin/CornerMP/symbols.fnt +share/mplayer/Skin/CornerMP/symbols.png +share/mplayer/Skin/CornerMP/vol.png +share/mplayer/Skin/CubicPlayer/README +share/mplayer/Skin/CubicPlayer/VERSION +share/mplayer/Skin/CubicPlayer/balance.png +share/mplayer/Skin/CubicPlayer/font.fnt +share/mplayer/Skin/CubicPlayer/font.png +share/mplayer/Skin/CubicPlayer/main.png +share/mplayer/Skin/CubicPlayer/menu.png +share/mplayer/Skin/CubicPlayer/menus.png +share/mplayer/Skin/CubicPlayer/open.png +share/mplayer/Skin/CubicPlayer/play.png +share/mplayer/Skin/CubicPlayer/seekbar.png +share/mplayer/Skin/CubicPlayer/skin +share/mplayer/Skin/CubicPlayer/stop.png +share/mplayer/Skin/CubicPlayer/sub.png +share/mplayer/Skin/Cyrus/README +share/mplayer/Skin/Cyrus/VERSION +share/mplayer/Skin/Cyrus/eq.png +share/mplayer/Skin/Cyrus/eqb.png +share/mplayer/Skin/Cyrus/exit.png +share/mplayer/Skin/Cyrus/font.fnt +share/mplayer/Skin/Cyrus/font.png +share/mplayer/Skin/Cyrus/iconify.png +share/mplayer/Skin/Cyrus/load.png +share/mplayer/Skin/Cyrus/main.png +share/mplayer/Skin/Cyrus/menu.png +share/mplayer/Skin/Cyrus/menubutt.png +share/mplayer/Skin/Cyrus/menus.png +share/mplayer/Skin/Cyrus/next.png +share/mplayer/Skin/Cyrus/pause.png +share/mplayer/Skin/Cyrus/play.png +share/mplayer/Skin/Cyrus/plb.png +share/mplayer/Skin/Cyrus/pos.png +share/mplayer/Skin/Cyrus/posbar.png +share/mplayer/Skin/Cyrus/prev.png +share/mplayer/Skin/Cyrus/readme +share/mplayer/Skin/Cyrus/skin +share/mplayer/Skin/Cyrus/stop.png +share/mplayer/Skin/Cyrus/sub.png +share/mplayer/Skin/Cyrus/symbols.fnt +share/mplayer/Skin/Cyrus/symbols.png +share/mplayer/Skin/MidnightLove/README +share/mplayer/Skin/MidnightLove/VERSION +share/mplayer/Skin/MidnightLove/eq.png +share/mplayer/Skin/MidnightLove/eqb.png +share/mplayer/Skin/MidnightLove/exit.png +share/mplayer/Skin/MidnightLove/font.fnt +share/mplayer/Skin/MidnightLove/font.png +share/mplayer/Skin/MidnightLove/iconify.png +share/mplayer/Skin/MidnightLove/load.png +share/mplayer/Skin/MidnightLove/main.png +share/mplayer/Skin/MidnightLove/maximize.png +share/mplayer/Skin/MidnightLove/menu.png +share/mplayer/Skin/MidnightLove/menubutt.png +share/mplayer/Skin/MidnightLove/menus.png +share/mplayer/Skin/MidnightLove/next.png +share/mplayer/Skin/MidnightLove/pause.png +share/mplayer/Skin/MidnightLove/play.png +share/mplayer/Skin/MidnightLove/plb.png +share/mplayer/Skin/MidnightLove/pos.png +share/mplayer/Skin/MidnightLove/prev.png +share/mplayer/Skin/MidnightLove/skin +share/mplayer/Skin/MidnightLove/stop.png +share/mplayer/Skin/MidnightLove/sub.png +share/mplayer/Skin/MidnightLove/symbols.fnt +share/mplayer/Skin/MidnightLove/symbols.png +share/mplayer/Skin/WindowsMediaPlayer6/README +share/mplayer/Skin/WindowsMediaPlayer6/VERSION +share/mplayer/Skin/WindowsMediaPlayer6/close.png +share/mplayer/Skin/WindowsMediaPlayer6/font.fnt +share/mplayer/Skin/WindowsMediaPlayer6/font.png +share/mplayer/Skin/WindowsMediaPlayer6/main.png +share/mplayer/Skin/WindowsMediaPlayer6/maximize.png +share/mplayer/Skin/WindowsMediaPlayer6/menu.png +share/mplayer/Skin/WindowsMediaPlayer6/menus.png +share/mplayer/Skin/WindowsMediaPlayer6/minimize.png +share/mplayer/Skin/WindowsMediaPlayer6/pause.png +share/mplayer/Skin/WindowsMediaPlayer6/play.png +share/mplayer/Skin/WindowsMediaPlayer6/pos.png +share/mplayer/Skin/WindowsMediaPlayer6/skin +share/mplayer/Skin/WindowsMediaPlayer6/stop.png +share/mplayer/Skin/WindowsMediaPlayer6/sub.png +share/mplayer/Skin/WindowsMediaPlayer6/sub.png.win +share/mplayer/Skin/WindowsMediaPlayer6/symbols.fnt +share/mplayer/Skin/WindowsMediaPlayer6/symbols.png +share/mplayer/Skin/WindowsMediaPlayer6/vol.png +share/mplayer/Skin/avifile/README +share/mplayer/Skin/avifile/VERSION +share/mplayer/Skin/avifile/alap.png +share/mplayer/Skin/avifile/font.fnt +share/mplayer/Skin/avifile/font.png +share/mplayer/Skin/avifile/help.png +share/mplayer/Skin/avifile/load.png +share/mplayer/Skin/avifile/menu.png +share/mplayer/Skin/avifile/menus.png +share/mplayer/Skin/avifile/mute.png +share/mplayer/Skin/avifile/pause.png +share/mplayer/Skin/avifile/play.png +share/mplayer/Skin/avifile/pos.png +share/mplayer/Skin/avifile/skin +share/mplayer/Skin/avifile/stop.png +share/mplayer/Skin/avifile/sub.png +share/mplayer/Skin/avifile/symbols.fnt +share/mplayer/Skin/avifile/symbols.png +share/mplayer/Skin/avifile/volume.png +share/mplayer/Skin/default/README +share/mplayer/Skin/default/VERSION +share/mplayer/Skin/default/about.png +share/mplayer/Skin/default/back.png +share/mplayer/Skin/default/eq.png +share/mplayer/Skin/default/eqb.png +share/mplayer/Skin/default/exit.png +share/mplayer/Skin/default/font.fnt +share/mplayer/Skin/default/font.png +share/mplayer/Skin/default/forward.png +share/mplayer/Skin/default/fsb.png +share/mplayer/Skin/default/iconify.png +share/mplayer/Skin/default/load.png +share/mplayer/Skin/default/main.png +share/mplayer/Skin/default/menu.png +share/mplayer/Skin/default/menus.png +share/mplayer/Skin/default/next.png +share/mplayer/Skin/default/pause.png +share/mplayer/Skin/default/play.png +share/mplayer/Skin/default/plb.png +share/mplayer/Skin/default/pos.png +share/mplayer/Skin/default/prev.png +share/mplayer/Skin/default/skin +share/mplayer/Skin/default/stop.png +share/mplayer/Skin/default/sub.png +share/mplayer/Skin/default/subload.png +share/mplayer/Skin/default/symbols.fnt +share/mplayer/Skin/default/symbols.png +share/mplayer/Skin/default/volume.png +share/mplayer/Skin/hwswskin/button-about.png +share/mplayer/Skin/hwswskin/button-exit.png +share/mplayer/Skin/hwswskin/button-forward.png +share/mplayer/Skin/hwswskin/button-fullscr.png +share/mplayer/Skin/hwswskin/button-next.png +share/mplayer/Skin/hwswskin/button-open.png +share/mplayer/Skin/hwswskin/button-pause.png +share/mplayer/Skin/hwswskin/button-play.png +share/mplayer/Skin/hwswskin/button-playlst.png +share/mplayer/Skin/hwswskin/button-prev.png +share/mplayer/Skin/hwswskin/button-rewind.png +share/mplayer/Skin/hwswskin/button-skinbr.png +share/mplayer/Skin/hwswskin/button-stop.png +share/mplayer/Skin/hwswskin/font.fnt +share/mplayer/Skin/hwswskin/font.png +share/mplayer/Skin/hwswskin/main.png +share/mplayer/Skin/hwswskin/pos.png +share/mplayer/Skin/hwswskin/skin +share/mplayer/Skin/hwswskin/sub.png +share/mplayer/Skin/hwswskin/vol.png +share/mplayer/Skin/mentalic/VERSION +share/mplayer/Skin/mentalic/about.png +share/mplayer/Skin/mentalic/back.png +share/mplayer/Skin/mentalic/exit.png +share/mplayer/Skin/mentalic/font.fnt +share/mplayer/Skin/mentalic/font.png +share/mplayer/Skin/mentalic/forward.png +share/mplayer/Skin/mentalic/fsb.png +share/mplayer/Skin/mentalic/iconify.png +share/mplayer/Skin/mentalic/load.png +share/mplayer/Skin/mentalic/main.png +share/mplayer/Skin/mentalic/menu.png +share/mplayer/Skin/mentalic/menus.png +share/mplayer/Skin/mentalic/next.png +share/mplayer/Skin/mentalic/pause.png +share/mplayer/Skin/mentalic/play.png +share/mplayer/Skin/mentalic/pos.png +share/mplayer/Skin/mentalic/prev.png +share/mplayer/Skin/mentalic/skin +share/mplayer/Skin/mentalic/stop.png +share/mplayer/Skin/mentalic/sub.png +share/mplayer/Skin/mentalic/symbols.fnt +share/mplayer/Skin/mentalic/symbols.png +share/mplayer/Skin/mentalic/symbolsV.fnt +share/mplayer/Skin/mentalic/symbolsV.png +share/mplayer/Skin/mentalic/volume.png +share/mplayer/Skin/netscape4/README +share/mplayer/Skin/netscape4/VERSION +share/mplayer/Skin/netscape4/bookmark.png +share/mplayer/Skin/netscape4/font.fnt +share/mplayer/Skin/netscape4/font.png +share/mplayer/Skin/netscape4/fwd.png +share/mplayer/Skin/netscape4/home.png +share/mplayer/Skin/netscape4/main.png +share/mplayer/Skin/netscape4/menu.png +share/mplayer/Skin/netscape4/menus.png +share/mplayer/Skin/netscape4/mynet.png +share/mplayer/Skin/netscape4/n.png +share/mplayer/Skin/netscape4/on.png +share/mplayer/Skin/netscape4/print.png +share/mplayer/Skin/netscape4/reload.png +share/mplayer/Skin/netscape4/rew.png +share/mplayer/Skin/netscape4/search.png +share/mplayer/Skin/netscape4/security.png +share/mplayer/Skin/netscape4/shop.png +share/mplayer/Skin/netscape4/skin +share/mplayer/Skin/netscape4/stop.png +share/mplayer/Skin/netscape4/sub.png +share/mplayer/Skin/neutron/README +share/mplayer/Skin/neutron/VERSION +share/mplayer/Skin/neutron/about.png +share/mplayer/Skin/neutron/back.png +share/mplayer/Skin/neutron/eqb.png +share/mplayer/Skin/neutron/exit.png +share/mplayer/Skin/neutron/font.fnt +share/mplayer/Skin/neutron/font.png +share/mplayer/Skin/neutron/forward.png +share/mplayer/Skin/neutron/fsb.png +share/mplayer/Skin/neutron/iconify.png +share/mplayer/Skin/neutron/load.png +share/mplayer/Skin/neutron/main.png +share/mplayer/Skin/neutron/menu.png +share/mplayer/Skin/neutron/menus.png +share/mplayer/Skin/neutron/mute.png +share/mplayer/Skin/neutron/next.png +share/mplayer/Skin/neutron/pause.png +share/mplayer/Skin/neutron/play.png +share/mplayer/Skin/neutron/plb.png +share/mplayer/Skin/neutron/pos.png +share/mplayer/Skin/neutron/pref.png +share/mplayer/Skin/neutron/prev.png +share/mplayer/Skin/neutron/skin +share/mplayer/Skin/neutron/stop.png +share/mplayer/Skin/neutron/sub.png +share/mplayer/Skin/neutron/symbols.fnt +share/mplayer/Skin/neutron/symbols.png +share/mplayer/Skin/neutron/volume.png +share/mplayer/Skin/phony/README +share/mplayer/Skin/phony/VERSION +share/mplayer/Skin/phony/about.png +share/mplayer/Skin/phony/back.png +share/mplayer/Skin/phony/exit.png +share/mplayer/Skin/phony/font2.fnt +share/mplayer/Skin/phony/font2.png +share/mplayer/Skin/phony/forward.png +share/mplayer/Skin/phony/load.png +share/mplayer/Skin/phony/main.png +share/mplayer/Skin/phony/menu.png +share/mplayer/Skin/phony/menus.png +share/mplayer/Skin/phony/mute.png +share/mplayer/Skin/phony/next.png +share/mplayer/Skin/phony/pause.png +share/mplayer/Skin/phony/play.png +share/mplayer/Skin/phony/pos.png +share/mplayer/Skin/phony/prev.png +share/mplayer/Skin/phony/progress.png +share/mplayer/Skin/phony/skin +share/mplayer/Skin/phony/small-bright.png +share/mplayer/Skin/phony/small.png +share/mplayer/Skin/phony/stop.png +share/mplayer/Skin/phony/sub2.png +share/mplayer/Skin/phony/symbols2.fnt +share/mplayer/Skin/phony/symbols2.png +share/mplayer/Skin/phony/volume.png +share/mplayer/Skin/phony/zoom.png +share/mplayer/Skin/plastic/README +share/mplayer/Skin/plastic/VERSION +share/mplayer/Skin/plastic/about.png +share/mplayer/Skin/plastic/back.png +share/mplayer/Skin/plastic/eqb.png +share/mplayer/Skin/plastic/exit.png +share/mplayer/Skin/plastic/font.fnt +share/mplayer/Skin/plastic/font.png +share/mplayer/Skin/plastic/forward.png +share/mplayer/Skin/plastic/fsb.png +share/mplayer/Skin/plastic/iconify.png +share/mplayer/Skin/plastic/load.png +share/mplayer/Skin/plastic/main.png +share/mplayer/Skin/plastic/menu.png +share/mplayer/Skin/plastic/menus.png +share/mplayer/Skin/plastic/next.png +share/mplayer/Skin/plastic/pause.png +share/mplayer/Skin/plastic/play.png +share/mplayer/Skin/plastic/plb.png +share/mplayer/Skin/plastic/pos.png +share/mplayer/Skin/plastic/prev.png +share/mplayer/Skin/plastic/skin +share/mplayer/Skin/plastic/stop.png +share/mplayer/Skin/plastic/sub.png +share/mplayer/Skin/plastic/subt.png +share/mplayer/Skin/plastic/symbols.fnt +share/mplayer/Skin/plastic/symbols.png +share/mplayer/Skin/plastic/volume.png +share/mplayer/Skin/proton/README +share/mplayer/Skin/proton/VERSION +share/mplayer/Skin/proton/about.png +share/mplayer/Skin/proton/equel.png +share/mplayer/Skin/proton/exit.png +share/mplayer/Skin/proton/ff.png +share/mplayer/Skin/proton/font.fnt +share/mplayer/Skin/proton/font.png +share/mplayer/Skin/proton/fullscr.png +share/mplayer/Skin/proton/icon.png +share/mplayer/Skin/proton/knob.png +share/mplayer/Skin/proton/main.png +share/mplayer/Skin/proton/menu.png +share/mplayer/Skin/proton/menus.png +share/mplayer/Skin/proton/mute.png +share/mplayer/Skin/proton/next.png +share/mplayer/Skin/proton/open.png +share/mplayer/Skin/proton/pause.png +share/mplayer/Skin/proton/play.png +share/mplayer/Skin/proton/playl.png +share/mplayer/Skin/proton/pref.png +share/mplayer/Skin/proton/prev.png +share/mplayer/Skin/proton/rew.png +share/mplayer/Skin/proton/skin +share/mplayer/Skin/proton/slider.png +share/mplayer/Skin/proton/stop.png +share/mplayer/Skin/proton/sub.png +share/mplayer/Skin/proton/symbols.fnt +share/mplayer/Skin/proton/symbols.png +share/mplayer/Skin/slim/about.png +share/mplayer/Skin/slim/back.png +share/mplayer/Skin/slim/double.png +share/mplayer/Skin/slim/exit.png +share/mplayer/Skin/slim/font.fnt +share/mplayer/Skin/slim/font.png +share/mplayer/Skin/slim/forward.png +share/mplayer/Skin/slim/fsb.png +share/mplayer/Skin/slim/iconify.png +share/mplayer/Skin/slim/load.png +share/mplayer/Skin/slim/main.png +share/mplayer/Skin/slim/menu.png +share/mplayer/Skin/slim/menus.png +share/mplayer/Skin/slim/next.png +share/mplayer/Skin/slim/normal.png +share/mplayer/Skin/slim/pause.png +share/mplayer/Skin/slim/play.png +share/mplayer/Skin/slim/plb.png +share/mplayer/Skin/slim/pos.png +share/mplayer/Skin/slim/pref.png +share/mplayer/Skin/slim/prev.png +share/mplayer/Skin/slim/skin +share/mplayer/Skin/slim/stop.png +share/mplayer/Skin/slim/sub.png +share/mplayer/Skin/slim/subt.png +share/mplayer/Skin/slim/symbols.fnt +share/mplayer/Skin/slim/symbols.png +share/mplayer/Skin/slim/volume.png +share/mplayer/Skin/xanim/README +share/mplayer/Skin/xanim/VERSION +share/mplayer/Skin/xanim/back.png +share/mplayer/Skin/xanim/back2.png +share/mplayer/Skin/xanim/back3.png +share/mplayer/Skin/xanim/exit.png +share/mplayer/Skin/xanim/ff2.png +share/mplayer/Skin/xanim/ff3.png +share/mplayer/Skin/xanim/grab.png +share/mplayer/Skin/xanim/main.png +share/mplayer/Skin/xanim/menu.png +share/mplayer/Skin/xanim/menus.png +share/mplayer/Skin/xanim/minus.png +share/mplayer/Skin/xanim/o.png +share/mplayer/Skin/xanim/play.png +share/mplayer/Skin/xanim/plus.png +share/mplayer/Skin/xanim/skin +share/mplayer/Skin/xanim/stop.png +share/mplayer/Skin/xanim/sub.png +share/mplayer/Skin/xanim/vol.png +share/mplayer/Skin/xanim/volbar.png +share/mplayer/Skin/xanim/volmin.png +share/mplayer/Skin/xanim/volplus.png +share/mplayer/Skin/xine-lcd/README +share/mplayer/Skin/xine-lcd/VERSION +share/mplayer/Skin/xine-lcd/close.png +share/mplayer/Skin/xine-lcd/dvd.png +share/mplayer/Skin/xine-lcd/eject.png +share/mplayer/Skin/xine-lcd/ffwd.png +share/mplayer/Skin/xine-lcd/font.fnt +share/mplayer/Skin/xine-lcd/font.png +share/mplayer/Skin/xine-lcd/fullsc.png +share/mplayer/Skin/xine-lcd/main-jo.png +share/mplayer/Skin/xine-lcd/main.png +share/mplayer/Skin/xine-lcd/menu.png +share/mplayer/Skin/xine-lcd/menus.png +share/mplayer/Skin/xine-lcd/minus.png +share/mplayer/Skin/xine-lcd/next.png +share/mplayer/Skin/xine-lcd/pause.png +share/mplayer/Skin/xine-lcd/play.png +share/mplayer/Skin/xine-lcd/playlist.png +share/mplayer/Skin/xine-lcd/plbutton.png +share/mplayer/Skin/xine-lcd/plus.png +share/mplayer/Skin/xine-lcd/poti.png +share/mplayer/Skin/xine-lcd/power.png +share/mplayer/Skin/xine-lcd/pref.png +share/mplayer/Skin/xine-lcd/prev.png +share/mplayer/Skin/xine-lcd/rewind.png +share/mplayer/Skin/xine-lcd/seekbar.png +share/mplayer/Skin/xine-lcd/skin +share/mplayer/Skin/xine-lcd/stop.png +share/mplayer/Skin/xine-lcd/sub.png +share/mplayer/Skin/xine-lcd/volume.png +@dirrm share/mplayer/Skin/xine-lcd +@dirrm share/mplayer/Skin/xanim +@dirrm share/mplayer/Skin/slim +@dirrm share/mplayer/Skin/proton +@dirrm share/mplayer/Skin/plastic +@dirrm share/mplayer/Skin/phony +@dirrm share/mplayer/Skin/neutron +@dirrm share/mplayer/Skin/netscape4 +@dirrm share/mplayer/Skin/mentalic +@dirrm share/mplayer/Skin/hwswskin +@dirrm share/mplayer/Skin/default +@dirrm share/mplayer/Skin/avifile +@dirrm share/mplayer/Skin/WindowsMediaPlayer6 +@dirrm share/mplayer/Skin/MidnightLove +@dirrm share/mplayer/Skin/Cyrus +@dirrm share/mplayer/Skin/CubicPlayer +@dirrm share/mplayer/Skin/CornerMP +@dirrm share/mplayer/Skin/CornerMP-aqua +@dirrm share/mplayer/Skin/BlueHeart +@dirrm share/mplayer/Skin/AlienMind +@dirrm share/mplayer/Skin diff --git a/graphics/gmplayer/distinfo b/graphics/gmplayer/distinfo index 68f92f9e2cb..f30ae1fa58d 100644 --- a/graphics/gmplayer/distinfo +++ b/graphics/gmplayer/distinfo @@ -1,42 +1,46 @@ -$NetBSD: distinfo,v 1.6 2002/05/07 22:19:28 wiz Exp $ +$NetBSD: distinfo,v 1.6.2.1 2002/06/23 18:46:24 jlam Exp $ -SHA1 (gmplayer/MPlayer-0.90pre3.tar.bz2) = 0ed1d70787488ce55699826752d492aed3425795 -Size (gmplayer/MPlayer-0.90pre3.tar.bz2) = 2322749 bytes -SHA1 (gmplayer/default.tar.bz2) = 40319dd1f8a8f2ff8b85d5efb1d4294d62530535 -Size (gmplayer/default.tar.bz2) = 167762 bytes -SHA1 (gmplayer/MidnightLove.tar.bz2) = 7eaeb8acfef8a4584485083fd6659631a05fa0f8 -Size (gmplayer/MidnightLove.tar.bz2) = 539551 bytes -SHA1 (gmplayer/avifile.tar.bz2) = 6793a51d3ddf8132e6725b32e44d0a968cb9cc7b -Size (gmplayer/avifile.tar.bz2) = 42387 bytes -SHA1 (gmplayer/BlueHeart.tar.bz2) = cbdcb731158dfc00a5b60eedd3e909ebfc357595 -Size (gmplayer/BlueHeart.tar.bz2) = 281083 bytes -SHA1 (gmplayer/WindowsMediaPlayer6.tar.bz2) = 5122b311ec609c6f9cb243fb3769b98b6bcc91ed -Size (gmplayer/WindowsMediaPlayer6.tar.bz2) = 31060 bytes -SHA1 (gmplayer/xanim.tar.bz2) = d24efe88750b04588a1c91be7a92b2ae81d5d719 -Size (gmplayer/xanim.tar.bz2) = 94551 bytes -SHA1 (gmplayer/neutron.tar.bz2) = f765dd3dd209eb1d3a64b1a6276531224c298ff1 -Size (gmplayer/neutron.tar.bz2) = 369551 bytes -SHA1 (gmplayer/plastic.tar.bz2) = 020aa23b5aad13b8041ceb88357513d9c00defb2 -Size (gmplayer/plastic.tar.bz2) = 454125 bytes -SHA1 (gmplayer/Cyrus.tar.bz2) = 0b2d882a40843ab97762f3b090dc433da4e4ae16 -Size (gmplayer/Cyrus.tar.bz2) = 228846 bytes -SHA1 (gmplayer/xine-lcd.tar.bz2) = e67e1dc03ef421191a99300e4f108bb3cc585780 -Size (gmplayer/xine-lcd.tar.bz2) = 168442 bytes -SHA1 (gmplayer/phony.tar.bz2) = 3538cdb0c1a0ba2ff677c8d3318765cfce80ebdb -Size (gmplayer/phony.tar.bz2) = 386405 bytes -SHA1 (gmplayer/mentalic.tar.bz2) = f39f934239301087a2521441db053c900338777d -Size (gmplayer/mentalic.tar.bz2) = 166624 bytes -SHA1 (gmplayer/proton.tar.bz2) = 6194df0f6f2ca126cf22ed74464103c0b50ed24a -Size (gmplayer/proton.tar.bz2) = 323339 bytes -SHA1 (gmplayer/slim.tar.bz2) = 53246aaf5520d04603e7542dec17439a9271004b -Size (gmplayer/slim.tar.bz2) = 398868 bytes -SHA1 (gmplayer/netscape4.tar.bz2) = 3a3334c4308643adce5931b0c8f037c0278d6c7b -Size (gmplayer/netscape4.tar.bz2) = 204041 bytes -SHA1 (gmplayer/CubicPlayer.tar.bz2) = 0c5e08ebc6d68e9f58d144a92fb3e3fbf07a7b05 -Size (gmplayer/CubicPlayer.tar.bz2) = 124403 bytes -SHA1 (gmplayer/AlienMind.tar.bz2) = 8bd483aa6b52c10ee826c458a2c509c90a57e0f7 -Size (gmplayer/AlienMind.tar.bz2) = 129515 bytes -SHA1 (gmplayer/CornerMP.tar.bz2) = d46a59c33abcc27ddc24be3124d3f4d23361e836 -Size (gmplayer/CornerMP.tar.bz2) = 237492 bytes -SHA1 (patch-aa) = d039ed590a0b7b92cf4a66b14810ea75a4fd02ad -SHA1 (patch-ab) = a90f1dda80a3208695e5435b63fa4f2b11689a63 +SHA1 (mplayer/MPlayer-0.90pre5.tar.bz2) = 1a78063dd055ce99985001072fb2057156f8cd2a +Size (mplayer/MPlayer-0.90pre5.tar.bz2) = 2438747 bytes +SHA1 (mplayer/default.tar.bz2) = 72eb4f088e19b20d3b861180525dffde4796a27d +Size (mplayer/default.tar.bz2) = 167746 bytes +SHA1 (mplayer/MidnightLove.tar.bz2) = 7464060fbffd8ac93402616426620a590fda8d7f +Size (mplayer/MidnightLove.tar.bz2) = 539637 bytes +SHA1 (mplayer/avifile.tar.bz2) = 8f0d7268073af4c3b098845ccd861ca4cf53e408 +Size (mplayer/avifile.tar.bz2) = 42391 bytes +SHA1 (mplayer/BlueHeart.tar.bz2) = e9a6bdbd058160f3740ad7b08c3dc4bb4095da8c +Size (mplayer/BlueHeart.tar.bz2) = 281079 bytes +SHA1 (mplayer/WindowsMediaPlayer6.tar.bz2) = 632099a4155d23fb4e9f7bb153f916cf5fbe10e9 +Size (mplayer/WindowsMediaPlayer6.tar.bz2) = 31058 bytes +SHA1 (mplayer/xanim.tar.bz2) = f1bd9bdd1d89493cafbe9f186b399876a1f41ee1 +Size (mplayer/xanim.tar.bz2) = 94545 bytes +SHA1 (mplayer/neutron.tar.bz2) = f2d0c05555f81db10fe3a191ecabd82b42a45ad4 +Size (mplayer/neutron.tar.bz2) = 369578 bytes +SHA1 (mplayer/plastic.tar.bz2) = f9c3f857c8d69da68c3a58628b664a4f0883b719 +Size (mplayer/plastic.tar.bz2) = 454108 bytes +SHA1 (mplayer/Cyrus.tar.bz2) = dbe51d7615ee37360e0f1a8d4154d8c56eb9de0d +Size (mplayer/Cyrus.tar.bz2) = 228825 bytes +SHA1 (mplayer/xine-lcd.tar.bz2) = 870fa2b3745a32a1190074bdfe54d3488c8d6789 +Size (mplayer/xine-lcd.tar.bz2) = 168433 bytes +SHA1 (mplayer/phony.tar.bz2) = fe2b6ade44b90dcec48a93ab7136ff3ed20f0066 +Size (mplayer/phony.tar.bz2) = 386388 bytes +SHA1 (mplayer/mentalic.tar.bz2) = 0952d0fcda0dc52e43683ff0c8f0ac224a2de679 +Size (mplayer/mentalic.tar.bz2) = 166612 bytes +SHA1 (mplayer/proton.tar.bz2) = d3996e9b77dcde58706fd8ec92df150e6c1a1603 +Size (mplayer/proton.tar.bz2) = 323354 bytes +SHA1 (mplayer/slim.tar.bz2) = a1ca90d1f57132df0774595842b21d25eb38446e +Size (mplayer/slim.tar.bz2) = 398881 bytes +SHA1 (mplayer/netscape4.tar.bz2) = a5f399b6c538982678956d93f320588018e125d8 +Size (mplayer/netscape4.tar.bz2) = 204050 bytes +SHA1 (mplayer/CubicPlayer.tar.bz2) = bdc11265c81760d767f4f8beb7548937b6b608ad +Size (mplayer/CubicPlayer.tar.bz2) = 124388 bytes +SHA1 (mplayer/AlienMind.tar.bz2) = 493da3837ec35e679bfaa10b8e68f3919733570a +Size (mplayer/AlienMind.tar.bz2) = 129481 bytes +SHA1 (mplayer/CornerMP.tar.bz2) = 13cd804ef51957bcf0b81d72ebf0d4ed30efcfa0 +Size (mplayer/CornerMP.tar.bz2) = 237466 bytes +SHA1 (mplayer/CornerMP-aqua.tar.bz2) = f46260401e036f5529cdb6f2be4a555f0fa0ae74 +Size (mplayer/CornerMP-aqua.tar.bz2) = 247987 bytes +SHA1 (mplayer/hwswskin.tar.bz2) = 2b5b59d2e91bfa5c01011773c71db0ab2b48edec +Size (mplayer/hwswskin.tar.bz2) = 20275 bytes +SHA1 (patch-aa) = 2c1c6f35caf047f188871ac223d672ce453c26ec +SHA1 (patch-ab) = ba4990ac8df3b79dfd452530fe4aea66e26f4e7e diff --git a/graphics/gtkam/Makefile b/graphics/gtkam/Makefile index 02f8b26df4d..e22c7ee4749 100644 --- a/graphics/gtkam/Makefile +++ b/graphics/gtkam/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2002/03/21 03:40:05 fredb Exp $ +# $NetBSD: Makefile,v 1.5.2.1 2002/06/23 18:46:25 jlam Exp $ DISTNAME= gtkam-0.1.2 PKGREVISION= 3 @@ -7,7 +7,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gphoto/} MAINTAINER= root@garbled.net HOMEPAGE= http://www.gphoto.org/gphoto2/ -COMMENT= Download and view files from various digital cameras +COMMENT= GTK+ application for downloading, saving and manipulating on images from digital cameras BUILD_USES_MSGFMT= yes diff --git a/graphics/kdegraphics3/DESCR b/graphics/kdegraphics3/DESCR new file mode 100644 index 00000000000..f134235ef9b --- /dev/null +++ b/graphics/kdegraphics3/DESCR @@ -0,0 +1,3 @@ +The kdegraphics module of KDE is a collection of graphics based programs +and plugins. Programs are included to view dvi, pdf, ps and various fax +and icon formats diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile new file mode 100644 index 00000000000..bc4e8faa047 --- /dev/null +++ b/graphics/kdegraphics3/Makefile @@ -0,0 +1,28 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:46:26 jlam Exp $ + +DISTNAME= kdegraphics-3.0.1 +CATEGORIES= graphics +COMMENT= Graphics programs for the KDE integrated X11 desktop + +.include "../../x11/kde3/Makefile.kde3" + +DEPENDS+= ghostscript>=6.01:../../print/ghostscript +#DEPENDS+= gPhoto2 +#DEPENDS+= gpio + +USE_BUILDLINK_ONLY= YES + +CONFIGURE_ARGS+= --without-kamera # requires gPhoto2, gpio + +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} == "NetBSD" +LIBS= -Wl,--export-dynamic +.endif + +#.include "../../graphics/tiff/buildlink.mk" +#.include "../../graphics/imlib/buildlink.mk" +.include "../../x11/kde3/buildlink.mk" +.include "../../x11/kdebase3/buildlink.mk" +.include "../../mk/x11.buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/graphics/kdegraphics3/PLIST b/graphics/kdegraphics3/PLIST new file mode 100644 index 00000000000..ca7fe4f1fa1 --- /dev/null +++ b/graphics/kdegraphics3/PLIST @@ -0,0 +1,263 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.2.2 2002/06/23 18:46:27 jlam Exp $ +bin/kcolorchooser +bin/kcoloredit +bin/kdvi +bin/kfax +bin/kfract +bin/kghostview +bin/kiconedit +bin/kpaint +bin/kruler +bin/ksnapshot +bin/kview +bin/kviewshell +include/kmultipageInterface.h +lib/kcolorchooser.a +lib/kcolorchooser.la +lib/kcolorchooser.so +lib/kde3/kfile_pdf.a +lib/kde3/kfile_pdf.la +lib/kde3/kfile_pdf.so +lib/kde3/kfile_png.a +lib/kde3/kfile_png.la +lib/kde3/kfile_png.so +lib/kde3/kfile_ps.a +lib/kde3/kfile_ps.la +lib/kde3/kfile_ps.so +lib/kview.a +lib/kview.la +lib/kview.so +lib/libkdvi.a +lib/libkdvi.la +lib/libkdvi.so +lib/libkfax.a +lib/libkfax.la +lib/libkfax.so +lib/libkghostview.a +lib/libkghostview.la +lib/libkghostview.so +lib/libkmultipage.a +lib/libkmultipage.la +lib/libkmultipage.so +lib/libkmultipage.so.0 +lib/libkmultipage.so.0.0 +lib/libkpagetest.a +lib/libkpagetest.la +lib/libkpagetest.so +lib/libkview_main.a +lib/libkview_main.la +lib/libkview_main.so +lib/libkview_main.so.0 +lib/libkview_main.so.0.0 +lib/libkviewerpart.a +lib/libkviewerpart.la +lib/libkviewerpart.so +lib/libkviewpart.a +lib/libkviewpart.la +lib/libkviewpart.so +share/doc/kde/HTML/en/kcoloredit/common +share/doc/kde/HTML/en/kcoloredit/index.cache.bz2 +share/doc/kde/HTML/en/kcoloredit/index.docbook +share/doc/kde/HTML/en/kdvi/KDVI-features.dvi +share/doc/kde/HTML/en/kdvi/KDVI-features.tex +share/doc/kde/HTML/en/kdvi/aboutkde.ps +share/doc/kde/HTML/en/kdvi/common +share/doc/kde/HTML/en/kdvi/index.cache.bz2 +share/doc/kde/HTML/en/kdvi/index.docbook +share/doc/kde/HTML/en/kdvi/kdvi-search.el +share/doc/kde/HTML/en/kdvi/optionrequester1.png +share/doc/kde/HTML/en/kdvi/optionrequester2.png +share/doc/kde/HTML/en/kdvi/srcltx.sty +share/doc/kde/HTML/en/kdvi/srctex.sty +share/doc/kde/HTML/en/kfract/common +share/doc/kde/HTML/en/kfract/index.cache.bz2 +share/doc/kde/HTML/en/kfract/index.docbook +share/doc/kde/HTML/en/kfract/kfract.png +share/doc/kde/HTML/en/kghostview/common +share/doc/kde/HTML/en/kghostview/index.cache.bz2 +share/doc/kde/HTML/en/kghostview/index.docbook +share/doc/kde/HTML/en/kiconedit/common +share/doc/kde/HTML/en/kiconedit/index.cache.bz2 +share/doc/kde/HTML/en/kiconedit/index.docbook +share/doc/kde/HTML/en/kooka/common +share/doc/kde/HTML/en/kooka/index.cache.bz2 +share/doc/kde/HTML/en/kooka/index.docbook +share/doc/kde/HTML/en/kooka/kooka_gocr.png +share/doc/kde/HTML/en/kooka/kooka_gocr_result.png +share/doc/kde/HTML/en/kooka/kooka_mainctrl.png +share/doc/kde/HTML/en/kpaint/common +share/doc/kde/HTML/en/kpaint/index.cache.bz2 +share/doc/kde/HTML/en/kpaint/index.docbook +share/doc/kde/HTML/en/kruler/common +share/doc/kde/HTML/en/kruler/index.cache.bz2 +share/doc/kde/HTML/en/kruler/index.docbook +share/doc/kde/HTML/en/ksnapshot/common +share/doc/kde/HTML/en/ksnapshot/index.cache.bz2 +share/doc/kde/HTML/en/ksnapshot/index.docbook +share/doc/kde/HTML/en/ksnapshot/preview.png +share/doc/kde/HTML/en/ksnapshot/window.png +share/doc/kde/HTML/en/kuickshow/common +share/doc/kde/HTML/en/kuickshow/index.cache.bz2 +share/doc/kde/HTML/en/kuickshow/index.docbook +share/doc/kde/HTML/en/kview/common +share/doc/kde/HTML/en/kview/index.cache.bz2 +share/doc/kde/HTML/en/kview/index.docbook +share/doc/kde/HTML/en/kview/snapshot1.png +share/doc/kde/HTML/en/kview/snapshot2.png +share/doc/kde/HTML/en/kview/snapshot3.png +share/doc/kde/HTML/en/kview/snapshot4.png +share/doc/kde/HTML/en/kview/snapshot5.png +share/doc/kde/HTML/en/kview/snapshot6.png +share/doc/kde/HTML/en/kview/snapshot7.png +share/doc/kde/HTML/en/kview/snapshot8.png +share/doc/kde/HTML/en/kview/snapshot9.png +share/kde/applnk/Graphics/kcolorchooser.desktop +share/kde/applnk/Graphics/kcoloredit.desktop +share/kde/applnk/Graphics/kdvi.desktop +share/kde/applnk/Graphics/kfax.desktop +share/kde/applnk/Graphics/kfract.desktop +share/kde/applnk/Graphics/kghostview.desktop +share/kde/applnk/Graphics/kiconedit.desktop +share/kde/applnk/Graphics/kpaint.desktop +share/kde/applnk/Graphics/kruler.desktop +share/kde/applnk/Graphics/ksnapshot.desktop +share/kde/applnk/Graphics/kview.desktop +share/kde/apps/kdvi/kdvi_part.rc +share/kde/apps/kdvi/tips +share/kde/apps/kdvi/toolbar/forwpage.xpm +share/kde/apps/kdvi/toolbar/largetext.xpm +share/kde/apps/kdvi/toolbar/smalltext.xpm +share/kde/apps/kfax/kfax_part.rc +share/kde/apps/kfax/pics/kfax.tif +share/kde/apps/kfax/pics/kfaxlogo.xpm +share/kde/apps/kfract/kfract.rc +share/kde/apps/kghostview/kghostviewui.rc +share/kde/apps/kghostview/kgv_part.rc +share/kde/apps/kghostview/pdf_sec.ps +share/kde/apps/kiconedit/pics/compressed.png +share/kde/apps/kiconedit/pics/source.png +share/kde/apps/kiconedit/pics/standard.png +share/kde/apps/kiconedit/toolbar/aim-cursor.xpm +share/kde/apps/kiconedit/toolbar/aim.png +share/kde/apps/kiconedit/toolbar/areaselect.png +share/kde/apps/kiconedit/toolbar/circle.png +share/kde/apps/kiconedit/toolbar/ellipse.png +share/kde/apps/kiconedit/toolbar/eraser-cursor.xpm +share/kde/apps/kiconedit/toolbar/fileclose.png +share/kde/apps/kiconedit/toolbar/filledcircle.png +share/kde/apps/kiconedit/toolbar/filledellipse.png +share/kde/apps/kiconedit/toolbar/filledrectangle.png +share/kde/apps/kiconedit/toolbar/flood-cursor.xpm +share/kde/apps/kiconedit/toolbar/flood.png +share/kde/apps/kiconedit/toolbar/grayscale.png +share/kde/apps/kiconedit/toolbar/grid.png +share/kde/apps/kiconedit/toolbar/kdepalette.png +share/kde/apps/kiconedit/toolbar/line.png +share/kde/apps/kiconedit/toolbar/newwin.png +share/kde/apps/kiconedit/toolbar/paintbrush-cursor.xpm +share/kde/apps/kiconedit/toolbar/paintbrush.png +share/kde/apps/kiconedit/toolbar/pointer.png +share/kde/apps/kiconedit/toolbar/rectangle.png +share/kde/apps/kiconedit/toolbar/selectcircle.png +share/kde/apps/kiconedit/toolbar/selectrect.png +share/kde/apps/kiconedit/toolbar/spraycan-cursor.xpm +share/kde/apps/kiconedit/toolbar/spraycan.png +share/kde/apps/kiconedit/toolbar/transform.png +share/kde/apps/kpaint/kpaint.rc +share/kde/apps/kpaint/toolbar/areaselect.xpm +share/kde/apps/kpaint/toolbar/brush.xpm +share/kde/apps/kpaint/toolbar/circle.xpm +share/kde/apps/kpaint/toolbar/ellipse.xpm +share/kde/apps/kpaint/toolbar/largetext.xpm +share/kde/apps/kpaint/toolbar/line.xpm +share/kde/apps/kpaint/toolbar/pen.xpm +share/kde/apps/kpaint/toolbar/rectangle.xpm +share/kde/apps/kpaint/toolbar/roundangle.xpm +share/kde/apps/kpaint/toolbar/spraycan.xpm +share/kde/apps/kruler/eventsrc +share/kde/apps/kruler/kruler-east.png +share/kde/apps/kruler/kruler-north.png +share/kde/apps/kruler/kruler-south.png +share/kde/apps/kruler/kruler-west.png +share/kde/apps/kruler/move.wav +share/kde/apps/kview/kview_part.rc +share/kde/apps/kview/kview_popup.rc +share/kde/apps/kview/kviewui.rc +share/kde/apps/kview/toolbar/rotate.png +share/kde/apps/kviewerpart/kviewerpart.rc +share/kde/apps/kviewshell/kviewshell.rc +share/kde/apps/kviewshell/paper-formats +share/kde/icons/hicolor/16x16/apps/kcoloredit.png +share/kde/icons/hicolor/16x16/apps/kdvi.png +share/kde/icons/hicolor/16x16/apps/kfax.png +share/kde/icons/hicolor/16x16/apps/kfract.png +share/kde/icons/hicolor/16x16/apps/kghostview.png +share/kde/icons/hicolor/16x16/apps/kiconedit.png +share/kde/icons/hicolor/16x16/apps/kpaint.png +share/kde/icons/hicolor/16x16/apps/kruler.png +share/kde/icons/hicolor/16x16/apps/ksnapshot.png +share/kde/icons/hicolor/16x16/apps/kview.png +share/kde/icons/hicolor/16x16/apps/kviewshell.png +share/kde/icons/hicolor/32x32/apps/kcoloredit.png +share/kde/icons/hicolor/32x32/apps/kdvi.png +share/kde/icons/hicolor/32x32/apps/kfax.png +share/kde/icons/hicolor/32x32/apps/kfract.png +share/kde/icons/hicolor/32x32/apps/kghostview.png +share/kde/icons/hicolor/32x32/apps/kiconedit.png +share/kde/icons/hicolor/32x32/apps/kpaint.png +share/kde/icons/hicolor/32x32/apps/kruler.png +share/kde/icons/hicolor/32x32/apps/ksnapshot.png +share/kde/icons/hicolor/32x32/apps/kview.png +share/kde/icons/hicolor/32x32/apps/kviewshell.png +share/kde/icons/hicolor/48x48/apps/kdvi.png +share/kde/icons/hicolor/48x48/apps/kfax.png +share/kde/icons/hicolor/48x48/apps/kfract.png +share/kde/icons/hicolor/48x48/apps/kghostview.png +share/kde/icons/hicolor/48x48/apps/kiconedit.png +share/kde/icons/hicolor/48x48/apps/kpaint.png +share/kde/icons/hicolor/48x48/apps/kruler.png +share/kde/icons/hicolor/48x48/apps/ksnapshot.png +share/kde/icons/hicolor/48x48/apps/kview.png +share/kde/icons/hicolor/48x48/apps/kviewshell.png +share/kde/icons/locolor/16x16/apps/kcoloredit.png +share/kde/icons/locolor/32x32/apps/kcoloredit.png +share/kde/services/kfile_pdf.desktop +share/kde/services/kfile_png.desktop +share/kde/services/kfile_ps.desktop +@comment dirrm share/kde/services +@comment dirrm share/kde/icons/locolor/32x32/apps +@comment dirrm share/kde/icons/locolor/16x16/apps +@comment dirrm share/kde/icons/hicolor/48x48/apps +@comment dirrm share/kde/icons/hicolor/32x32/apps +@comment dirrm share/kde/icons/hicolor/16x16/apps +@dirrm share/kde/apps/kviewshell +@dirrm share/kde/apps/kviewerpart +@dirrm share/kde/apps/kview/toolbar +@dirrm share/kde/apps/kview +@dirrm share/kde/apps/kruler +@dirrm share/kde/apps/kpaint/toolbar +@dirrm share/kde/apps/kpaint +@dirrm share/kde/apps/kiconedit/toolbar +@dirrm share/kde/apps/kiconedit/pics +@dirrm share/kde/apps/kiconedit +@dirrm share/kde/apps/kghostview +@dirrm share/kde/apps/kfract +@dirrm share/kde/apps/kfax/pics +@dirrm share/kde/apps/kfax +@dirrm share/kde/apps/kdvi/toolbar +@dirrm share/kde/apps/kdvi +@comment dirrm share/kde/apps +@comment dirrm share/kde/applnk/Graphics +@dirrm share/doc/kde/HTML/en/kview +@dirrm share/doc/kde/HTML/en/kuickshow +@dirrm share/doc/kde/HTML/en/ksnapshot +@dirrm share/doc/kde/HTML/en/kruler +@dirrm share/doc/kde/HTML/en/kpaint +@dirrm share/doc/kde/HTML/en/kooka +@dirrm share/doc/kde/HTML/en/kiconedit +@dirrm share/doc/kde/HTML/en/kghostview +@dirrm share/doc/kde/HTML/en/kfract +@dirrm share/doc/kde/HTML/en/kdvi +@dirrm share/doc/kde/HTML/en/kcoloredit +@comment dirrm share/doc/kde/HTML/en +@comment dirrm lib/kde3 diff --git a/graphics/kdegraphics3/distinfo b/graphics/kdegraphics3/distinfo new file mode 100644 index 00000000000..4669ba12ba0 --- /dev/null +++ b/graphics/kdegraphics3/distinfo @@ -0,0 +1,10 @@ +$NetBSD: distinfo,v 1.1.1.1.2.2 2002/06/23 18:46:28 jlam Exp $ + +SHA1 (kdegraphics-3.0.1.tar.bz2) = 577e6c3f7a51486b881ce410ee09233a0b7d754a +Size (kdegraphics-3.0.1.tar.bz2) = 2663226 bytes +SHA1 (patch-aa) = 6abaca67ea4d0fa0a5f9ac9126adb78cc15bc287 +SHA1 (patch-ab) = 2797a41da3c39cca6d39369bba767728f973e245 +SHA1 (patch-ac) = 64cd943b954af8f0b2b8875f56a43ec6d175f5c7 +SHA1 (patch-ad) = 5aadae5dda5ec9a6f66b3cf7870967291e73922b +SHA1 (patch-ae) = f9ff03ea8e1ff92126312ef28e5d5df5a17b8e57 +SHA1 (patch-af) = 9dd124174938f41124b98540da3d3548ebedbb48 diff --git a/graphics/kdegraphics3/patches/patch-aa b/graphics/kdegraphics3/patches/patch-aa new file mode 100644 index 00000000000..ef475a985fa --- /dev/null +++ b/graphics/kdegraphics3/patches/patch-aa @@ -0,0 +1,69 @@ +$NetBSD: patch-aa,v 1.1.1.1.2.2 2002/06/23 18:46:28 jlam Exp $ + +--- kfile-plugins/ps/dscparse_adapter.h.orig Thu Feb 14 20:56:51 2002 ++++ kfile-plugins/ps/dscparse_adapter.h +@@ -29,6 +29,50 @@ + #include "dscparse.h" + #undef min + ++#if defined(__GNUC__) ++#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 93) ++/* ++ * We add a quick 'n' dirty inline implementation of auto_ptr for older ++ * releases of GCC, which don't include an auto_ptr implementation in ++ * <memory>. ++ */ ++ ++template <class T> class auto_ptr { ++private: ++ T* _ptr; ++ ++public: ++ typedef T element_type; ++ explicit auto_ptr(T* p = 0) : _ptr(p) {} ++ auto_ptr(auto_ptr& a) : _ptr(a.release()) {} ++ template <class T1> auto_ptr(auto_ptr<T1>& a) : _ptr(a.release()) {} ++ auto_ptr& operator=(auto_ptr& a) { ++ if (&a != this) { ++ delete _ptr; ++ _ptr = a.release(); ++ } ++ return *this; ++ } ++ template <class T1> ++ auto_ptr& operator=(auto_ptr<T1>& a) { ++ if (a.get() != this->get()) { ++ delete _ptr; ++ _ptr = a.release(); ++ } ++ return *this; ++ } ++ ~auto_ptr() { delete _ptr; } ++ ++ T& operator*() const { return *_ptr; } ++ T* operator->() const { return _ptr; } ++ T* get() const { return _ptr; } ++ T* release() { T* tmp = _ptr; _ptr = 0; return tmp; } ++ void reset(T* p = 0) { delete _ptr; _ptr = p; } ++}; ++ ++#endif ++#endif ++ + + class KDSCBBOX + { +@@ -259,8 +303,13 @@ + CDSCMEDIA** media() const; + const CDSCMEDIA* page_media() const; + ++#if defined(__GNUC__) && (__GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 93)) ++ auto_ptr<KDSCBBOX> bbox() const; ++ auto_ptr<KDSCBBOX> page_bbox() const; ++#else + std::auto_ptr<KDSCBBOX> bbox() const; + std::auto_ptr<KDSCBBOX> page_bbox() const; ++#endif + + // CDSCDOSEPS *doseps; + diff --git a/graphics/kdegraphics3/patches/patch-ab b/graphics/kdegraphics3/patches/patch-ab new file mode 100644 index 00000000000..ada3dd8f653 --- /dev/null +++ b/graphics/kdegraphics3/patches/patch-ab @@ -0,0 +1,69 @@ +$NetBSD: patch-ab,v 1.1.1.1.2.2 2002/06/23 18:46:29 jlam Exp $ + +--- kghostview/dscparse_adapter.h.orig Thu Feb 14 20:56:52 2002 ++++ kghostview/dscparse_adapter.h +@@ -29,6 +29,50 @@ + #include "dscparse.h" + #undef min + ++#if defined(__GNUC__) ++#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 93) ++/* ++ * We add a quick 'n' dirty inline implementation of auto_ptr for older ++ * releases of GCC, which don't include an auto_ptr implementation in ++ * <memory>. ++ */ ++ ++template <class T> class auto_ptr { ++private: ++ T* _ptr; ++ ++public: ++ typedef T element_type; ++ explicit auto_ptr(T* p = 0) : _ptr(p) {} ++ auto_ptr(auto_ptr& a) : _ptr(a.release()) {} ++ template <class T1> auto_ptr(auto_ptr<T1>& a) : _ptr(a.release()) {} ++ auto_ptr& operator=(auto_ptr& a) { ++ if (&a != this) { ++ delete _ptr; ++ _ptr = a.release(); ++ } ++ return *this; ++ } ++ template <class T1> ++ auto_ptr& operator=(auto_ptr<T1>& a) { ++ if (a.get() != this->get()) { ++ delete _ptr; ++ _ptr = a.release(); ++ } ++ return *this; ++ } ++ ~auto_ptr() { delete _ptr; } ++ ++ T& operator*() const { return *_ptr; } ++ T* operator->() const { return _ptr; } ++ T* get() const { return _ptr; } ++ T* release() { T* tmp = _ptr; _ptr = 0; return tmp; } ++ void reset(T* p = 0) { delete _ptr; _ptr = p; } ++}; ++ ++#endif ++#endif ++ + + class KDSCBBOX + { +@@ -259,8 +303,13 @@ + CDSCMEDIA** media() const; + const CDSCMEDIA* page_media() const; + ++#if defined(__GNUC__) && (__GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 93)) ++ auto_ptr<KDSCBBOX> bbox() const; ++ auto_ptr<KDSCBBOX> page_bbox() const; ++#else + std::auto_ptr<KDSCBBOX> bbox() const; + std::auto_ptr<KDSCBBOX> page_bbox() const; ++#endif + + // CDSCDOSEPS *doseps; + diff --git a/graphics/kdegraphics3/patches/patch-ac b/graphics/kdegraphics3/patches/patch-ac new file mode 100644 index 00000000000..0d19cc0cba9 --- /dev/null +++ b/graphics/kdegraphics3/patches/patch-ac @@ -0,0 +1,50 @@ +$NetBSD: patch-ac,v 1.1.1.1.2.2 2002/06/23 18:46:29 jlam Exp $ + +--- kview/Makefile.am.orig Tue May 15 20:54:32 2001 ++++ kview/Makefile.am +@@ -7,25 +7,29 @@ + + METASOURCES = AUTO + +-lib_LTLIBRARIES = libkviewpart.la kview.la ++lib_LTLIBRARIES = libkviewpart.la libkview_main.la kview.la + + libkviewpart_la_SOURCES = canvas.cpp kview_view.cc kview_asyncio.cc + libkviewpart_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined + libkviewpart_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -lkdeprint + +-kview_SOURCES = dummy.C ++kview_SOURCES = kview_main.cpp + kview_LDFLAGS = $(all_libraries) $(KDE_RPATH) +-kview_LDADD = kview.la ++kview_LDADD = libkview_main.la + +-kview_la_SOURCES = main.cpp viewer.cpp kview.cpp colour.cpp \ ++libkview_main_la_SOURCES = main.cpp viewer.cpp kview.cpp colour.cpp \ + filter.cpp filtlist.cpp \ + kcproc.cpp kviewconfdialog_base.ui kviewconfdialog.cpp \ + imagelistdialog_base.ui imagelistdialog.cpp \ + knumdialog_base.ui knumdialog.cpp \ + kfilteraction.cpp infowin_base.ui infowin.cpp + +-kview_la_LDFLAGS = $(all_libraries) -module -avoid-version +-kview_la_LIBADD = libkviewpart.la ++libkview_main_la_LDFLAGS = $(all_libraries) ++libkview_main_la_LIBADD = libkviewpart.la ++ ++kview_la_SOURCES = kview_main.cpp ++kview_la_LDFLAGS = $(all_libraries) -avoid-version -module ++kview_la_LIBADD = libkview_main.la + + test_SOURCES = libkview.la test.cpp + test_LDFLAGS = $(all_libraries) -module -avoid-version +@@ -52,9 +56,6 @@ + + srcdoc: + kdoc -a -p -H -d $(HOME)/web/src/kview kview *.h -lqt -lkdecore -lkdeui -lkfile +- +-dummy.C: +- echo > dummy.C + + ###KMAKE-start (don't edit or delete this block) + diff --git a/graphics/kdegraphics3/patches/patch-ad b/graphics/kdegraphics3/patches/patch-ad new file mode 100644 index 00000000000..bd69d802865 --- /dev/null +++ b/graphics/kdegraphics3/patches/patch-ad @@ -0,0 +1,535 @@ +$NetBSD: patch-ad,v 1.1.1.1.2.2 2002/06/23 18:46:29 jlam Exp $ + +--- kview/Makefile.in.orig Wed May 8 20:05:35 2002 ++++ kview/Makefile.in +@@ -246,33 +246,37 @@ + + #>- METASOURCES = AUTO + +-lib_LTLIBRARIES = libkviewpart.la kview.la ++lib_LTLIBRARIES = libkviewpart.la libkview_main.la kview.la + + libkviewpart_la_SOURCES = canvas.cpp kview_view.cc kview_asyncio.cc + libkviewpart_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined + libkviewpart_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -lkdeprint + +-kview_SOURCES = dummy.C ++kview_SOURCES = kview_main.cpp + kview_LDFLAGS = $(all_libraries) $(KDE_RPATH) +-kview_LDADD = kview.la ++kview_LDADD = libkview_main.la + +-#>- kview_la_SOURCES = main.cpp viewer.cpp kview.cpp colour.cpp \ ++#>- libkview_main_la_SOURCES = main.cpp viewer.cpp kview.cpp colour.cpp \ + #>- filter.cpp filtlist.cpp \ + #>- kcproc.cpp kviewconfdialog_base.ui kviewconfdialog.cpp \ + #>- imagelistdialog_base.ui imagelistdialog.cpp \ + #>- knumdialog_base.ui knumdialog.cpp \ + #>- kfilteraction.cpp infowin_base.ui infowin.cpp + #>+ 6 +-kview_la_SOURCES=main.cpp viewer.cpp kview.cpp colour.cpp \ ++libkview_main_la_SOURCES=main.cpp viewer.cpp kview.cpp colour.cpp \ + filter.cpp filtlist.cpp \ + kcproc.cpp kviewconfdialog.cpp \ + imagelistdialog.cpp \ + knumdialog.cpp \ +- kfilteraction.cpp infowin.cpp kviewconfdialog_base.C imagelistdialog_base.C knumdialog_base.C infowin_base.C ++ kfilteraction.cpp infowin.cpp kviewconfdialog_base.cc imagelistdialog_base.cc knumdialog_base.cc infowin_base.cc + + +-kview_la_LDFLAGS = $(all_libraries) -module -avoid-version +-kview_la_LIBADD = libkviewpart.la ++libkview_main_la_LDFLAGS = $(all_libraries) ++libkview_main_la_LIBADD = libkviewpart.la ++ ++kview_la_SOURCES = kview_main.cpp ++kview_la_LDFLAGS = $(all_libraries) -avoid-version -module ++kview_la_LIBADD = libkview_main.la + + test_SOURCES = libkview.la test.cpp + test_LDFLAGS = $(all_libraries) -module -avoid-version +@@ -296,24 +300,29 @@ + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(lib_LTLIBRARIES) + +-kview_la_DEPENDENCIES = libkviewpart.la +-am_kview_la_OBJECTS = main.lo viewer.lo kview.lo colour.lo filter.lo \ +- filtlist.lo kcproc.lo kviewconfdialog.lo imagelistdialog.lo \ +- knumdialog.lo kfilteraction.lo infowin.lo ++kview_la_DEPENDENCIES = libkview_main.la ++am_kview_la_OBJECTS = kview_main.lo + #>- kview_la_OBJECTS = $(am_kview_la_OBJECTS) ++#>+ 1 ++kview_la_OBJECTS = kview_main.lo ++libkview_main_la_DEPENDENCIES = libkviewpart.la ++am_libkview_main_la_OBJECTS = main.lo viewer.lo kview.lo colour.lo \ ++ filter.lo filtlist.lo kcproc.lo kviewconfdialog.lo \ ++ imagelistdialog.lo knumdialog.lo kfilteraction.lo infowin.lo ++#>- libkview_main_la_OBJECTS = $(am_libkview_main_la_OBJECTS) + #>+ 7 +-kview_la_final_OBJECTS = kview_la.all_cpp.lo kview_la.all_C.lo +-kview_la_nofinal_OBJECTS = main.lo viewer.lo kview.lo colour.lo filter.lo \ +- filtlist.lo kcproc.lo kviewconfdialog.lo imagelistdialog.lo \ +- knumdialog.lo kfilteraction.lo infowin.lo kviewconfdialog_base.lo imagelistdialog_base.lo knumdialog_base.lo infowin_base.lo \ +- kview_la_meta_unload.lo +-@KDE_USE_FINAL_FALSE@kview_la_OBJECTS = $(kview_la_nofinal_OBJECTS) +-@KDE_USE_FINAL_TRUE@kview_la_OBJECTS = $(kview_la_final_OBJECTS) ++libkview_main_la_final_OBJECTS = libkview_main_la.all_cpp.lo libkview_main_la.all_cc.lo ++libkview_main_la_nofinal_OBJECTS = main.lo viewer.lo kview.lo colour.lo \ ++ filter.lo filtlist.lo kcproc.lo kviewconfdialog.lo \ ++ imagelistdialog.lo knumdialog.lo kfilteraction.lo infowin.lo kviewconfdialog_base.lo imagelistdialog_base.lo knumdialog_base.lo infowin_base.lo \ ++ libkview_main_la_meta_unload.lo ++@KDE_USE_FINAL_FALSE@libkview_main_la_OBJECTS = $(libkview_main_la_nofinal_OBJECTS) ++@KDE_USE_FINAL_TRUE@libkview_main_la_OBJECTS = $(libkview_main_la_final_OBJECTS) + libkviewpart_la_DEPENDENCIES = + am_libkviewpart_la_OBJECTS = canvas.lo kview_view.lo kview_asyncio.lo + #>- libkviewpart_la_OBJECTS = $(am_libkviewpart_la_OBJECTS) + #>+ 5 +-libkviewpart_la_final_OBJECTS = libkviewpart_la.all_cpp.lo libkviewpart_la.all_C.lo libkviewpart_la.all_cc.lo ++libkviewpart_la_final_OBJECTS = libkviewpart_la.all_cpp.lo libkviewpart_la.all_cc.lo + libkviewpart_la_nofinal_OBJECTS = canvas.lo kview_view.lo kview_asyncio.lo \ + libkviewpart_la_meta_unload.lo + @KDE_USE_FINAL_FALSE@libkviewpart_la_OBJECTS = $(libkviewpart_la_nofinal_OBJECTS) +@@ -322,11 +331,11 @@ + check_PROGRAMS = test$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) + +-am_kview_OBJECTS = dummy.$(OBJEXT) ++am_kview_OBJECTS = kview_main.$(OBJEXT) + #>- kview_OBJECTS = $(am_kview_OBJECTS) + #>+ 1 +-kview_OBJECTS = dummy.$(OBJEXT) +-kview_DEPENDENCIES = kview.la ++kview_OBJECTS = kview_main.$(OBJEXT) ++kview_DEPENDENCIES = libkview_main.la + am_test_OBJECTS = test.$(OBJEXT) + #>- test_OBJECTS = $(am_test_OBJECTS) + #>+ 1 +@@ -340,12 +349,12 @@ + LIBS = @LIBS@ + depcomp = $(SHELL) $(top_srcdir)/admin/depcomp + @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/canvas.Plo $(DEPDIR)/colour.Plo \ +- @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/filter.Plo \ +- @AMDEP_TRUE@ $(DEPDIR)/filtlist.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/filter.Plo $(DEPDIR)/filtlist.Plo \ + @AMDEP_TRUE@ $(DEPDIR)/imagelistdialog.Plo $(DEPDIR)/infowin.Plo \ + @AMDEP_TRUE@ $(DEPDIR)/kcproc.Plo $(DEPDIR)/kfilteraction.Plo \ + @AMDEP_TRUE@ $(DEPDIR)/knumdialog.Plo $(DEPDIR)/kview.Plo \ + @AMDEP_TRUE@ $(DEPDIR)/kview_asyncio.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/kview_main.Plo $(DEPDIR)/kview_main.Po \ + @AMDEP_TRUE@ $(DEPDIR)/kview_view.Plo \ + @AMDEP_TRUE@ $(DEPDIR)/kviewconfdialog.Plo $(DEPDIR)/main.Plo \ + @AMDEP_TRUE@ $(DEPDIR)/test.Po $(DEPDIR)/viewer.Plo +@@ -376,8 +385,8 @@ + CCLD = $(CC) + LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-DIST_SOURCES = $(kview_la_SOURCES) $(libkviewpart_la_SOURCES) \ +- $(kview_SOURCES) $(test_SOURCES) ++DIST_SOURCES = $(kview_la_SOURCES) $(libkview_main_la_SOURCES) \ ++ $(libkviewpart_la_SOURCES) $(kview_SOURCES) $(test_SOURCES) + DATA = $(lnk_DATA) $(part_DATA) $(rc_DATA) + + +@@ -387,14 +396,14 @@ + uninstall-recursive check-recursive installcheck-recursive + DIST_COMMON = README AUTHORS Makefile.am Makefile.in TODO + DIST_SUBDIRS = $(SUBDIRS) +-SOURCES = $(kview_la_SOURCES) $(libkviewpart_la_SOURCES) $(kview_SOURCES) $(test_SOURCES) ++SOURCES = $(kview_la_SOURCES) $(libkview_main_la_SOURCES) $(libkviewpart_la_SOURCES) $(kview_SOURCES) $(test_SOURCES) + + #>- all: all-recursive + #>+ 1 + all: docs-am all-recursive + + .SUFFIXES: +-.SUFFIXES: .C .cc .cpp .lo .o .obj ++.SUFFIXES: .cc .cpp .lo .o .obj + + mostlyclean-libtool: + -rm -f *.lo +@@ -436,6 +445,8 @@ + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + kview.la: $(kview_la_OBJECTS) $(kview_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(kview_la_LDFLAGS) $(kview_la_OBJECTS) $(kview_la_LIBADD) $(LIBS) ++libkview_main.la: $(libkview_main_la_OBJECTS) $(libkview_main_la_DEPENDENCIES) ++ $(CXXLINK) -rpath $(libdir) $(libkview_main_la_LDFLAGS) $(libkview_main_la_OBJECTS) $(libkview_main_la_LIBADD) $(LIBS) + #>- libkviewpart.la: $(libkviewpart_la_OBJECTS) $(libkviewpart_la_DEPENDENCIES) + #>+ 2 + @KDE_USE_CLOSURE_TRUE@libkviewpart.la: libkviewpart.la.closure $(libkviewpart_la_OBJECTS) $(libkviewpart_la_DEPENDENCIES) +@@ -483,7 +494,6 @@ + + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/canvas.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/colour.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/filter.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/filtlist.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/imagelistdialog.Plo@am__quote@ +@@ -493,6 +503,8 @@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/knumdialog.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kview.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kview_asyncio.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kview_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kview_main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kview_view.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kviewconfdialog.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Plo@am__quote@ +@@ -502,25 +514,6 @@ + distclean-depend: + -rm -rf $(DEPDIR) + +-.C.o: +-@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +- $(CXXCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< +- +-.C.obj: +-@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +- $(CXXCOMPILE) -c -o $@ `cygpath -w $<` +- +-.C.lo: +-@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +- $(LTCXXCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< +-CXXDEPMODE = @CXXDEPMODE@ +- + .cc.o: + @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@@ -538,6 +531,7 @@ + @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ + @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(LTCXXCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< ++CXXDEPMODE = @CXXDEPMODE@ + + .cpp.o: + @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@@ -703,7 +697,7 @@ + + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=filter.h infowin.h viewer.h kview_popup.rc kfilteraction.h imagelistdialog.h kview_part.rc infowin.cpp kview.h kviewconfdialog.cpp kfilteraction.cpp hi32-app-kview.png imagelistdialog.cpp knumdialog.h kviewui.rc kcproc.h knumdialog_base.ui kview_asyncio.h hi16-app-kview.png colour.h kcproc.cpp hi48-app-kview.png kviewconfdialog.h infowin_base.ui filtlist.h canvas.h kviewconfdialog_base.ui filter.cpp kview_view.h filtlist.cpp kview.desktop knumdialog.cpp version.h imagelistdialog_base.ui ++KDE_DIST=filter.h imagelistdialog_base.cc infowin.h viewer.h kview_popup.rc kfilteraction.h imagelistdialog.h kview_part.rc infowin.cpp kview.h kviewconfdialog.cpp kfilteraction.cpp hi32-app-kview.png imagelistdialog.cpp knumdialog.h imagelistdialog_base.C kviewconfdialog_base.C kviewui.rc kcproc.h knumdialog_base.ui kview_asyncio.h hi16-app-kview.png colour.h kview kcproc.cpp knumdialog_base.cc knumdialog_base.C hi48-app-kview.png kviewconfdialog.h kview_la_closure.C kviewconfdialog_base.h imagelistdialog_base.h infowin_base.ui libkviewpart.la.closure infowin_base.C canvas.h filtlist.h kviewconfdialog_base.ui filter.cpp kview_view.h filtlist.cpp infowin_base.cc kview.desktop knumdialog.cpp knumdialog_base.h dummy.C imagelistdialog_base.ui version.h kviewconfdialog_base.cc infowin_base.h + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + +@@ -857,9 +851,6 @@ + srcdoc: + kdoc -a -p -H -d $(HOME)/web/src/kview kview *.h -lqt -lkdecore -lkdeui -lkfile + +-dummy.C: +- echo > dummy.C +- + ###KMAKE-start (don't edit or delete this block) + + ###KMAKE-end +@@ -867,52 +858,6 @@ + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: + +-#>+ 45 +-kviewconfdialog_base.C: $(srcdir)/kviewconfdialog_base.ui kviewconfdialog_base.h kviewconfdialog_base.moc +- rm -f kviewconfdialog_base.C +- echo '#include <klocale.h>' > kviewconfdialog_base.C +- $(UIC) -tr ${UIC_TR} -i kviewconfdialog_base.h $(srcdir)/kviewconfdialog_base.ui | sed -e "s,${UIC_TR}( \"\" ),QString::null,g" | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_kviewconfdialog_base,g" >> kviewconfdialog_base.C || rm -f kviewconfdialog_base.C +- echo '#include "kviewconfdialog_base.moc"' >> kviewconfdialog_base.C +- +-kviewconfdialog_base.h: $(srcdir)/kviewconfdialog_base.ui +- $(UIC) -o kviewconfdialog_base.h $(srcdir)/kviewconfdialog_base.ui +- +-kviewconfdialog_base.moc: kviewconfdialog_base.h +- $(MOC) kviewconfdialog_base.h -o kviewconfdialog_base.moc +-imagelistdialog_base.C: $(srcdir)/imagelistdialog_base.ui imagelistdialog_base.h imagelistdialog_base.moc +- rm -f imagelistdialog_base.C +- echo '#include <klocale.h>' > imagelistdialog_base.C +- $(UIC) -tr ${UIC_TR} -i imagelistdialog_base.h $(srcdir)/imagelistdialog_base.ui | sed -e "s,${UIC_TR}( \"\" ),QString::null,g" | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_imagelistdialog_base,g" >> imagelistdialog_base.C || rm -f imagelistdialog_base.C +- echo '#include "imagelistdialog_base.moc"' >> imagelistdialog_base.C +- +-imagelistdialog_base.h: $(srcdir)/imagelistdialog_base.ui +- $(UIC) -o imagelistdialog_base.h $(srcdir)/imagelistdialog_base.ui +- +-imagelistdialog_base.moc: imagelistdialog_base.h +- $(MOC) imagelistdialog_base.h -o imagelistdialog_base.moc +-knumdialog_base.C: $(srcdir)/knumdialog_base.ui knumdialog_base.h knumdialog_base.moc +- rm -f knumdialog_base.C +- echo '#include <klocale.h>' > knumdialog_base.C +- $(UIC) -tr ${UIC_TR} -i knumdialog_base.h $(srcdir)/knumdialog_base.ui | sed -e "s,${UIC_TR}( \"\" ),QString::null,g" | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_knumdialog_base,g" >> knumdialog_base.C || rm -f knumdialog_base.C +- echo '#include "knumdialog_base.moc"' >> knumdialog_base.C +- +-knumdialog_base.h: $(srcdir)/knumdialog_base.ui +- $(UIC) -o knumdialog_base.h $(srcdir)/knumdialog_base.ui +- +-knumdialog_base.moc: knumdialog_base.h +- $(MOC) knumdialog_base.h -o knumdialog_base.moc +-infowin_base.C: $(srcdir)/infowin_base.ui infowin_base.h infowin_base.moc +- rm -f infowin_base.C +- echo '#include <klocale.h>' > infowin_base.C +- $(UIC) -tr ${UIC_TR} -i infowin_base.h $(srcdir)/infowin_base.ui | sed -e "s,${UIC_TR}( \"\" ),QString::null,g" | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_infowin_base,g" >> infowin_base.C || rm -f infowin_base.C +- echo '#include "infowin_base.moc"' >> infowin_base.C +- +-infowin_base.h: $(srcdir)/infowin_base.ui +- $(UIC) -o infowin_base.h $(srcdir)/infowin_base.ui +- +-infowin_base.moc: infowin_base.h +- $(MOC) infowin_base.h -o infowin_base.moc +- + #>+ 3 + kviewconfdialog.moc: $(srcdir)/kviewconfdialog.h + $(MOC) $(srcdir)/kviewconfdialog.h -o kviewconfdialog.moc +@@ -953,10 +898,56 @@ + kview_asyncio.moc: $(srcdir)/kview_asyncio.h + $(MOC) $(srcdir)/kview_asyncio.h -o kview_asyncio.moc + ++#>+ 45 ++kviewconfdialog_base.cc: $(srcdir)/kviewconfdialog_base.ui kviewconfdialog_base.h kviewconfdialog_base.moc ++ rm -f kviewconfdialog_base.cc ++ echo '#include <klocale.h>' > kviewconfdialog_base.cc ++ $(UIC) -tr ${UIC_TR} -i kviewconfdialog_base.h $(srcdir)/kviewconfdialog_base.ui | sed -e "s,${UIC_TR}( \"\" ),QString::null,g" | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_kviewconfdialog_base,g" >> kviewconfdialog_base.cc || rm -f kviewconfdialog_base.cc ++ echo '#include "kviewconfdialog_base.moc"' >> kviewconfdialog_base.cc ++ ++kviewconfdialog_base.h: $(srcdir)/kviewconfdialog_base.ui ++ $(UIC) -o kviewconfdialog_base.h $(srcdir)/kviewconfdialog_base.ui ++ ++kviewconfdialog_base.moc: kviewconfdialog_base.h ++ $(MOC) kviewconfdialog_base.h -o kviewconfdialog_base.moc ++imagelistdialog_base.cc: $(srcdir)/imagelistdialog_base.ui imagelistdialog_base.h imagelistdialog_base.moc ++ rm -f imagelistdialog_base.cc ++ echo '#include <klocale.h>' > imagelistdialog_base.cc ++ $(UIC) -tr ${UIC_TR} -i imagelistdialog_base.h $(srcdir)/imagelistdialog_base.ui | sed -e "s,${UIC_TR}( \"\" ),QString::null,g" | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_imagelistdialog_base,g" >> imagelistdialog_base.cc || rm -f imagelistdialog_base.cc ++ echo '#include "imagelistdialog_base.moc"' >> imagelistdialog_base.cc ++ ++imagelistdialog_base.h: $(srcdir)/imagelistdialog_base.ui ++ $(UIC) -o imagelistdialog_base.h $(srcdir)/imagelistdialog_base.ui ++ ++imagelistdialog_base.moc: imagelistdialog_base.h ++ $(MOC) imagelistdialog_base.h -o imagelistdialog_base.moc ++knumdialog_base.cc: $(srcdir)/knumdialog_base.ui knumdialog_base.h knumdialog_base.moc ++ rm -f knumdialog_base.cc ++ echo '#include <klocale.h>' > knumdialog_base.cc ++ $(UIC) -tr ${UIC_TR} -i knumdialog_base.h $(srcdir)/knumdialog_base.ui | sed -e "s,${UIC_TR}( \"\" ),QString::null,g" | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_knumdialog_base,g" >> knumdialog_base.cc || rm -f knumdialog_base.cc ++ echo '#include "knumdialog_base.moc"' >> knumdialog_base.cc ++ ++knumdialog_base.h: $(srcdir)/knumdialog_base.ui ++ $(UIC) -o knumdialog_base.h $(srcdir)/knumdialog_base.ui ++ ++knumdialog_base.moc: knumdialog_base.h ++ $(MOC) knumdialog_base.h -o knumdialog_base.moc ++infowin_base.cc: $(srcdir)/infowin_base.ui infowin_base.h infowin_base.moc ++ rm -f infowin_base.cc ++ echo '#include <klocale.h>' > infowin_base.cc ++ $(UIC) -tr ${UIC_TR} -i infowin_base.h $(srcdir)/infowin_base.ui | sed -e "s,${UIC_TR}( \"\" ),QString::null,g" | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_infowin_base,g" >> infowin_base.cc || rm -f infowin_base.cc ++ echo '#include "infowin_base.moc"' >> infowin_base.cc ++ ++infowin_base.h: $(srcdir)/infowin_base.ui ++ $(UIC) -o infowin_base.h $(srcdir)/infowin_base.ui ++ ++infowin_base.moc: infowin_base.h ++ $(MOC) infowin_base.h -o infowin_base.moc ++ + #>+ 8 + libkviewpart.la.closure: $(libkviewpart_la_OBJECTS) $(libkviewpart_la_DEPENDENCIES) +- @echo "int main() {return 0;}" > libkviewpart_la_closure.C +- @$(LTCXXCOMPILE) -c libkviewpart_la_closure.C ++ @echo "int main() {return 0;}" > libkviewpart_la_closure.cc ++ @$(LTCXXCOMPILE) -c libkviewpart_la_closure.cc + $(CXXLINK) libkviewpart_la_closure.lo $(libkviewpart_la_LDFLAGS) $(libkviewpart_la_OBJECTS) $(libkviewpart_la_LIBADD) $(LIBS) + @rm -f libkviewpart_la_closure.* libkviewpart.la.closure + @echo "timestamp" > libkviewpart.la.closure +@@ -969,10 +960,10 @@ + #>+ 7 + clean-ui: + -rm -f \ +- kviewconfdialog_base.C kviewconfdialog_base.h kviewconfdialog_base.moc \ +- imagelistdialog_base.C imagelistdialog_base.h imagelistdialog_base.moc \ +- knumdialog_base.C knumdialog_base.h knumdialog_base.moc \ +- infowin_base.C infowin_base.h infowin_base.moc ++ kviewconfdialog_base.cc kviewconfdialog_base.h kviewconfdialog_base.moc \ ++ imagelistdialog_base.cc imagelistdialog_base.h imagelistdialog_base.moc \ ++ knumdialog_base.cc knumdialog_base.h knumdialog_base.moc \ ++ infowin_base.cc infowin_base.h infowin_base.moc + + #>+ 3 + clean-closures: +@@ -1003,41 +994,41 @@ + + + #>+ 12 +-kview_la_meta_unload.C: kfilteraction.moc imagelistdialog.moc kviewconfdialog.moc infowin.moc viewer.moc kview.moc filter.moc +- @echo 'creating kview_la_meta_unload.C' +- @-rm -f kview_la_meta_unload.C ++libkview_main_la_meta_unload.cc: kfilteraction.moc imagelistdialog.moc kviewconfdialog.moc infowin.moc viewer.moc kview.moc filter.moc ++ @echo 'creating libkview_main_la_meta_unload.cc' ++ @-rm -f libkview_main_la_meta_unload.cc + @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_kview_la[] = {' > kview_la_meta_unload.C ;\ +- cat kfilteraction.moc imagelistdialog.moc kviewconfdialog.moc infowin.moc viewer.moc kview.moc filter.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kview_la_meta_unload.C ;\ +- echo '0};' >> kview_la_meta_unload.C ;\ +- echo '#include <kunload.h>' >> kview_la_meta_unload.C ;\ +- echo '_UNLOAD(kview_la)' >> kview_la_meta_unload.C ;\ +- else echo > kview_la_meta_unload.C; fi ++ echo 'static const char * _metalist_libkview_main_la[] = {' > libkview_main_la_meta_unload.cc ;\ ++ cat kfilteraction.moc imagelistdialog.moc kviewconfdialog.moc infowin.moc viewer.moc kview.moc filter.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkview_main_la_meta_unload.cc ;\ ++ echo '0};' >> libkview_main_la_meta_unload.cc ;\ ++ echo '#include <kunload.h>' >> libkview_main_la_meta_unload.cc ;\ ++ echo '_UNLOAD(libkview_main_la)' >> libkview_main_la_meta_unload.cc ;\ ++ else echo > libkview_main_la_meta_unload.cc; fi + + + #>+ 12 +-libkviewpart_la_meta_unload.C: kview_asyncio.moc canvas.moc kview_view.moc +- @echo 'creating libkviewpart_la_meta_unload.C' +- @-rm -f libkviewpart_la_meta_unload.C ++libkviewpart_la_meta_unload.cc: kview_asyncio.moc canvas.moc kview_view.moc ++ @echo 'creating libkviewpart_la_meta_unload.cc' ++ @-rm -f libkviewpart_la_meta_unload.cc + @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_libkviewpart_la[] = {' > libkviewpart_la_meta_unload.C ;\ +- cat kview_asyncio.moc canvas.moc kview_view.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkviewpart_la_meta_unload.C ;\ +- echo '0};' >> libkviewpart_la_meta_unload.C ;\ +- echo '#include <kunload.h>' >> libkviewpart_la_meta_unload.C ;\ +- echo '_UNLOAD(libkviewpart_la)' >> libkviewpart_la_meta_unload.C ;\ +- else echo > libkviewpart_la_meta_unload.C; fi ++ echo 'static const char * _metalist_libkviewpart_la[] = {' > libkviewpart_la_meta_unload.cc ;\ ++ cat kview_asyncio.moc canvas.moc kview_view.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkviewpart_la_meta_unload.cc ;\ ++ echo '0};' >> libkviewpart_la_meta_unload.cc ;\ ++ echo '#include <kunload.h>' >> libkviewpart_la_meta_unload.cc ;\ ++ echo '_UNLOAD(libkviewpart_la)' >> libkviewpart_la_meta_unload.cc ;\ ++ else echo > libkviewpart_la_meta_unload.cc; fi + + + #>+ 3 + clean-moc-classes: +- -rm -f kview_la_meta_unload.C libkviewpart_la_meta_unload.C ++ -rm -f libkview_main_la_meta_unload.cc libkviewpart_la_meta_unload.cc + + #>+ 11 +-kview_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/viewer.cpp $(srcdir)/kview.cpp $(srcdir)/colour.cpp $(srcdir)/filter.cpp $(srcdir)/filtlist.cpp $(srcdir)/kcproc.cpp $(srcdir)/kviewconfdialog.cpp $(srcdir)/imagelistdialog.cpp $(srcdir)/knumdialog.cpp $(srcdir)/kfilteraction.cpp $(srcdir)/infowin.cpp kviewconfdialog_base.moc imagelistdialog_base.moc knumdialog_base.moc infowin_base.moc kviewconfdialog.moc canvas.moc infowin.moc viewer.moc kview_view.moc kfilteraction.moc kview.moc imagelistdialog.moc filter.moc kview_asyncio.moc ++kview_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kview_main.cpp kviewconfdialog.moc canvas.moc infowin.moc viewer.moc kview_view.moc kfilteraction.moc kview.moc imagelistdialog.moc filter.moc kview_asyncio.moc + @echo 'creating kview_la.all_cpp.cpp ...'; \ + rm -f kview_la.all_cpp.files kview_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kview_la.all_cpp.final; \ +- for file in main.cpp viewer.cpp kview.cpp colour.cpp filter.cpp filtlist.cpp kcproc.cpp kviewconfdialog.cpp imagelistdialog.cpp knumdialog.cpp kfilteraction.cpp infowin.cpp ; do \ ++ for file in kview_main.cpp ; do \ + echo "#include \"$$file\"" >> kview_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kview_la.all_cpp.final; \ + done; \ +@@ -1045,16 +1036,28 @@ + rm -f kview_la.all_cpp.final kview_la.all_cpp.files + + #>+ 11 +-kview_la.all_C.C: $(srcdir)/Makefile.in kviewconfdialog_base.C imagelistdialog_base.C knumdialog_base.C infowin_base.C kview_la_meta_unload.C kviewconfdialog_base.moc imagelistdialog_base.moc knumdialog_base.moc infowin_base.moc kviewconfdialog.moc canvas.moc infowin.moc viewer.moc kview_view.moc kfilteraction.moc kview.moc imagelistdialog.moc filter.moc kview_asyncio.moc +- @echo 'creating kview_la.all_C.C ...'; \ +- rm -f kview_la.all_C.files kview_la.all_C.final; \ +- echo "#define KDE_USE_FINAL 1" >> kview_la.all_C.final; \ +- for file in kviewconfdialog_base.C imagelistdialog_base.C knumdialog_base.C infowin_base.C kview_la_meta_unload.C ; do \ +- echo "#include \"$$file\"" >> kview_la.all_C.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kview_la.all_C.final; \ ++libkview_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/viewer.cpp $(srcdir)/kview.cpp $(srcdir)/colour.cpp $(srcdir)/filter.cpp $(srcdir)/filtlist.cpp $(srcdir)/kcproc.cpp $(srcdir)/kviewconfdialog.cpp $(srcdir)/imagelistdialog.cpp $(srcdir)/knumdialog.cpp $(srcdir)/kfilteraction.cpp $(srcdir)/infowin.cpp kviewconfdialog_base.moc imagelistdialog_base.moc knumdialog_base.moc infowin_base.moc ++ @echo 'creating libkview_main_la.all_cpp.cpp ...'; \ ++ rm -f libkview_main_la.all_cpp.files libkview_main_la.all_cpp.final; \ ++ echo "#define KDE_USE_FINAL 1" >> libkview_main_la.all_cpp.final; \ ++ for file in main.cpp viewer.cpp kview.cpp colour.cpp filter.cpp filtlist.cpp kcproc.cpp kviewconfdialog.cpp imagelistdialog.cpp knumdialog.cpp kfilteraction.cpp infowin.cpp ; do \ ++ echo "#include \"$$file\"" >> libkview_main_la.all_cpp.files; \ ++ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkview_main_la.all_cpp.final; \ ++ done; \ ++ cat libkview_main_la.all_cpp.final libkview_main_la.all_cpp.files > libkview_main_la.all_cpp.cpp; \ ++ rm -f libkview_main_la.all_cpp.final libkview_main_la.all_cpp.files ++ ++#>+ 11 ++libkview_main_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kviewconfdialog_base.cc $(srcdir)/imagelistdialog_base.cc $(srcdir)/knumdialog_base.cc $(srcdir)/infowin_base.cc $(srcdir)/libkview_main_la_meta_unload.cc kviewconfdialog_base.moc imagelistdialog_base.moc knumdialog_base.moc infowin_base.moc ++ @echo 'creating libkview_main_la.all_cc.cc ...'; \ ++ rm -f libkview_main_la.all_cc.files libkview_main_la.all_cc.final; \ ++ echo "#define KDE_USE_FINAL 1" >> libkview_main_la.all_cc.final; \ ++ for file in kviewconfdialog_base.cc imagelistdialog_base.cc knumdialog_base.cc infowin_base.cc libkview_main_la_meta_unload.cc ; do \ ++ echo "#include \"$$file\"" >> libkview_main_la.all_cc.files; \ ++ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkview_main_la.all_cc.final; \ + done; \ +- cat kview_la.all_C.final kview_la.all_C.files > kview_la.all_C.C; \ +- rm -f kview_la.all_C.final kview_la.all_C.files ++ cat libkview_main_la.all_cc.final libkview_main_la.all_cc.files > libkview_main_la.all_cc.cc; \ ++ rm -f libkview_main_la.all_cc.final libkview_main_la.all_cc.files + + #>+ 11 + libkviewpart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/canvas.cpp +@@ -1069,23 +1072,11 @@ + rm -f libkviewpart_la.all_cpp.final libkviewpart_la.all_cpp.files + + #>+ 11 +-libkviewpart_la.all_C.C: $(srcdir)/Makefile.in libkviewpart_la_meta_unload.C +- @echo 'creating libkviewpart_la.all_C.C ...'; \ +- rm -f libkviewpart_la.all_C.files libkviewpart_la.all_C.final; \ +- echo "#define KDE_USE_FINAL 1" >> libkviewpart_la.all_C.final; \ +- for file in libkviewpart_la_meta_unload.C ; do \ +- echo "#include \"$$file\"" >> libkviewpart_la.all_C.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkviewpart_la.all_C.final; \ +- done; \ +- cat libkviewpart_la.all_C.final libkviewpart_la.all_C.files > libkviewpart_la.all_C.C; \ +- rm -f libkviewpart_la.all_C.final libkviewpart_la.all_C.files +- +-#>+ 11 +-libkviewpart_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kview_view.cc $(srcdir)/kview_asyncio.cc ++libkviewpart_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kview_view.cc $(srcdir)/kview_asyncio.cc $(srcdir)/libkviewpart_la_meta_unload.cc + @echo 'creating libkviewpart_la.all_cc.cc ...'; \ + rm -f libkviewpart_la.all_cc.files libkviewpart_la.all_cc.final; \ + echo "#define KDE_USE_FINAL 1" >> libkviewpart_la.all_cc.final; \ +- for file in kview_view.cc kview_asyncio.cc ; do \ ++ for file in kview_view.cc kview_asyncio.cc libkviewpart_la_meta_unload.cc ; do \ + echo "#include \"$$file\"" >> libkviewpart_la.all_cc.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkviewpart_la.all_cc.final; \ + done; \ +@@ -1093,16 +1084,16 @@ + rm -f libkviewpart_la.all_cc.final libkviewpart_la.all_cc.files + + #>+ 11 +-kview.all_C.C: $(srcdir)/Makefile.in dummy.C +- @echo 'creating kview.all_C.C ...'; \ +- rm -f kview.all_C.files kview.all_C.final; \ +- echo "#define KDE_USE_FINAL 1" >> kview.all_C.final; \ +- for file in dummy.C ; do \ +- echo "#include \"$$file\"" >> kview.all_C.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kview.all_C.final; \ ++kview.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kview_main.cpp ++ @echo 'creating kview.all_cpp.cpp ...'; \ ++ rm -f kview.all_cpp.files kview.all_cpp.final; \ ++ echo "#define KDE_USE_FINAL 1" >> kview.all_cpp.final; \ ++ for file in kview_main.cpp ; do \ ++ echo "#include \"$$file\"" >> kview.all_cpp.files; \ ++ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kview.all_cpp.final; \ + done; \ +- cat kview.all_C.final kview.all_C.files > kview.all_C.C; \ +- rm -f kview.all_C.final kview.all_C.files ++ cat kview.all_cpp.final kview.all_cpp.files > kview.all_cpp.cpp; \ ++ rm -f kview.all_cpp.final kview.all_cpp.files + + #>+ 11 + test.all_cpp.cpp: $(srcdir)/Makefile.in test.cpp +@@ -1118,20 +1109,20 @@ + + #>+ 3 + clean-final: +- -rm -f kview_la.all_cpp.cpp kview_la.all_C.C libkviewpart_la.all_cpp.cpp libkviewpart_la.all_C.C libkviewpart_la.all_cc.cc kview.all_C.C test.all_cpp.cpp ++ -rm -f kview_la.all_cpp.cpp libkview_main_la.all_cpp.cpp libkview_main_la.all_cc.cc libkviewpart_la.all_cpp.cpp libkviewpart_la.all_cc.cc kview.all_cpp.cpp test.all_cpp.cpp + + #>+ 2 + final: +- $(MAKE) kview_la_OBJECTS="$(kview_la_final_OBJECTS)" libkviewpart_la_OBJECTS="$(libkviewpart_la_final_OBJECTS)" all-am ++ $(MAKE) libkview_main_la_OBJECTS="$(libkview_main_la_final_OBJECTS)" libkviewpart_la_OBJECTS="$(libkviewpart_la_final_OBJECTS)" all-am + #>+ 2 + final-install: +- $(MAKE) kview_la_OBJECTS="$(kview_la_final_OBJECTS)" libkviewpart_la_OBJECTS="$(libkviewpart_la_final_OBJECTS)" install-am ++ $(MAKE) libkview_main_la_OBJECTS="$(libkview_main_la_final_OBJECTS)" libkviewpart_la_OBJECTS="$(libkviewpart_la_final_OBJECTS)" install-am + #>+ 2 + no-final: +- $(MAKE) kview_la_OBJECTS="$(kview_la_nofinal_OBJECTS)" libkviewpart_la_OBJECTS="$(libkviewpart_la_nofinal_OBJECTS)" all-am ++ $(MAKE) libkview_main_la_OBJECTS="$(libkview_main_la_nofinal_OBJECTS)" libkviewpart_la_OBJECTS="$(libkviewpart_la_nofinal_OBJECTS)" all-am + #>+ 2 + no-final-install: +- $(MAKE) kview_la_OBJECTS="$(kview_la_nofinal_OBJECTS)" libkviewpart_la_OBJECTS="$(libkviewpart_la_nofinal_OBJECTS)" install-am ++ $(MAKE) libkview_main_la_OBJECTS="$(libkview_main_la_nofinal_OBJECTS)" libkviewpart_la_OBJECTS="$(libkviewpart_la_nofinal_OBJECTS)" install-am + #>+ 3 + cvs-clean: + $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/graphics/kdegraphics3/patches/patch-ae b/graphics/kdegraphics3/patches/patch-ae new file mode 100644 index 00000000000..8a66f63b9ac --- /dev/null +++ b/graphics/kdegraphics3/patches/patch-ae @@ -0,0 +1,33 @@ +$NetBSD: patch-ae,v 1.1.1.1.2.2 2002/06/23 18:46:30 jlam Exp $ + +--- kview/kview_main.cpp.orig Wed Jun 5 09:01:42 2002 ++++ kview/kview_main.cpp +@@ -0,0 +1,28 @@ ++/* ++ * ++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a copy ++ * of this software and associated documentation files (the "Software"), to deal ++ * in the Software without restriction, including without limitation the rights ++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++ * copies of the Software, and to permit persons to whom the Software is ++ * furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in ++ * all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ */ ++ ++extern "C" int kdemain(int, char* []); ++ ++int main( int argc, char* argv[] ) ++{ ++ return kdemain(argc, argv); ++} diff --git a/graphics/kdegraphics3/patches/patch-af b/graphics/kdegraphics3/patches/patch-af new file mode 100644 index 00000000000..edc5f9205b9 --- /dev/null +++ b/graphics/kdegraphics3/patches/patch-af @@ -0,0 +1,15 @@ +$NetBSD: patch-af,v 1.1.1.1.2.2 2002/06/23 18:46:30 jlam Exp $ + +--- kview/main.cpp.orig Wed Dec 5 12:00:13 2001 ++++ kview/main.cpp +@@ -11,7 +11,9 @@ + { 0, 0, 0 } + }; + +-int main( int argc, char *argv[] ) ++extern "C" int kdemain( int, char *[] ); ++ ++int kdemain( int argc, char *argv[] ) + { + KCmdLineArgs::init( argc, argv, KViewPart::createAboutData() ); + KCmdLineArgs::addCmdLineOptions( options ); // Add our own options. diff --git a/graphics/lcms/distinfo b/graphics/lcms/distinfo index 2c2c67b929c..dfac4d8f5d9 100644 --- a/graphics/lcms/distinfo +++ b/graphics/lcms/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.5 2002/03/15 11:12:57 markd Exp $ +$NetBSD: distinfo,v 1.5.2.1 2002/06/23 18:46:30 jlam Exp $ SHA1 (lcms-1.06.tar.gz) = 3c9e99eb50598a0346c07fb1cacbf6cc4841001b Size (lcms-1.06.tar.gz) = 644116 bytes SHA1 (patch-aa) = 52102849563445b39eb8e504e9c6001af84bdbd5 -SHA1 (patch-ab) = 1b1112ce3b412dde44d9daf367b5f3a7c6566b92 +SHA1 (patch-ab) = a1b7b2bcc710b9671bc082ddda981b5a6cd5c5b8 diff --git a/graphics/lcms/patches/patch-ab b/graphics/lcms/patches/patch-ab index 339317a9032..954ac4ace4f 100644 --- a/graphics/lcms/patches/patch-ab +++ b/graphics/lcms/patches/patch-ab @@ -1,7 +1,6 @@ -$NetBSD: patch-ab,v 1.4 2002/03/15 11:12:57 markd Exp $ - ---- source/cmsmtrx.c Thu May 18 18:08:13 2000 -+++ source/cmsmtrx.c Mon Oct 30 09:53:39 2000 +$NetBSD: patch-ab,v 1.4.2.1 2002/06/23 18:46:31 jlam Exp $ +--- source/cmsmtrx.c.orig Thu May 18 23:08:13 2000 ++++ source/cmsmtrx.c Tue May 14 22:38:58 2002 @@ -31,6 +31,7 @@ // Vector & Matrix stuff @@ -10,12 +9,18 @@ $NetBSD: patch-ab,v 1.4 2002/03/15 11:12:57 markd Exp $ void cdecl VEC3init(LPVEC3 r, double x, double y, double z); -@@ -248,7 +249,12 @@ +@@ -242,13 +243,18 @@ + // support asm at all. Use with care, since this will slow down + // all operations + ++#include <sys/param.h> + Fixed32 FixedMul(Fixed32 a, Fixed32 b) + { + // If newest __int64 defined, then use it #ifdef USE_INT64 - __int64 l = (__int64) a * b + 0x8000i64; -+#include <sys/param.h> +#if (defined(BSD) && BSD >= 199506) + u_int64_t l = (u_int64_t) a * b + (u_int64_t)0x8000; +#else diff --git a/graphics/libart2/DESCR b/graphics/libart2/DESCR new file mode 100644 index 00000000000..301a084aeb8 --- /dev/null +++ b/graphics/libart2/DESCR @@ -0,0 +1,12 @@ +Libart is a library for high-performance 2D graphics. It is currently +being used as the antialiased rendering engine for the Gnome Canvas. +It is also the rendering engine for Gill, the Gnome Illustration app. + +Libart supports a very powerful imaging model, basically the same as +SVG and the Java 2D API. It includes all PostScript imaging +operations, and adds antialiasing and alpha-transparency. + +Libart is also highly tuned for incremental rendering. It contains +data structures and algorithms suited to rapid, precise computation +of Region of Interest, as well as a two-phase rendering pipeline +optimized for interactive display. diff --git a/graphics/libart2/Makefile b/graphics/libart2/Makefile new file mode 100644 index 00000000000..816b43e3498 --- /dev/null +++ b/graphics/libart2/Makefile @@ -0,0 +1,19 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:46:33 jlam Exp $ + +DISTNAME= libart_lgpl-2.3.8 +PKGNAME= libart2-2.3.8 +CATEGORIES= graphics +MASTER_SITES= ${MASTER_SITE_GNOME:=pre-gnome2/sources/libart_lgpl/} +EXTRACT_SUFX= .tar.bz2 + +MAINTAINER= jmmv@hispabsd.org +HOMEPAGE= http://www.levien.com/libart/ +COMMENT= High-performance 2D graphics library + +GNU_CONFIGURE= YES +USE_BUILDLINK_ONLY= YES +USE_LIBTOOL= YES +USE_X11BASE= YES +LIBTOOL_OVERRIDE= ${WRKSRC}/libtool + +.include "../../mk/bsd.pkg.mk" diff --git a/graphics/libart2/PLIST b/graphics/libart2/PLIST new file mode 100644 index 00000000000..d91c4fd8479 --- /dev/null +++ b/graphics/libart2/PLIST @@ -0,0 +1,54 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.2.2 2002/06/23 18:46:33 jlam Exp $ +bin/libart2-config +include/libart-2.0/libart_lgpl/art_affine.h +include/libart-2.0/libart_lgpl/art_alphagamma.h +include/libart-2.0/libart_lgpl/art_bpath.h +include/libart-2.0/libart_lgpl/art_config.h +include/libart-2.0/libart_lgpl/art_filterlevel.h +include/libart-2.0/libart_lgpl/art_gray_svp.h +include/libart-2.0/libart_lgpl/art_misc.h +include/libart-2.0/libart_lgpl/art_pathcode.h +include/libart-2.0/libart_lgpl/art_pixbuf.h +include/libart-2.0/libart_lgpl/art_point.h +include/libart-2.0/libart_lgpl/art_rect.h +include/libart-2.0/libart_lgpl/art_rect_svp.h +include/libart-2.0/libart_lgpl/art_rect_uta.h +include/libart-2.0/libart_lgpl/art_render.h +include/libart-2.0/libart_lgpl/art_render_gradient.h +include/libart-2.0/libart_lgpl/art_render_mask.h +include/libart-2.0/libart_lgpl/art_render_svp.h +include/libart-2.0/libart_lgpl/art_rgb.h +include/libart-2.0/libart_lgpl/art_rgb_a_affine.h +include/libart-2.0/libart_lgpl/art_rgb_affine.h +include/libart-2.0/libart_lgpl/art_rgb_bitmap_affine.h +include/libart-2.0/libart_lgpl/art_rgb_pixbuf_affine.h +include/libart-2.0/libart_lgpl/art_rgb_rgba_affine.h +include/libart-2.0/libart_lgpl/art_rgb_svp.h +include/libart-2.0/libart_lgpl/art_rgba.h +include/libart-2.0/libart_lgpl/art_svp.h +include/libart-2.0/libart_lgpl/art_svp_intersect.h +include/libart-2.0/libart_lgpl/art_svp_ops.h +include/libart-2.0/libart_lgpl/art_svp_point.h +include/libart-2.0/libart_lgpl/art_svp_render_aa.h +include/libart-2.0/libart_lgpl/art_svp_vpath.h +include/libart-2.0/libart_lgpl/art_svp_vpath_stroke.h +include/libart-2.0/libart_lgpl/art_svp_wind.h +include/libart-2.0/libart_lgpl/art_uta.h +include/libart-2.0/libart_lgpl/art_uta_ops.h +include/libart-2.0/libart_lgpl/art_uta_rect.h +include/libart-2.0/libart_lgpl/art_uta_svp.h +include/libart-2.0/libart_lgpl/art_uta_vpath.h +include/libart-2.0/libart_lgpl/art_vpath.h +include/libart-2.0/libart_lgpl/art_vpath_bpath.h +include/libart-2.0/libart_lgpl/art_vpath_dash.h +include/libart-2.0/libart_lgpl/art_vpath_svp.h +include/libart-2.0/libart_lgpl/libart-features.h +include/libart-2.0/libart_lgpl/libart.h +lib/libart_lgpl_2.a +lib/libart_lgpl_2.la +lib/libart_lgpl_2.so +lib/libart_lgpl_2.so.5 +lib/libart_lgpl_2.so.5.8 +lib/pkgconfig/libart-2.0.pc +@dirrm include/libart-2.0/libart_lgpl +@dirrm include/libart-2.0 diff --git a/graphics/libart2/buildlink.mk b/graphics/libart2/buildlink.mk new file mode 100644 index 00000000000..d09cf19ccee --- /dev/null +++ b/graphics/libart2/buildlink.mk @@ -0,0 +1,36 @@ +# $NetBSD: buildlink.mk,v 1.1.1.1.2.2 2002/06/23 18:46:34 jlam Exp $ +# +# This Makefile fragment is included by packages that use the library +# provided by libart2. +# +# To use this Makefile fragment, simply: +# +# (1) Optionally define BUILDLINK_DEPENDS.libart2 to the dependency +# pattern for the version of libart2 desired. +# (2) Include this Makefile fragment in the package Makefile, +# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header +# search path, and +# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search +# path. + +.if !defined(LIBART2_BUILDLINK_MK) +LIBART2_BUILDLINK_MK= # defined + +.include "../../mk/bsd.buildlink.mk" + +BUILDLINK_DEPENDS.libart2?= libart2>=2.3.8 +DEPENDS+= ${BUILDLINK_DEPENDS.libart2}:../../graphics/libart2 + +EVAL_PREFIX+= BUILDLINK_PREFIX.libart2=libart2 +BUILDLINK_PREFIX.libart2= ${LOCALBASE} +BUILDLINK_FILES.libart2= bin/libart22-config +BUILDLINK_FILES.libart2+= include/libart2-2.0/libart2_lgpl/* +BUILDLINK_FILES.libart2+= lib/libart2_lgpl_2.* + +BUILDLINK_TARGETS.libart2= libart2-buildlink +BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.libart2} + +pre-configure: ${BUILDLINK_TARGETS.libart2} +libart2-buildlink: _BUILDLINK_USE + +.endif # LIBART2_BUILDLINK_MK diff --git a/graphics/libart2/distinfo b/graphics/libart2/distinfo new file mode 100644 index 00000000000..91af4e612bd --- /dev/null +++ b/graphics/libart2/distinfo @@ -0,0 +1,4 @@ +$NetBSD: distinfo,v 1.1.1.1.2.2 2002/06/23 18:46:35 jlam Exp $ + +SHA1 (libart_lgpl-2.3.8.tar.bz2) = f87fe20d8135a5778112aea28698f6022a779a06 +Size (libart_lgpl-2.3.8.tar.bz2) = 205615 bytes diff --git a/graphics/magicpoint/Makefile b/graphics/magicpoint/Makefile index fc2026ebbed..ab1a0f19c74 100644 --- a/graphics/magicpoint/Makefile +++ b/graphics/magicpoint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2002/03/13 17:37:12 fredb Exp $ +# $NetBSD: Makefile,v 1.29.2.1 2002/06/23 18:46:36 jlam Exp $ DISTNAME= magicpoint-1.09a PKGREVISION= 1 @@ -47,5 +47,5 @@ post-install: .include "../../graphics/libungif/buildlink.mk" .include "../../graphics/mng/buildlink.mk" .include "../../graphics/png/buildlink.mk" -.include "../../japanese/vflib-lib/buildlink.mk" +.include "../../print/ja-vflib-lib/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/mencoder/DESCR b/graphics/mencoder/DESCR new file mode 100644 index 00000000000..f33fc96b949 --- /dev/null +++ b/graphics/mencoder/DESCR @@ -0,0 +1,6 @@ +mencoder (MPlayer's Movie Encoder) is a simple movie encoder, designed to +encode MPlayer-playable movies (AVI/ASF/OGG/DVD/VCD/VOB/MPG/MOV/VIV/FLI/ +RM/NUV/NET) to other MPlayer-playable formats. It encodes to DivX4 (1, +2 or 3 passes), XviD, codecs of libavcodec, PCM/MP3/VBRMP3 audio. Also +has stream copying abilities, a powerfull plugin system (crop, expand, +flip, postprocess, rotate, scale, rgb/yuv conversion) and more. diff --git a/graphics/mencoder/Makefile b/graphics/mencoder/Makefile new file mode 100644 index 00000000000..408f756caa2 --- /dev/null +++ b/graphics/mencoder/Makefile @@ -0,0 +1,18 @@ +# $NetBSD: Makefile,v 1.2.2.2 2002/06/23 18:46:37 jlam Exp $ + +.include "../../graphics/mplayer-share/Makefile.common" + +PKGNAME= mencoder-${MPLAYER_PKG_VERSION} +COMMENT= Simple movie encoder for MPlayer-playable movies + +CONFIGURE_ARGS+= --disable-nas + +ALL_TARGET= mencoder + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/mencoder ${PREFIX}/bin + ${LN} -s ${PREFIX}/man/man1/mplayer.1 ${PREFIX}/man/man1/mencoder.1 + +.include "../../audio/lame/buildlink.mk" +.include "../../graphics/mplayer-share/Makefile.depends" +.include "../../mk/bsd.pkg.mk" diff --git a/graphics/mencoder/PLIST b/graphics/mencoder/PLIST new file mode 100644 index 00000000000..0af4a90774d --- /dev/null +++ b/graphics/mencoder/PLIST @@ -0,0 +1,3 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.4.2 2002/06/23 18:46:37 jlam Exp $ +bin/mencoder +man/man1/mencoder.1 diff --git a/graphics/mencoder/distinfo b/graphics/mencoder/distinfo new file mode 100644 index 00000000000..fb8b9b4d3cf --- /dev/null +++ b/graphics/mencoder/distinfo @@ -0,0 +1,6 @@ +$NetBSD: distinfo,v 1.3.2.2 2002/06/23 18:46:38 jlam Exp $ + +SHA1 (mplayer/MPlayer-0.90pre5.tar.bz2) = 1a78063dd055ce99985001072fb2057156f8cd2a +Size (mplayer/MPlayer-0.90pre5.tar.bz2) = 2438747 bytes +SHA1 (patch-aa) = 2c1c6f35caf047f188871ac223d672ce453c26ec +SHA1 (patch-ab) = ba4990ac8df3b79dfd452530fe4aea66e26f4e7e diff --git a/graphics/mpgtx/DESCR b/graphics/mpgtx/DESCR new file mode 100644 index 00000000000..beae72ed1bc --- /dev/null +++ b/graphics/mpgtx/DESCR @@ -0,0 +1,5 @@ +mpgtx a command line MPEG audio/video/system file toolbox. + +mpgtx was designed with the good old Unix philosophy in mind: do +few but do it well and provide end user an austary yet powerful +command line interface. diff --git a/graphics/mpgtx/Makefile b/graphics/mpgtx/Makefile new file mode 100644 index 00000000000..954ea73c70a --- /dev/null +++ b/graphics/mpgtx/Makefile @@ -0,0 +1,17 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:46:39 jlam Exp $ +# + +DISTNAME= mpgtx-1.0-1-src +PKGNAME= mpgtx-1.0 +CATEGORIES= audio graphics +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mpgtx/} +EXTRACT_SUFX= .tgz + +MAINTAINER= packages@netbsd.org +HOMEPAGE= http://mpgtx.sourceforge.net/ +COMMENT= Split and join MPEG files in various ways + +WRKSRC= ${WRKDIR}/mpgtx-1.0 +MAKE_ENV= BSD_INSTALL=${INSTALL} + +.include "../../mk/bsd.pkg.mk" diff --git a/graphics/mpgtx/PLIST b/graphics/mpgtx/PLIST new file mode 100644 index 00000000000..be34a2fb2d1 --- /dev/null +++ b/graphics/mpgtx/PLIST @@ -0,0 +1,15 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.50.2 2002/06/23 18:46:39 jlam Exp $ +bin/mpgcat +bin/mpgdemux +bin/mpginfo +bin/mpgjoin +bin/mpgsplit +bin/mpgtx +bin/tagmp3 +man/man1/mpgcat.1 +man/man1/mpgdemux.1 +man/man1/mpginfo.1 +man/man1/mpgjoin.1 +man/man1/mpgsplit.1 +man/man1/mpgtx.1 +man/man1/tagmp3.1 diff --git a/graphics/mpgtx/distinfo b/graphics/mpgtx/distinfo new file mode 100644 index 00000000000..a69de041224 --- /dev/null +++ b/graphics/mpgtx/distinfo @@ -0,0 +1,5 @@ +$NetBSD: distinfo,v 1.1.1.1.2.2 2002/06/23 18:46:40 jlam Exp $ + +SHA1 (mpgtx-1.0-1-src.tgz) = 677f7c09d876ad0429d42b06ca001a9034a69ac9 +Size (mpgtx-1.0-1-src.tgz) = 70063 bytes +SHA1 (patch-aa) = 45812e7ad44f3815a696105365c4903456c7c50e diff --git a/graphics/mpgtx/patches/patch-aa b/graphics/mpgtx/patches/patch-aa new file mode 100644 index 00000000000..8c5855a639c --- /dev/null +++ b/graphics/mpgtx/patches/patch-aa @@ -0,0 +1,70 @@ +$NetBSD: patch-aa,v 1.1.1.1.2.2 2002/06/23 18:46:40 jlam Exp $ + +--- Makefile.orig Mon Jul 23 12:30:24 2001 ++++ Makefile +@@ -1,5 +1,4 @@ + # installation dirs : Edit at your convenance +-PREFIX=/usr + INSTALLDIR=$(PREFIX)/bin + MANDIR=$(PREFIX)/man/man1 + +@@ -12,19 +11,19 @@ + STATIC_LFLAGS= -static -s + DEVEL_LFLAGS= #-lefence + +-default : devel ++all : shared + + # here are the default targets + nocatch: +- make mpgtx 'CFLAGS=$(DEVEL_CFLAGS) -DNOSIGNAL_H' 'LFLAGS=$(DEVEL_LFLAGS)' ++ $(MAKE) mpgtx 'CFLAGS=$(DEVEL_CFLAGS) -DNOSIGNAL_H' 'LFLAGS=$(DEVEL_LFLAGS)' + debug: +- make mpgtx 'CFLAGS=$(DEVEL_CFLAGS) -D_DEBUG_' 'LFLAGS=$(DEVEL_LFLAGS)' ++ $(MAKE) mpgtx 'CFLAGS=$(DEVEL_CFLAGS) -D_DEBUG_' 'LFLAGS=$(DEVEL_LFLAGS)' + devel: +- make mpgtx 'CFLAGS=$(DEVEL_CFLAGS)' 'LFLAGS=$(DEVEL_LFLAGS)' ++ $(MAKE) mpgtx 'CFLAGS=$(DEVEL_CFLAGS)' 'LFLAGS=$(DEVEL_LFLAGS)' + shared: +- make mpgtx 'CFLAGS=$(RELEASE_CFLAGS)' 'LFLAGS=$(SHARED_LFLAGS)' ++ $(MAKE) mpgtx 'CFLAGS=$(RELEASE_CFLAGS)' 'LFLAGS=$(SHARED_LFLAGS)' + static: +- make mpgtx 'CFLAGS=$(RELEASE_CFLAGS)' 'LFLAGS=$(STATIC_LFLAGS)' ++ $(MAKE) mpgtx 'CFLAGS=$(RELEASE_CFLAGS)' 'LFLAGS=$(STATIC_LFLAGS)' + + + +@@ -42,20 +41,19 @@ + rm -f *.o mpgtx mpgjoin mpgcat mpgsplit mpginfo mpgdemux tagmp3 man/mpginfo.1 man/mpgsplit.1 man/mpgcat.1 man/mpgjoin.1 man/mpgdemux.1 + + install: +- ln -sf mpgtx mpgjoin +- ln -sf mpgtx mpgsplit +- ln -sf mpgtx mpgcat +- ln -sf mpgtx mpginfo +- ln -sf mpgtx mpgdemux +- ln -sf mpgtx tagmp3 +- install -d -m 755 $(INSTALLDIR) +- install -d -m 755 $(MANDIR) +- install -s -m 755 mpgtx $(INSTALLDIR) +- cp -df mpgdemux mpgjoin mpgcat mpginfo mpgsplit tagmp3 $(INSTALLDIR) +- install -m 644 man/mpgtx.1 man/tagmp3.1 $(MANDIR) +- cd man ; make +- cd .. +- cp -df ./man/mpgdemux.1 ./man/mpgjoin.1 man/mpgsplit.1 man/mpgcat.1 man/mpginfo.1 $(MANDIR) ++ $(BSD_INSTALL_PROGRAM) mpgtx $(INSTALLDIR) ++ $(BSD_INSTALL) -l sr $(INSTALLDIR)/mpgtx $(INSTALLDIR)/mpgjoin ++ $(BSD_INSTALL) -l sr $(INSTALLDIR)/mpgtx $(INSTALLDIR)/mpgsplit ++ $(BSD_INSTALL) -l sr $(INSTALLDIR)/mpgtx $(INSTALLDIR)/mpgcat ++ $(BSD_INSTALL) -l sr $(INSTALLDIR)/mpgtx $(INSTALLDIR)/mpginfo ++ $(BSD_INSTALL) -l sr $(INSTALLDIR)/mpgtx $(INSTALLDIR)/mpgdemux ++ $(BSD_INSTALL) -l sr $(INSTALLDIR)/mpgtx $(INSTALLDIR)/tagmp3 ++ $(BSD_INSTALL_MAN) man/mpgtx.1 man/tagmp3.1 $(MANDIR) ++ $(BSD_INSTALL) -l h $(MANDIR)/mpgtx.1 $(MANDIR)/mpgdemux.1 ++ $(BSD_INSTALL) -l h $(MANDIR)/mpgtx.1 $(MANDIR)/mpgjoin.1 ++ $(BSD_INSTALL) -l h $(MANDIR)/mpgtx.1 $(MANDIR)/mpgsplit.1 ++ $(BSD_INSTALL) -l h $(MANDIR)/mpgtx.1 $(MANDIR)/mpgcat.1 ++ $(BSD_INSTALL) -l h $(MANDIR)/mpgtx.1 $(MANDIR)/mpginfo.1 + + uninstall: + rm -f $(INSTALLDIR)/mpgtx diff --git a/graphics/mplayer-share/DESCR b/graphics/mplayer-share/DESCR new file mode 100644 index 00000000000..7775780b112 --- /dev/null +++ b/graphics/mplayer-share/DESCR @@ -0,0 +1,13 @@ +MPlayer is a movie player for LINUX (runs on many other Unices, +and non-x86 CPUs). It plays most MPEG, VOB, AVI, VIVO, ASF/WMV, +QT/MOV, FLI, RM, NuppelVideo, yuv4mpeg, FILM, RoQ files, supported +by many native, XAnim, and Win32 DLL codecs. You can watch VideoCD, +SVCD, DVD, 3ivx, and even DivX movies too. The another big feature +of mplayer is the wide range of supported output drivers. It works +with X11, Xv, DGA, OpenGL, SVGAlib, fbdev, AAlib, DirectFB, but you +can use GGI and SDL (and this way all their drivers) and some +lowlevel card-specific drivers (for Matrox, 3Dfx and Radeon) too! +Most of them supports software or hardware scaling, so you can enjoy +movies in fullscreen. And what about the nice big antialiased shaded +subtitles (10 supported types!!!) with european/ISO 8859-1,2 +(hungarian, english, czech, etc), cyrillic, korean fonts, and OSD... diff --git a/graphics/mplayer-share/Makefile b/graphics/mplayer-share/Makefile new file mode 100644 index 00000000000..dc2e6ced1ab --- /dev/null +++ b/graphics/mplayer-share/Makefile @@ -0,0 +1,39 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:46:44 jlam Exp $ + +.include "Makefile.common" + +PKGNAME= mplayer-share-${MPLAYER_PKG_VERSION} +COMMENT= Documentation and fonts used by mplayer and gmplayer + +MASTER_SITES+= http://www2.mplayerhq.hu/MPlayer/contrib/fonts/ \ + ftp://ftp2.mplayerhq.hu/MPlayer/contrib/fonts/ + +NO_BUILD= YES +NO_CONFIGURE= YES +NO_PATCH= YES + +MP_FONTS= mp-arial-iso-8859-1.zip \ + mp-arial-iso-8859-2.zip \ + koi8r-font.tar.bz2 + +DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} +DISTFILES+= ${MP_FONTS} + +PLIST_SRC= ${WRKDIR}/.PLIST_SRC + +.include "../../mk/bsd.prefs.mk" + +do-install: + ${CP} ${PKGDIR}/PLIST ${PLIST_SRC} + ${INSTALL_MAN} ${WRKSRC}/DOCS/mplayer.1 ${PREFIX}/man/man1 + ${INSTALL_DATA_DIR} ${PREFIX}/share/mplayer + ${INSTALL_DATA_DIR} ${PREFIX}/share/mplayer/font + ${INSTALL_DATA} ${WRKSRC}/etc/codecs.conf ${PREFIX}/share/mplayer + ${CP} -R ${WRKSRC}/DOCS ${PREFIX}/share/mplayer + @${ECHO_MSG} "Installing font ${MPLAYER_FONT}..." + (cd ${WRKDIR}/${MPLAYER_FONT}; ${PAX} -rwpp . ${PREFIX}/share/mplayer/font) + (cd ${PREFIX}; ${FIND} share/mplayer/font -type f -print >>${PLIST_SRC}) + (cd ${PREFIX}; ${FIND} -d share/mplayer -type d -print | \ + ${SED} -e "s/^/@dirrm /" | ${SORT} -r >>${PLIST_SRC}) + +.include "../../mk/bsd.pkg.mk" diff --git a/graphics/mplayer/Makefile.common b/graphics/mplayer-share/Makefile.common index 73ed29d9a73..014c5a6c147 100644 --- a/graphics/mplayer/Makefile.common +++ b/graphics/mplayer-share/Makefile.common @@ -1,18 +1,26 @@ -# $NetBSD: Makefile.common,v 1.11 2002/05/07 22:08:03 wiz Exp $ +# $NetBSD: Makefile.common,v 1.3.2.2 2002/06/23 18:46:44 jlam Exp $ -MPLAYER_DIST_VERSION= 0.90pre3 +MPLAYER_DIST_VERSION= 0.90pre5 + +# There is no need to change anything below here. + +# This variable is used in all packages which depend on this package MPLAYER_PKG_VERSION= ${MPLAYER_DIST_VERSION:S/pre/rc/} DISTNAME= MPlayer-${MPLAYER_DIST_VERSION} CATEGORIES?= graphics -MASTER_SITES= http://www.mplayerhq.hu/MPlayer/releases/ +MASTER_SITES= http://www.mplayerhq.hu/MPlayer/releases/ \ + http://www2.mplayerhq.hu/MPlayer/releases/ \ + ftp://ftp.mplayerhq.hu/MPlayer/releases/ \ + ftp://ftp2.mplayerhq.hu/MPlayer/releases/ EXTRACT_SUFX= .tar.bz2 +DIST_SUBDIR= mplayer MAINTAINER?= svs@ropnet.ru,zuntum@netbsd.org HOMEPAGE?= http://www.mplayerhq.hu/ -PATCHDIR= ${.CURDIR}/../mplayer/patches -ONLY_FOR_PLATFORM= NetBSD-*-i386 +PATCHDIR= ${.CURDIR}/../../graphics/mplayer-share/patches +ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-powerpc RESTRICTED?= "unsure of the license" # see http://www.mplayerhq.hu/DOCS/users_against_developers.html#binary @@ -21,7 +29,6 @@ NO_BIN_ON_FTP= ${RESTRICTED} # no source on the ftp server because of the css source code in it NO_SRC_ON_FTP= ${RESTRICTED} -USE_X11= YES USE_GMAKE= YES HAS_CONFIGURE= YES @@ -30,14 +37,21 @@ USE_PTHREAD= native pth CONFIGURE_ARGS+= --prefix="${PREFIX}" CONFIGURE_ARGS+= --with-extraincdir="${BUILDLINK_DIR}/include" CONFIGURE_ARGS+= --with-extralibdir="${LOCALBASE}/lib" -CONFIGURE_ARGS+= --with-win32libdir="${LOCALBASE}/lib/win32" #CONFIGURE_ARGS+= --enable-dvdread CONFIGURE_ARGS+= --disable-mpdvdkit +CONFIGURE_ARGS+= --disable-ossaudio + +# Buildlink's ${CFLAGS} setting triggers configure's bozo switch, turning +# off all the processor-specific optimizations. +CONFIGURE_ENV+= CFLAGS="" # The configure script attempts to test-execute compiled programs in /tmp, # but that directory may be mounted as noexec; work this around by setting # TMPDIR to ${WRKDIR} CONFIGURE_ENV+= TMPDIR=${WRKDIR} -.include "../../devel/binutils/buildlink.mk" -.include "../../lang/gcc/Makefile.gcc" +.include "../../mk/bsd.prefs.mk" + +.if ${MACHINE_ARCH} == "i386" +CONFIGURE_ARGS+= --with-win32libdir="${LOCALBASE}/lib/win32" +.endif diff --git a/graphics/mplayer-share/Makefile.depends b/graphics/mplayer-share/Makefile.depends new file mode 100644 index 00000000000..bf8f296ba12 --- /dev/null +++ b/graphics/mplayer-share/Makefile.depends @@ -0,0 +1,15 @@ +# $NetBSD: Makefile.depends,v 1.1.2.2 2002/06/23 18:46:45 jlam Exp $ + +DEPENDS+= mplayer-share-${MPLAYER_PKG_VERSION}${PKGREVISION:Dnb${PKGREVISION}}:../../graphics/mplayer-share + +.include "../../audio/mad/buildlink.mk" +.include "../../devel/binutils/buildlink.mk" +.include "../../devel/SDL/buildlink.mk" +.include "../../graphics/jpeg/buildlink.mk" +.include "../../graphics/libungif/buildlink.mk" +.include "../../graphics/png/buildlink.mk" +.include "../../lang/gcc/Makefile.gcc" +.include "../../misc/libdvdread/buildlink.mk" +.include "../../mk/ossaudio.buildlink.mk" +.include "../../mk/pthread.buildlink.mk" +.include "../../mk/x11.buildlink.mk" diff --git a/graphics/mplayer-share/PLIST b/graphics/mplayer-share/PLIST new file mode 100644 index 00000000000..62ada922bea --- /dev/null +++ b/graphics/mplayer-share/PLIST @@ -0,0 +1,99 @@ +@comment $NetBSD: PLIST,v 1.2.2.2 2002/06/23 18:46:45 jlam Exp $ +man/man1/mplayer.1 +share/mplayer/DOCS/DVB +share/mplayer/DOCS/DXR3 +share/mplayer/DOCS/French/bugreports.html +share/mplayer/DOCS/French/cd-dvd.html +share/mplayer/DOCS/French/codecs.html +share/mplayer/DOCS/French/documentation.html +share/mplayer/DOCS/French/exemple.conf +share/mplayer/DOCS/French/faq.html +share/mplayer/DOCS/French/skin-fr.html +share/mplayer/DOCS/French/sound.html +share/mplayer/DOCS/French/video.html +share/mplayer/DOCS/German/bugreports.html +share/mplayer/DOCS/German/cd-dvd.html +share/mplayer/DOCS/German/codecs.html +share/mplayer/DOCS/German/documentation.html +share/mplayer/DOCS/German/encoding.html +share/mplayer/DOCS/German/faq.html +share/mplayer/DOCS/German/formats.html +share/mplayer/DOCS/German/mencoder.1 +share/mplayer/DOCS/German/mplayer.1 +share/mplayer/DOCS/German/sound.html +share/mplayer/DOCS/German/video.html +share/mplayer/DOCS/Hungarian/bugreports.html +share/mplayer/DOCS/Hungarian/cd-dvd.html +share/mplayer/DOCS/Hungarian/codecs.html +share/mplayer/DOCS/Hungarian/documentation.html +share/mplayer/DOCS/Hungarian/encoding.html +share/mplayer/DOCS/Hungarian/example.conf +share/mplayer/DOCS/Hungarian/faq.html +share/mplayer/DOCS/Hungarian/formats.html +share/mplayer/DOCS/Hungarian/mplayer.1 +share/mplayer/DOCS/Hungarian/skin-hu.html +share/mplayer/DOCS/Hungarian/sound.html +share/mplayer/DOCS/Hungarian/video.html +share/mplayer/DOCS/Italian/bugreports.html +share/mplayer/DOCS/Italian/cd-dvd.html +share/mplayer/DOCS/Italian/codecs.html +share/mplayer/DOCS/Italian/documentation.html +share/mplayer/DOCS/Italian/encoding.html +share/mplayer/DOCS/Italian/faq.html +share/mplayer/DOCS/Italian/formats.html +share/mplayer/DOCS/Italian/skin-it.html +share/mplayer/DOCS/Italian/sound.html +share/mplayer/DOCS/Italian/users_against_developers.html +share/mplayer/DOCS/Italian/video.html +share/mplayer/DOCS/Polish/DVB +share/mplayer/DOCS/Polish/DXR3 +share/mplayer/DOCS/Polish/bugreports.html +share/mplayer/DOCS/Polish/cd-dvd.html +share/mplayer/DOCS/Polish/codecs-in.html +share/mplayer/DOCS/Polish/codecs.html +share/mplayer/DOCS/Polish/documentation.html +share/mplayer/DOCS/Polish/encoding.html +share/mplayer/DOCS/Polish/faq.html +share/mplayer/DOCS/Polish/formats.html +share/mplayer/DOCS/Polish/gcc-2.96-3.0.html +share/mplayer/DOCS/Polish/mplayer.1 +share/mplayer/DOCS/Polish/skin-pl.html +share/mplayer/DOCS/Polish/sound.html +share/mplayer/DOCS/Polish/users_against_developers.html +share/mplayer/DOCS/Polish/video.html +share/mplayer/DOCS/bugreports.html +share/mplayer/DOCS/cd-dvd.html +share/mplayer/DOCS/codecs-in.html +share/mplayer/DOCS/codecs.html +share/mplayer/DOCS/documentation.html +share/mplayer/DOCS/encoding.html +share/mplayer/DOCS/faq.html +share/mplayer/DOCS/formats.html +share/mplayer/DOCS/mplayer.1 +share/mplayer/DOCS/skin-en.html +share/mplayer/DOCS/sound.html +share/mplayer/DOCS/tech/TODO +share/mplayer/DOCS/tech/codec-devel.txt +share/mplayer/DOCS/tech/codecs.conf.txt +share/mplayer/DOCS/tech/colorspaces.txt +share/mplayer/DOCS/tech/cvs-howto.txt +share/mplayer/DOCS/tech/dr-methods.txt +share/mplayer/DOCS/tech/formats-hun.txt +share/mplayer/DOCS/tech/formats.txt +share/mplayer/DOCS/tech/hwac3.txt +share/mplayer/DOCS/tech/libavc-rate-control.txt +share/mplayer/DOCS/tech/libvo.txt +share/mplayer/DOCS/tech/libvo2.txt +share/mplayer/DOCS/tech/mpsub.sub +share/mplayer/DOCS/tech/osd.txt +share/mplayer/DOCS/tech/patches.txt +share/mplayer/DOCS/tech/playtree +share/mplayer/DOCS/tech/playtree-hun +share/mplayer/DOCS/tech/porting-status.txt +share/mplayer/DOCS/tech/subcp.txt +share/mplayer/DOCS/tech/tech-eng.txt +share/mplayer/DOCS/tech/vidix.txt +share/mplayer/DOCS/tech/vop.txt +share/mplayer/DOCS/users_against_developers.html +share/mplayer/DOCS/video.html +share/mplayer/codecs.conf diff --git a/graphics/mplayer-share/distinfo b/graphics/mplayer-share/distinfo new file mode 100644 index 00000000000..ddf3e385e99 --- /dev/null +++ b/graphics/mplayer-share/distinfo @@ -0,0 +1,12 @@ +$NetBSD: distinfo,v 1.3.2.2 2002/06/23 18:46:46 jlam Exp $ + +SHA1 (mplayer/MPlayer-0.90pre5.tar.bz2) = 1a78063dd055ce99985001072fb2057156f8cd2a +Size (mplayer/MPlayer-0.90pre5.tar.bz2) = 2438747 bytes +SHA1 (mplayer/mp-arial-iso-8859-1.zip) = 535809c2745d5dfa79d1243cbe225ee030e626ac +Size (mplayer/mp-arial-iso-8859-1.zip) = 272659 bytes +SHA1 (mplayer/mp-arial-iso-8859-2.zip) = a1ef7ea4f4349cd4451052351f7c300597a1b5d3 +Size (mplayer/mp-arial-iso-8859-2.zip) = 255907 bytes +SHA1 (mplayer/koi8r-font.tar.bz2) = d8f44c101aaae32b5674c16da3549f5e520c077e +Size (mplayer/koi8r-font.tar.bz2) = 68817 bytes +SHA1 (patch-aa) = 2c1c6f35caf047f188871ac223d672ce453c26ec +SHA1 (patch-ab) = ba4990ac8df3b79dfd452530fe4aea66e26f4e7e diff --git a/graphics/mplayer/patches/patch-aa b/graphics/mplayer-share/patches/patch-aa index 5f7eef0e70a..5c30e451b59 100644 --- a/graphics/mplayer/patches/patch-aa +++ b/graphics/mplayer-share/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.5 2002/05/07 22:19:29 wiz Exp $ +$NetBSD: patch-aa,v 1.1.1.1.2.2 2002/06/23 18:46:48 jlam Exp $ ---- configure.orig Sun Apr 28 23:05:09 2002 -+++ configure Mon Apr 29 09:40:55 2002 -@@ -263,8 +263,8 @@ +--- configure.orig Mon May 13 22:52:10 2002 ++++ configure Tue May 14 18:57:42 2002 +@@ -269,8 +269,8 @@ _inc_extra=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'` ;; --with-extralibdir=*) @@ -13,12 +13,3 @@ $NetBSD: patch-aa,v 1.5 2002/05/07 22:19:29 wiz Exp $ ;; --enable-runtime-cpudetection) _runtime_cpudetection=yes -@@ -2626,7 +2626,7 @@ - echocheck "DVD support (libmpdvdkit)" - if test "$_dvdkit" = auto ; then - _dvdkit=no -- if linux || freebsd ; then -+ if linux || freebsd || netbsd ; then - test -f "./libmpdvdkit/Makefile" && _dvdkit=yes - fi - fi diff --git a/graphics/mplayer-share/patches/patch-ab b/graphics/mplayer-share/patches/patch-ab new file mode 100644 index 00000000000..6a8cf4ed71b --- /dev/null +++ b/graphics/mplayer-share/patches/patch-ab @@ -0,0 +1,34 @@ +$NetBSD: patch-ab,v 1.1.2.2 2002/06/23 18:46:48 jlam Exp $ + +--- libao2/ao_sun.c.orig Mon Apr 29 03:47:30 2002 ++++ libao2/ao_sun.c +@@ -445,13 +445,19 @@ + } + #endif + +-#ifndef __OpenBSD__ ++#if !defined(__OpenBSD__) && !defined(__NetBSD__) + ioctl(audio_fd, AUDIO_GETINFO, &info); + if (queued_bursts - info.play.eof > 2) + return 0; + #endif + ++#if defined(__NetBSD__) ++ ioctl(audio_fd, AUDIO_GETINFO, &info); ++ return info.hiwat * info.blocksize - info.play.seek; ++#else + return ao_data.outburst; ++#endif ++ + } + + // plays 'len' bytes of 'data' +@@ -507,7 +513,7 @@ + static float get_delay(){ + audio_info_t info; + ioctl(audio_fd, AUDIO_GETINFO, &info); +-#ifdef __OpenBSD__ ++#if defined(__OpenBSD__) || defined(__NetBSD__) + return (float) info.play.seek/ (float)byte_per_sec ; + #else + if (info.play.samples && enable_sample_timing == RTSC_ENABLED) diff --git a/graphics/mplayer/Makefile b/graphics/mplayer/Makefile index 3fa0b460e52..e3b62bb6795 100644 --- a/graphics/mplayer/Makefile +++ b/graphics/mplayer/Makefile @@ -1,26 +1,15 @@ -# $NetBSD: Makefile,v 1.24 2002/05/03 18:00:50 fredb Exp $ +# $NetBSD: Makefile,v 1.24.2.1 2002/06/23 18:46:41 jlam Exp $ -.include "Makefile.common" +.include "../../graphics/mplayer-share/Makefile.common" PKGNAME= mplayer-${MPLAYER_PKG_VERSION} COMMENT= Software only MPEG-1/2/4 video decoder -MASTER_SITES+= http://www2.mplayerhq.hu/MPlayer/releases/ \ - ftp://ftp.mplayerhq.hu/MPlayer/releases/ \ - ftp://ftp2.mplayerhq.hu/MPlayer/releases/ +CONFIGURE_ARGS+= --disable-mencoder do-install: ${INSTALL_PROGRAM} ${WRKSRC}/mplayer ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/DOCS/mplayer.1 ${PREFIX}/man/man1 - ${INSTALL_DATA_DIR} ${PREFIX}/share/mplayer - ${INSTALL_DATA} ${WRKSRC}/etc/codecs.conf ${PREFIX}/share/mplayer - ${CP} -R ${WRKSRC}/DOCS ${PREFIX}/share/mplayer -.include "../../audio/lame/buildlink.mk" -.include "../../devel/SDL/buildlink.mk" -.include "../../graphics/jpeg/buildlink.mk" -.include "../../graphics/png/buildlink.mk" -.include "../../misc/libdvdread/buildlink.mk" -.include "../../mk/ossaudio.buildlink.mk" -.include "../../mk/pthread.buildlink.mk" +.include "../../audio/nas/buildlink.mk" +.include "../../graphics/mplayer-share/Makefile.depends" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/mplayer/PLIST b/graphics/mplayer/PLIST index 5e7a278eb4a..2d29800083d 100644 --- a/graphics/mplayer/PLIST +++ b/graphics/mplayer/PLIST @@ -1,110 +1,2 @@ -@comment $NetBSD: PLIST,v 1.5 2002/05/06 11:13:45 wiz Exp $ +@comment $NetBSD: PLIST,v 1.5.2.1 2002/06/23 18:46:41 jlam Exp $ bin/mplayer -man/man1/mplayer.1 -share/mplayer/DOCS/DVB -share/mplayer/DOCS/DXR3 -share/mplayer/DOCS/French/bugreports.html -share/mplayer/DOCS/French/cd-dvd.html -share/mplayer/DOCS/French/codecs.html -share/mplayer/DOCS/French/documentation.html -share/mplayer/DOCS/French/exemple.conf -share/mplayer/DOCS/French/faq.html -share/mplayer/DOCS/French/skin-fr.html -share/mplayer/DOCS/French/sound.html -share/mplayer/DOCS/French/video.html -share/mplayer/DOCS/German/bugreports.html -share/mplayer/DOCS/German/cd-dvd.html -share/mplayer/DOCS/German/codecs.html -share/mplayer/DOCS/German/documentation.html -share/mplayer/DOCS/German/encoding.html -share/mplayer/DOCS/German/faq.html -share/mplayer/DOCS/German/formats.html -share/mplayer/DOCS/German/gcc-2.96-3.0.html -share/mplayer/DOCS/German/mencoder.1 -share/mplayer/DOCS/German/mplayer.1 -share/mplayer/DOCS/German/sound.html -share/mplayer/DOCS/German/video.html -share/mplayer/DOCS/Hungarian/bugreports.html -share/mplayer/DOCS/Hungarian/cd-dvd.html -share/mplayer/DOCS/Hungarian/codecs.html -share/mplayer/DOCS/Hungarian/documentation.html -share/mplayer/DOCS/Hungarian/encoding.html -share/mplayer/DOCS/Hungarian/example.conf -share/mplayer/DOCS/Hungarian/faq.html -share/mplayer/DOCS/Hungarian/formats.html -share/mplayer/DOCS/Hungarian/mplayer.1 -share/mplayer/DOCS/Hungarian/skin-hu.html -share/mplayer/DOCS/Hungarian/sound.html -share/mplayer/DOCS/Hungarian/video.html -share/mplayer/DOCS/Italian/bugreports.html -share/mplayer/DOCS/Italian/cd-dvd.html -share/mplayer/DOCS/Italian/codecs.html -share/mplayer/DOCS/Italian/documentation.html -share/mplayer/DOCS/Italian/encoding.html -share/mplayer/DOCS/Italian/faq.html -share/mplayer/DOCS/Italian/formats.html -share/mplayer/DOCS/Italian/gcc-2.96-3.0.html -share/mplayer/DOCS/Italian/skin-it.html -share/mplayer/DOCS/Italian/sound.html -share/mplayer/DOCS/Italian/users_against_developers.html -share/mplayer/DOCS/Italian/video.html -share/mplayer/DOCS/Polish/DVB -share/mplayer/DOCS/Polish/DXR3 -share/mplayer/DOCS/Polish/bugreports.html -share/mplayer/DOCS/Polish/cd-dvd.html -share/mplayer/DOCS/Polish/codecs-in.html -share/mplayer/DOCS/Polish/codecs.html -share/mplayer/DOCS/Polish/documentation.html -share/mplayer/DOCS/Polish/encoding.html -share/mplayer/DOCS/Polish/faq.html -share/mplayer/DOCS/Polish/formats.html -share/mplayer/DOCS/Polish/gcc-2.96-3.0.html -share/mplayer/DOCS/Polish/mencoder.1 -share/mplayer/DOCS/Polish/mplayer.1 -share/mplayer/DOCS/Polish/skin-en.html -share/mplayer/DOCS/Polish/sound.html -share/mplayer/DOCS/Polish/users_against_developers.html -share/mplayer/DOCS/Polish/video.html -share/mplayer/DOCS/bugreports.html -share/mplayer/DOCS/cd-dvd.html -share/mplayer/DOCS/codecs-in.html -share/mplayer/DOCS/codecs.html -share/mplayer/DOCS/documentation.html -share/mplayer/DOCS/encoding.html -share/mplayer/DOCS/faq.html -share/mplayer/DOCS/formats.html -share/mplayer/DOCS/gcc-2.96-3.0.html -share/mplayer/DOCS/mencoder.1 -share/mplayer/DOCS/mplayer.1 -share/mplayer/DOCS/skin-en.html -share/mplayer/DOCS/sound.html -share/mplayer/DOCS/tech/TODO -share/mplayer/DOCS/tech/codec-devel.txt -share/mplayer/DOCS/tech/codecs.conf.txt -share/mplayer/DOCS/tech/colorspaces.txt -share/mplayer/DOCS/tech/cvs-howto.txt -share/mplayer/DOCS/tech/dr-methods.txt -share/mplayer/DOCS/tech/formats-hun.txt -share/mplayer/DOCS/tech/formats.txt -share/mplayer/DOCS/tech/hwac3.txt -share/mplayer/DOCS/tech/libvo.txt -share/mplayer/DOCS/tech/libvo2.txt -share/mplayer/DOCS/tech/mpsub.sub -share/mplayer/DOCS/tech/osd.txt -share/mplayer/DOCS/tech/patches.txt -share/mplayer/DOCS/tech/playtree -share/mplayer/DOCS/tech/playtree-hun -share/mplayer/DOCS/tech/tech-eng.txt -share/mplayer/DOCS/tech/vidix.txt -share/mplayer/DOCS/tech/vop.txt -share/mplayer/DOCS/users_against_developers.html -share/mplayer/DOCS/video.html -share/mplayer/codecs.conf -@dirrm share/mplayer/DOCS/tech -@dirrm share/mplayer/DOCS/Polish -@dirrm share/mplayer/DOCS/Italian -@dirrm share/mplayer/DOCS/Hungarian -@dirrm share/mplayer/DOCS/German -@dirrm share/mplayer/DOCS/French -@dirrm share/mplayer/DOCS -@dirrm share/mplayer diff --git a/graphics/mplayer/distinfo b/graphics/mplayer/distinfo index f2e7e9e3648..a6bd9c24762 100644 --- a/graphics/mplayer/distinfo +++ b/graphics/mplayer/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.9 2002/05/07 22:19:29 wiz Exp $ +$NetBSD: distinfo,v 1.9.2.1 2002/06/23 18:46:42 jlam Exp $ -SHA1 (MPlayer-0.90pre3.tar.bz2) = 0ed1d70787488ce55699826752d492aed3425795 -Size (MPlayer-0.90pre3.tar.bz2) = 2322749 bytes -SHA1 (patch-aa) = d039ed590a0b7b92cf4a66b14810ea75a4fd02ad -SHA1 (patch-ab) = a90f1dda80a3208695e5435b63fa4f2b11689a63 +SHA1 (mplayer/MPlayer-0.90pre5.tar.bz2) = 1a78063dd055ce99985001072fb2057156f8cd2a +Size (mplayer/MPlayer-0.90pre5.tar.bz2) = 2438747 bytes +SHA1 (patch-aa) = 2c1c6f35caf047f188871ac223d672ce453c26ec +SHA1 (patch-ab) = ba4990ac8df3b79dfd452530fe4aea66e26f4e7e diff --git a/graphics/mplayer/patches/patch-ab b/graphics/mplayer/patches/patch-ab deleted file mode 100644 index 3d4cc5b8e46..00000000000 --- a/graphics/mplayer/patches/patch-ab +++ /dev/null @@ -1,38 +0,0 @@ -$NetBSD: patch-ab,v 1.5 2002/05/07 20:26:13 wiz Exp $ - ---- libdha/mtrr.c.orig Sun Apr 28 00:42:24 2002 -+++ libdha/mtrr.c -@@ -13,11 +13,14 @@ - #include "AsmMacros.h" - - #if defined (__i386__) && defined (__NetBSD__) -+#include <sys/param.h> -+#if __NetBSD_Version__ > 105240000 - #include <stdint.h> - #include <stdlib.h> - #include <machine/mtrr.h> - #include <machine/sysarch.h> - #endif -+#endif - - #if defined( __i386__ ) - int mtrr_set_type(unsigned base,unsigned size,int type) -@@ -47,6 +50,7 @@ - } - return ENOSYS; - #elif defined (__NetBSD__) -+#if __NetBSD_Version__ > 105240000 - struct mtrr *mtrrp; - int n; - -@@ -64,6 +68,10 @@ - free(mtrrp); - return 0; - #else -+ /* NetBSD prior to 1.5Y doesn't have MTRR support */ -+ return ENOSYS; -+#endif -+#else - #warning Please port MTRR stuff!!! - return ENOSYS; - #endif diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile index 161c4d0a4c9..e248342c7a6 100644 --- a/graphics/netpbm/Makefile +++ b/graphics/netpbm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.61.2.2 2002/06/21 23:05:24 jlam Exp $ +# $NetBSD: Makefile,v 1.61.2.3 2002/06/23 18:46:49 jlam Exp $ DISTNAME= netpbm-9.25 CATEGORIES= graphics @@ -16,7 +16,7 @@ USE_PERL5= yes REPLACE_PERL= pnm/pnmquant ppm/ppmfade ppm/ppmrainbow ppm/ppmshadow INSTALL_TARGET= install-dev install -MAKE_ENV+= INSTALL="${INSTALL}" +MAKE_ENV+= INSTALL="${INSTALL}" STRIPFLAG="${_STRIPFLAG_INSTALL}" MAKEFILE= GNUmakefile .include "../../mk/bsd.prefs.mk" diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo index e1f1d769d30..bc2cfd4e64d 100644 --- a/graphics/netpbm/distinfo +++ b/graphics/netpbm/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.8 2002/05/06 11:46:21 tron Exp $ +$NetBSD: distinfo,v 1.8.2.1 2002/06/23 18:46:49 jlam Exp $ SHA1 (netpbm-9.25.tgz) = 9c7f6a98348a5f3d6e908b514f33498b2a9c359a Size (netpbm-9.25.tgz) = 2052922 bytes -SHA1 (patch-aa) = 7288a623ed96793271e27e73476918830f50b9e5 +SHA1 (patch-aa) = 1e3eb961f34dedb81ac1be823e25f0ae052905b6 SHA1 (patch-ab) = b6932fd52dff9a6acd01e42136ff7a70561c7434 +SHA1 (patch-ac) = 42a6dbfe24447132c6dd654512607c0c9c4a5699 diff --git a/graphics/netpbm/patches/patch-aa b/graphics/netpbm/patches/patch-aa index 8a88d040f01..acd8487810e 100644 --- a/graphics/netpbm/patches/patch-aa +++ b/graphics/netpbm/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.18 2002/05/06 11:46:22 tron Exp $ +$NetBSD: patch-aa,v 1.18.2.1 2002/06/23 18:46:50 jlam Exp $ --- Makefile.config.in.orig Thu Mar 14 16:25:54 2002 -+++ Makefile.config.in Mon Apr 29 17:19:59 2002 ++++ Makefile.config.in Tue May 14 19:52:32 2002 @@ -33,7 +33,7 @@ #Tru64 (= Digital Unix): #CC = cc @@ -20,6 +20,15 @@ $NetBSD: patch-aa,v 1.18 2002/05/06 11:46:22 tron Exp $ #Solaris: #INSTALL = /usr/ucb/install #Tru64: +@@ -64,7 +64,7 @@ + + # STRIPFLAG is the option you pass to the above install program to make it + # strip unnecessary information out of binaries. +-STRIPFLAG = -s ++#STRIPFLAG = -s + # If you don't want to strip the binaries, just leave it null: + #STRIPFLAG = + @@ -137,10 +137,10 @@ # the directory information in the executable at link time. @@ -34,7 +43,7 @@ $NetBSD: patch-aa,v 1.18 2002/05/06 11:46:22 tron Exp $ # Eunice users may want to use -noshare so that the executables can # run standalone: #LDFLAGS = -noshare -@@ -156,9 +156,9 @@ +@@ -156,16 +156,16 @@ ifeq ($(NEED_RUNTIME_PATH),Y) #If the linker is gcc (e.g. NetBSD): @@ -46,6 +55,14 @@ $NetBSD: patch-aa,v 1.18 2002/05/06 11:46:22 tron Exp $ endif # Linker options for created Netpbm shared libraries. + + # Here, $(SONAME) resolves to the soname for the shared library being created. + # The following are gcc options. This works on GNU libc systems. +-LDSHLIB = -shared -Wl,-soname,$(SONAME) ++LDSHLIB = -nostdlib -shared -Wl,-Bshareable,-soname,$(SONAME) + # You need -nostart instead of -shared on BeOS. Though the BeOS compiler is + # ostensibly gcc, it has the -nostart option, which is not mentioned in gcc + # documentation and doesn't exist in at least one non-BeOS installation. @@ -180,11 +180,15 @@ #Tru64: #LDSHLIB = -shared -expect_unresolved "*" diff --git a/graphics/netpbm/patches/patch-ac b/graphics/netpbm/patches/patch-ac new file mode 100644 index 00000000000..3e223bea239 --- /dev/null +++ b/graphics/netpbm/patches/patch-ac @@ -0,0 +1,18 @@ +$NetBSD: patch-ac,v 1.11.2.2 2002/06/23 18:46:50 jlam Exp $ + +--- ppm/ppmtompeg/param.c-orig Fri Aug 31 16:49:01 2001 ++++ ppm/ppmtompeg/param.c Sat Mar 23 19:20:02 2002 +@@ -11,13 +11,6 @@ + + /* COPYRIGHT INFORMATION IS AT THE END OF THIS FILE */ + +-#define _XOPEN_SOURCE 1 +- /* This makes sure popen() is in stdio.h. In GNU libc 2.1.3, +- _POSIX_C_SOURCE = 2 is sufficient, but on AIX 4.3, the higher level +- _XOPEN_SOURCE is required. 2000.09.09 +- */ +- +- + /*==============* + * HEADER FILES * + *==============*/ diff --git a/graphics/ogle/Makefile b/graphics/ogle/Makefile index b6764def0c8..5d3ca63e662 100644 --- a/graphics/ogle/Makefile +++ b/graphics/ogle/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.6 2002/04/28 22:12:53 wiz Exp $ +# $NetBSD: Makefile,v 1.6.2.1 2002/06/23 18:46:51 jlam Exp $ -DISTNAME= ogle-0.8.2 +DISTNAME= ogle-0.8.3 CATEGORIES= graphics MASTER_SITES= http://www.dtek.chalmers.se/groups/dvd/dist/ @@ -8,15 +8,15 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.dtek.chalmers.se/groups/dvd/ COMMENT= DVD player with menus -DEPENDS+= jpeg-6b:../../graphics/jpeg -DEPENDS+= liba52>=0.7.1.2:../../audio/liba52 -DEPENDS+= libdvdread>=0.9.2:../../misc/libdvdread +DEPENDS+= liba52>=0.7.3:../../audio/liba52 -BUILDLINK_DEPENDS.libxml2= libxml2>=2.4.5 +BUILDLINK_DEPENDS.libxml2= libxml2>=2.4.19 ONLY_FOR_PLATFORM= NetBSD-1.5[Y-Z]*-i386 NetBSD-1.[6-9]*-i386 CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" +#CONFIGURE_ARGS+=--enable-obsdaudio +#CONFIGURE_ARGS+=--disable-sunaudio GNU_CONFIGURE= yes USE_GMAKE= yes @@ -25,6 +25,8 @@ USE_CONFIG_WRAPPER= yes LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../devel/gettext-lib/buildlink.mk" +.include "../../graphics/jpeg/buildlink.mk" +.include "../../misc/libdvdread/buildlink.mk" .include "../../textproc/libxml2/buildlink.mk" .include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/ogle/PLIST b/graphics/ogle/PLIST index 3858e1938a4..32761037c08 100644 --- a/graphics/ogle/PLIST +++ b/graphics/ogle/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2001/12/10 20:48:17 veego Exp $ +@comment $NetBSD: PLIST,v 1.1.1.1.2.1 2002/06/23 18:46:51 jlam Exp $ bin/ifo_dump bin/ogle include/ogle/dvd.h @@ -10,8 +10,8 @@ lib/ogle/libmsgevents.so.4 lib/ogle/libmsgevents.so lib/ogle/libmsgevents.la lib/ogle/libmsgevents.a -lib/ogle/libdvdcontrol.so.5.0 -lib/ogle/libdvdcontrol.so.5 +lib/ogle/libdvdcontrol.so.6.0 +lib/ogle/libdvdcontrol.so.6 lib/ogle/libdvdcontrol.so lib/ogle/libdvdcontrol.la lib/ogle/libdvdcontrol.a @@ -20,7 +20,7 @@ lib/ogle/ogle_mpeg_vs lib/ogle/ogle_vout lib/ogle/ogle_mpeg_ps lib/ogle/ogle_ac3_p -lib/ogle/ogle_a52 +lib/ogle/ogle_audio lib/ogle/ogle_nav lib/ogle/ogle_cli man/man1/ogle.1 diff --git a/graphics/ogle/distinfo b/graphics/ogle/distinfo index 39976693f42..3c27a5f1d4f 100644 --- a/graphics/ogle/distinfo +++ b/graphics/ogle/distinfo @@ -1,5 +1,13 @@ -$NetBSD: distinfo,v 1.3 2001/12/25 23:45:54 wiz Exp $ +$NetBSD: distinfo,v 1.3.2.1 2002/06/23 18:46:52 jlam Exp $ -SHA1 (ogle-0.8.2.tar.gz) = 84f3505eaa8f6d002f663bfe036c533a4a83f714 -Size (ogle-0.8.2.tar.gz) = 480190 bytes -SHA1 (patch-aa) = 2b3953c7d724bc7ce486233b24623ed492d11e8f +SHA1 (ogle-0.8.3.tar.gz) = 80517f375b13b637ee15069368ff703b5d1b7e52 +Size (ogle-0.8.3.tar.gz) = 405249 bytes +SHA1 (patch-aa) = c7ed5f7b957c0303c451650df2e4b1044d7430ef +SHA1 (patch-ab) = 63aae484dbbb4e0746807f208f3fadb84a16341a +SHA1 (patch-ac) = 85d5664419706bce042e564acadff75e0d5def58 +SHA1 (patch-ad) = da39bea384f78a63b94dec2c47a2c39750858bc2 +SHA1 (patch-ae) = a37d75d4c15ab60060df5339680ce863488c2f26 +SHA1 (patch-af) = 66a5c30aaf455e794a4c8940dc2a98815c62ae58 +SHA1 (patch-ag) = 386f8be5ce347f150b6b836a3d9c9b3db12cfbc7 +SHA1 (patch-ah) = 1fb41606f1fc0593597afb54cb2839f7c87221dc +SHA1 (patch-ai) = 32ca5020e831cabc978c31c4d853cc94ed994a1d diff --git a/graphics/ogle/patches/patch-aa b/graphics/ogle/patches/patch-aa index 85381762b4e..91c4e9a62c9 100644 --- a/graphics/ogle/patches/patch-aa +++ b/graphics/ogle/patches/patch-aa @@ -1,37 +1,37 @@ -$NetBSD: patch-aa,v 1.2 2001/12/25 23:45:54 wiz Exp $ +$NetBSD: patch-aa,v 1.2.2.1 2002/06/23 18:46:52 jlam Exp $ ---- include/debug_print.h.orig Sun Nov 25 03:42:29 2001 -+++ include/debug_print.h -@@ -20,20 +20,25 @@ +--- include/debug_print.h.orig Tue Apr 2 21:06:03 2002 ++++ include/debug_print.h Thu Jun 13 10:49:39 2002 +@@ -24,20 +24,25 @@ #if defined(__GNUC__) && ( __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 95)) -#define FATAL(str, args...) \ --fprintf(stderr, "FATAL[%s]: " str, program_name, ## args) +-fprintf(stderr, "FATAL[%s]: " str, program_name , ## args) +#define FATAL(str...) _FATAL( , ##str) +#define _FATAL(str, args...) \ +fprintf(stderr, "FATAL[%s]: " str, program_name, ##args) -#define ERROR(str, args...) \ --fprintf(stderr, "ERROR[%s]: " str, program_name, ## args) +-fprintf(stderr, "ERROR[%s]: " str, program_name , ## args) +#define ERROR(str...) _ERROR( , ##str) +#define _ERROR(str, args...) \ +fprintf(stderr, "ERROR[%s]: " str, program_name, ##args) --#define WARNING(str, ...) \ --fprintf(stderr, "WARNING[%s]: " str, program_name, ## args) +-#define WARNING(str, args...) \ +-fprintf(stderr, "WARNING[%s]: " str, program_name , ## args) +#define WARNING(str...) _WARNING( , ##str) +#define _WARNING(str, args...) \ +fprintf(stderr, "WARNING[%s]: " str, program_name, ##args) -#define NOTE(str, args...) \ --fprintf(stderr, "Note[%s]: " str, program_name, ## args) +-fprintf(stderr, "Note[%s]: " str, program_name , ## args) +#define NOTE(str...) _NOTE(, ##str) +#define _NOTE(str, args...) \ +fprintf(stderr, "Note[%s]: " str, program_name, ##args) -#define DNOTE(str, args...) \ --fprintf(stderr, "Debug[%s]: " str, program_name, ## args) +-fprintf(stderr, "Debug[%s]: " str, program_name , ## args) +#define DNOTE(str...) _DNOTE( , ##str) +#define _DNOTE(str, args...) \ +fprintf(stderr, "Debug[%s]: " str, program_name, ##args) diff --git a/graphics/ogle/patches/patch-ab b/graphics/ogle/patches/patch-ab new file mode 100644 index 00000000000..f14e8d98e50 --- /dev/null +++ b/graphics/ogle/patches/patch-ab @@ -0,0 +1,34 @@ +$NetBSD: patch-ab,v 1.2.2.2 2002/06/23 18:46:53 jlam Exp $ + +--- configure.in.orig Wed Jun 12 00:00:28 2002 ++++ configure.in Thu Jun 13 12:03:11 2002 +@@ -351,16 +351,16 @@ + esac + fi + +-dnl check for openbsd audio ++dnl check for netbsd/openbsd audio + AC_ARG_ENABLE([obsdaudio], +- [ --disable-obsdaudio make a version not using OpenBSD audio]) ++ [ --disable-obsdaudio make a version not using NetBSD/OpenBSD audio]) + if test "x$enable_obsdaudio" != xno; then + case "$host" in +- *-openbsd*) ++ *-netbsd*|*-openbsd*) + + dnl only define LIBOGLEAO_OBSD headers found + dnl sys/audioio.h +- AC_DEFINE([LIBOGLEAO_OBSD],,[libogleao OpenBSD audio support]) ++ AC_DEFINE([LIBOGLEAO_OBSD],,[libogleao NetBSD/OpenBSD audio support]) + DEFAULT_AUDIO_DRIVER="obsd" + ;; + esac +@@ -371,7 +371,7 @@ + [ --disable-sunaudio make a version not using Sun audio]) + if test "x$enable_sunaudio" != xno; then + case "$host" in +- *-sun-solaris*|*-netbsd*) ++ *-sun-solaris*) + + dnl check for headers.. only define LIBOGLEAO_OSS if headers are found. + AC_DEFINE([LIBOGLEAO_SOLARIS],,[libogleao solaris audio support]) diff --git a/graphics/ogle/patches/patch-ac b/graphics/ogle/patches/patch-ac new file mode 100644 index 00000000000..942f7689853 --- /dev/null +++ b/graphics/ogle/patches/patch-ac @@ -0,0 +1,22 @@ +$NetBSD: patch-ac,v 1.2.2.2 2002/06/23 18:46:53 jlam Exp $ + +--- configure.orig Wed Jun 12 00:11:32 2002 ++++ configure Thu Jun 13 12:02:17 2002 +@@ -7367,7 +7367,7 @@ + + if test "x$enable_obsdaudio" != xno; then + case "$host" in +- *-openbsd*) ++ *-netbsd*|*-openbsd*) + + cat >> confdefs.h <<\EOF + #define LIBOGLEAO_OBSD +@@ -7386,7 +7386,7 @@ + + if test "x$enable_sunaudio" != xno; then + case "$host" in +- *-sun-solaris*|*-netbsd*) ++ *-sun-solaris*) + + cat >> confdefs.h <<\EOF + #define LIBOGLEAO_SOLARIS diff --git a/graphics/ogle/patches/patch-ad b/graphics/ogle/patches/patch-ad new file mode 100644 index 00000000000..ccc497c0145 --- /dev/null +++ b/graphics/ogle/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.1.2.2 2002/06/23 18:46:54 jlam Exp $ + +--- libogleao/oss_audio.c.orig Wed Jun 5 20:34:58 2002 ++++ libogleao/oss_audio.c Thu Jun 13 12:12:17 2002 +@@ -26,7 +26,7 @@ + #endif + #include <stdio.h> + +-#if defined(__OpenBSD__) ++#if defined(__OpenBSD__) || defined(__NetBSD__) + #include <soundcard.h> + #elif defined(__FreeBSD__) + #include <machine/soundcard.h> diff --git a/graphics/ogle/patches/patch-ae b/graphics/ogle/patches/patch-ae new file mode 100644 index 00000000000..7a0cccf54a1 --- /dev/null +++ b/graphics/ogle/patches/patch-ae @@ -0,0 +1,13 @@ +$NetBSD: patch-ae,v 1.1.2.2 2002/06/23 18:46:54 jlam Exp $ + +--- libogleao/obsd_audio.c.orig Wed Jun 5 20:34:58 2002 ++++ libogleao/obsd_audio.c Thu Jun 13 12:54:38 2002 +@@ -158,7 +158,7 @@ + odelay = instance->samples_written - info.play.samples; + */ + odelay = seek / instance->sample_frame_size; +- fprintf(stderr, "odelay: %d\n", odelay); ++/* fprintf(stderr, "odelay: %d\n", odelay); */ + + *samples_return = odelay; + diff --git a/graphics/ogle/patches/patch-af b/graphics/ogle/patches/patch-af new file mode 100644 index 00000000000..99f9a5df219 --- /dev/null +++ b/graphics/ogle/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.1.2.2 2002/06/23 18:46:55 jlam Exp $ + +--- ogle/dvdcontrol.c.orig Tue Apr 2 21:06:05 2002 ++++ ogle/dvdcontrol.c Thu Jun 13 13:57:25 2002 +@@ -24,7 +24,7 @@ + #include <ogle/msgevents.h> + #include <ogle/dvdcontrol.h> + +-#if (defined(__unix__) || defined(unix)) && !defined(USG) ++#if (defined(__unix__) || defined(unix) || defined(__NetBSD__)) && !defined(USG) + #include <sys/param.h> + #endif + diff --git a/graphics/ogle/patches/patch-ag b/graphics/ogle/patches/patch-ag new file mode 100644 index 00000000000..86cd8400d07 --- /dev/null +++ b/graphics/ogle/patches/patch-ag @@ -0,0 +1,13 @@ +$NetBSD: patch-ag,v 1.1.2.2 2002/06/23 18:46:55 jlam Exp $ + +--- ogle/dvdcontrol.h.orig Tue Apr 2 21:06:05 2002 ++++ ogle/dvdcontrol.h Thu Jun 13 13:57:32 2002 +@@ -22,7 +22,7 @@ + #include <ogle/dvd.h> + #include <ogle/msgevents.h> // Only for the hack with DVDNextEvent !! + +-#if (defined(__unix__) || defined(unix)) && !defined(USG) ++#if (defined(__unix__) || defined(unix) || defined(__NetBSD__)) && !defined(USG) + #include <sys/param.h> + #endif + diff --git a/graphics/ogle/patches/patch-ah b/graphics/ogle/patches/patch-ah new file mode 100644 index 00000000000..6b9dd05a4ca --- /dev/null +++ b/graphics/ogle/patches/patch-ah @@ -0,0 +1,13 @@ +$NetBSD: patch-ah,v 1.1.2.2 2002/06/23 18:46:55 jlam Exp $ + +--- ogle/msgevents.c.orig Sun Nov 25 19:04:04 2001 ++++ ogle/msgevents.c Thu Jun 13 13:58:17 2002 +@@ -25,7 +25,7 @@ + #include <errno.h> + #include <ogle/msgevents.h> + +-#if (defined(__unix__) || defined(unix)) && !defined(USG) ++#if (defined(__unix__) || defined(unix) || defined(__NetBSD__)) && !defined(USG) + #include <sys/param.h> + #endif + diff --git a/graphics/ogle/patches/patch-ai b/graphics/ogle/patches/patch-ai new file mode 100644 index 00000000000..540a44650ee --- /dev/null +++ b/graphics/ogle/patches/patch-ai @@ -0,0 +1,13 @@ +$NetBSD: patch-ai,v 1.1.2.2 2002/06/23 18:46:56 jlam Exp $ + +--- ogle/msgevents.h.orig Sun Jun 9 21:05:50 2002 ++++ ogle/msgevents.h Thu Jun 13 13:58:23 2002 +@@ -25,7 +25,7 @@ + #include <ogle/dvd.h> + #include <ogle/dvdevents.h> + +-#if (defined(__unix__) || defined(unix)) && !defined(USG) ++#if (defined(__unix__) || defined(unix) || defined(__NetBSD__)) && !defined(USG) + #include <sys/param.h> + #endif + diff --git a/graphics/ogle_gui/Makefile b/graphics/ogle_gui/Makefile index 2dd9a75224d..94c81d0ec6c 100644 --- a/graphics/ogle_gui/Makefile +++ b/graphics/ogle_gui/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.4 2002/04/28 22:21:15 wiz Exp $ +# $NetBSD: Makefile,v 1.4.2.1 2002/06/23 18:46:56 jlam Exp $ -DISTNAME= ogle_gui-0.8.2 -PKGREVISION= 1 +DISTNAME= ogle_gui-0.8.3 CATEGORIES= graphics MASTER_SITES= http://www.dtek.chalmers.se/groups/dvd/dist/ @@ -9,9 +8,9 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.dtek.chalmers.se/groups/dvd/ COMMENT= GUI for the Ogle DVD player -DEPENDS+= ogle>=0.8.2:../../graphics/ogle -# Normaly we would use the "../../devel/libglade/buildlink.mk" file, -# but this doesn't work here. Because ogle_gui wants libxml2 and the +DEPENDS+= ogle>=0.8.3:../../graphics/ogle +# Normally, we would use the "../../devel/libglade/buildlink.mk" file, +# but this doesn't work here, because ogle_gui wants libxml2 and the # buildlink file for libglade would also link it with libxml1. # This would result in an core dump. Thats why ogle_gui dlopens # libglade. @@ -23,7 +22,7 @@ GNU_CONFIGURE= yes USE_GMAKE= yes USE_CONFIG_WRAPPER= yes #USE_LIBTOOL= yes -BUILDLINK_DEPENDS.libxml2= libxml2>=2.4.5 +BUILDLINK_DEPENDS.libxml2= libxml2>=2.4.19 #LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig LDFLAGS+= -Wl,-R${LOCALBASE}/lib/ogle -L${LOCALBASE}/lib/ogle diff --git a/graphics/ogle_gui/PLIST b/graphics/ogle_gui/PLIST index 67dddd07b1b..9671df922c2 100644 --- a/graphics/ogle_gui/PLIST +++ b/graphics/ogle_gui/PLIST @@ -1,6 +1,8 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2001/12/10 20:58:55 veego Exp $ +@comment $NetBSD: PLIST,v 1.1.1.1.2.1 2002/06/23 18:46:56 jlam Exp $ lib/ogle/ogle_gui share/locale/de/LC_MESSAGES/ogle_gui.mo +share/locale/fr/LC_MESSAGES/ogle_gui.mo +share/locale/nl/LC_MESSAGES/ogle_gui.mo share/locale/sv/LC_MESSAGES/ogle_gui.mo share/ogle_gui/angle.xpm share/ogle_gui/enter.xpm diff --git a/graphics/ogle_gui/distinfo b/graphics/ogle_gui/distinfo index 4b8a67a37a3..69dff7046e8 100644 --- a/graphics/ogle_gui/distinfo +++ b/graphics/ogle_gui/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.2 2001/12/26 21:09:52 wiz Exp $ +$NetBSD: distinfo,v 1.2.2.1 2002/06/23 18:46:57 jlam Exp $ -SHA1 (ogle_gui-0.8.2.tar.gz) = 078c45d0b64ae909d67eaebe8216116e724e9fe8 -Size (ogle_gui-0.8.2.tar.gz) = 371428 bytes -SHA1 (patch-aa) = d6b6b0210ff2b57d83ce2a574f9e0d228fcf5ecd -SHA1 (patch-ab) = e5f2df6840f4913716569837ffbeab4b0a3ef929 +SHA1 (ogle_gui-0.8.3.tar.gz) = aa418375f455f82fbff7b4af04d44e36f9c0a7cf +Size (ogle_gui-0.8.3.tar.gz) = 354405 bytes +SHA1 (patch-aa) = 1238dfb676a32186231c3be20441b279f70329ff SHA1 (patch-ac) = 5a06dcc97b6749d533eaab1ba9d1128ca2a8368c diff --git a/graphics/ogle_gui/patches/patch-aa b/graphics/ogle_gui/patches/patch-aa index 6510d3d3d65..a2bee098af5 100644 --- a/graphics/ogle_gui/patches/patch-aa +++ b/graphics/ogle_gui/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/12/10 20:58:55 veego Exp $ +$NetBSD: patch-aa,v 1.1.1.1.2.1 2002/06/23 18:46:57 jlam Exp $ ---- configure-orig Wed Dec 5 22:43:32 2001 -+++ configure Sun Dec 9 12:15:07 2001 -@@ -16643,7 +16643,7 @@ - LIBGLADE_PREFIX=`$LIBGLADE_CONFIG --prefix` +--- configure.orig Mon Jun 10 23:58:10 2002 ++++ configure Thu Jun 13 14:14:34 2002 +@@ -10877,7 +10877,7 @@ + _ACEOF cat >>confdefs.h <<_ACEOF --#define LIBGLADE_LIB "${LIBGLADE_PREFIX}/lib/libglade.so.0" -+#define LIBGLADE_LIB "${LIBGLADE_PREFIX}/lib/libglade.so" +-#define LIBGLADE_LIB "libglade.so.0" ++#define LIBGLADE_LIB "libglade.so" _ACEOF if test "x${prefix}" = "xNONE"; then diff --git a/graphics/ogle_gui/patches/patch-ab b/graphics/ogle_gui/patches/patch-ab deleted file mode 100644 index 90659784dd0..00000000000 --- a/graphics/ogle_gui/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2001/12/10 20:58:55 veego Exp $ - ---- src/Makefile.in-orig Wed Dec 5 22:43:27 2001 -+++ src/Makefile.in Sun Dec 9 12:16:07 2001 -@@ -164,7 +164,7 @@ - interpret_config.$(OBJEXT) my_glade.$(OBJEXT) - ogle_gui_OBJECTS = $(am_ogle_gui_OBJECTS) - ogle_gui_DEPENDENCIES = --ogle_gui_LDFLAGS = -+ogle_gui_LDFLAGS = -export-dynamic - - DEFS = @DEFS@ - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) diff --git a/graphics/png/Makefile b/graphics/png/Makefile index 456bd1344fd..13288835999 100644 --- a/graphics/png/Makefile +++ b/graphics/png/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39.2.2 2002/06/21 23:05:25 jlam Exp $ +# $NetBSD: Makefile,v 1.39.2.3 2002/06/23 18:46:58 jlam Exp $ # On update, don't forget to increase shared library major/minor's in # accordance with changes (patch-aa). @@ -10,8 +10,9 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libpng/} \ ftp://swrinde.nde.swri.edu/pub/png/src/ \ ftp://ftp.simplesystems.org/pub/libpng/src/ \ ftp://ftp.fu-berlin.de/unix/graphics/png/src/ +EXTRACT_SUFX= .tar.bz2 -MAINTAINER= tron@netbsd.org +MAINTAINER= fredb@netbsd.org HOMEPAGE= http://www.libpng.org/pub/png/ COMMENT= Library for manipulating PNG images diff --git a/graphics/png/distinfo b/graphics/png/distinfo index 4f252aeb260..9e8b585a5d5 100644 --- a/graphics/png/distinfo +++ b/graphics/png/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.6 2002/03/13 17:43:38 fredb Exp $ +$NetBSD: distinfo,v 1.6.2.1 2002/06/23 18:46:58 jlam Exp $ -SHA1 (libpng-1.2.1.tar.gz) = 829dd4e00cc463dd3fa471032a9836cbff07aea5 -Size (libpng-1.2.1.tar.gz) = 493105 bytes +SHA1 (libpng-1.2.1.tar.bz2) = e9efb0bfabf365726abdf84571ef5d445753a513 +Size (libpng-1.2.1.tar.bz2) = 365115 bytes SHA1 (patch-aa) = be98bd25c8597df17bda14567ae2f128247a35e0 diff --git a/graphics/qiv/DESCR b/graphics/qiv/DESCR new file mode 100644 index 00000000000..ffd75dc3d21 --- /dev/null +++ b/graphics/qiv/DESCR @@ -0,0 +1 @@ +Quick Image Viewer is a very small and pretty fast Gdk/Imlib image viewer. diff --git a/graphics/qiv/Makefile b/graphics/qiv/Makefile new file mode 100644 index 00000000000..d3e8077245b --- /dev/null +++ b/graphics/qiv/Makefile @@ -0,0 +1,19 @@ +# $NetBSD: Makefile,v 1.2.2.2 2002/06/23 18:46:59 jlam Exp $ +# + +DISTNAME= qiv-1.7-src +PKGNAME= qiv-1.7 +WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} +CATEGORIES= graphics +MASTER_SITES= http://www.klografx.net/qiv/download/ +EXTRACT_SUFX= .tgz + +MAINTAINER= packages@netbsd.org +HOMEPAGE= http://www.klografx.net/qiv/download/ +COMMENT= Quick image viewer + +USE_GMAKE= yes +USE_BUILDLINK_ONLY= yes + +.include "../../graphics/imlib/buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/graphics/qiv/PLIST b/graphics/qiv/PLIST new file mode 100644 index 00000000000..f21d421b931 --- /dev/null +++ b/graphics/qiv/PLIST @@ -0,0 +1,3 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.50.2 2002/06/23 18:47:00 jlam Exp $ +bin/qiv +man/man1/qiv.1 diff --git a/graphics/qiv/distinfo b/graphics/qiv/distinfo new file mode 100644 index 00000000000..07b2c2bf567 --- /dev/null +++ b/graphics/qiv/distinfo @@ -0,0 +1,5 @@ +$NetBSD: distinfo,v 1.1.1.1.2.2 2002/06/23 18:47:00 jlam Exp $ + +SHA1 (qiv-1.7-src.tgz) = 5dc8db9cdece29e8184207ea6015ff81c5b47368 +Size (qiv-1.7-src.tgz) = 88107 bytes +SHA1 (patch-aa) = 4d26a1ddd2b5534dc7437eccf883597e54d0e03e diff --git a/graphics/qiv/patches/patch-aa b/graphics/qiv/patches/patch-aa new file mode 100644 index 00000000000..5bbb9e140f3 --- /dev/null +++ b/graphics/qiv/patches/patch-aa @@ -0,0 +1,58 @@ +$NetBSD: patch-aa,v 1.1.1.1.2.2 2002/06/23 18:47:01 jlam Exp $ + +--- Makefile.orig Sun Jun 10 14:35:06 2001 ++++ Makefile +@@ -4,7 +4,7 @@ + ###################################################################### + + # Directory where qiv will be installed under. +-PREFIX = /usr/local ++#PREFIX = /usr/local + + # Font to use for statusbar in fullscreen mode + STATUSBAR_FONT = "fixed" +@@ -24,11 +24,11 @@ + EXTNS = GIF TIFF XPM XBM PNG PPM PNM PGM PCX BMP EIM JPEG TGA + + # Comment this line out if your system doesn't have getopt_long(). +-GETOPT_LONG = -DHAVE_GETOPT_LONG ++#GETOPT_LONG = -DHAVE_GETOPT_LONG + + # This program will be run on the manual page after it is installed. + # If you don't want to compress the manpage, change it to 'true'. +-COMPRESS_PROG = gzip -9f ++COMPRESS_PROG = true + + ###################################################################### + +@@ -58,8 +58,8 @@ + -fcaller-saves -ffast-math -fno-strength-reduce \ + -fthread-jumps #-march=pentium #-DSTAT_MACROS_BROKEN + +-INCLUDES = `imlib-config --cflags-gdk` +-LIBS = `imlib-config --libs-gdk` ++INCLUDES = `${IMLIB_CONFIG} --cflags-gdk` ++LIBS = `${IMLIB_CONFIG} --libs-gdk` + + PROGRAM = qiv + OBJS = main.o image.o event.o options.o utils.o +@@ -112,13 +112,13 @@ + + install: $(PROGRAM) + @echo "Installing..." +- install -s -m 0755 $(PROGRAM) $(PREFIX)/bin +- install -m 0644 $(PROGRAM).1 $(PREFIX)/man/man1 ++ install -c -s -m 0755 $(PROGRAM) $(PREFIX)/bin ++ install -c -m 0644 $(PROGRAM).1 $(PREFIX)/man/man1 + $(COMPRESS_PROG) $(PREFIX)/man/man1/$(PROGRAM).1 +- @if ./qiv -o white -f ./intro.jpg ; \ +- then echo "-- Test Passed --" ; \ +- else echo "-- Test Failed --" ; \ +- fi ++# @if ./qiv -o white -f ./intro.jpg ; \ ++# then echo "-- Test Passed --" ; \ ++# else echo "-- Test Failed --" ; \ ++# fi + + install-xscreensaver: install + @echo "#!/bin/sh" > $(SS_PROG) diff --git a/graphics/xanim/Makefile b/graphics/xanim/Makefile index 9794384cc37..3f93aeba163 100644 --- a/graphics/xanim/Makefile +++ b/graphics/xanim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2002/02/07 09:59:48 agc Exp $ +# $NetBSD: Makefile,v 1.25.2.1 2002/06/23 18:47:01 jlam Exp $ DISTNAME= xanim2801 PKGNAME= xanim-2.80.1 @@ -49,24 +49,28 @@ do-install: MACHINE_OBJ_ARCH= ${MACHINE_ARCH}-${OBJECT_FMT} -.if (${MACHINE_OBJ_ARCH} == "i386-a.out") -EXTRA_FILES= xa2.0_cvid_netbsd386.o.Z \ +.if (${MACHINE_OBJ_ARCH} == "i386-a.out") || make(makesum) +EXTRA_FILES+= xa2.0_cvid_netbsd386.o.Z \ xa2.0_iv32_netbsd386.o.Z \ xa1.0_cyuv_netbsd386.o.Z -.elif (${MACHINE_OBJ_ARCH} == "i386-ELF") -EXTRA_FILES= xa2.0_cvid_linuxELF.o.Z \ +.endif +.if (${MACHINE_OBJ_ARCH} == "i386-ELF") || make(makesum) +EXTRA_FILES+= xa2.0_cvid_linuxELF.o.Z \ xa2.0_iv32_linuxELF.o.Z \ xa1.0_cyuv_linuxELF.o.Z -.elif (${MACHINE_OBJ_ARCH} == "m68k-a.out") -EXTRA_FILES= xa2.0_cvid_netbsd68k.o.Z \ +.endif +.if (${MACHINE_OBJ_ARCH} == "m68k-a.out") || make(makesum) +EXTRA_FILES+= xa2.0_cvid_netbsd68k.o.Z \ xa2.0_iv32_netbsd68k.o.Z \ xa1.0_cyuv_netbsd68k.o.Z -.elif (${MACHINE_OBJ_ARCH} == "sparc-a.out") -EXTRA_FILES= xa2.0_cvid_sparcCOFF.o.Z \ +.endif +.if (${MACHINE_OBJ_ARCH} == "sparc-a.out") || make(makesum) +EXTRA_FILES+= xa2.0_cvid_sparcCOFF.o.Z \ xa2.0_iv32_sparcCOFF.o.Z \ xa1.0_cyuv_sparcAOUT.o.Z -.elif (${MACHINE_OBJ_ARCH} == "powerpc-ELF") -EXTRA_FILES= xa2.0_cvid_linuxPPC.o.Z \ +.endif +.if (${MACHINE_OBJ_ARCH} == "powerpc-ELF") || make(makesum) +EXTRA_FILES+= xa2.0_cvid_linuxPPC.o.Z \ xa1.0_cyuv_linuxPPC.o.Z .endif diff --git a/graphics/xanim/distinfo b/graphics/xanim/distinfo index 0ccee43df0c..245dbaa34cb 100644 --- a/graphics/xanim/distinfo +++ b/graphics/xanim/distinfo @@ -1,13 +1,31 @@ -$NetBSD: distinfo,v 1.6 2001/10/21 15:40:51 mycroft Exp $ +$NetBSD: distinfo,v 1.6.2.1 2002/06/23 18:47:02 jlam Exp $ SHA1 (xanim2801.tar.gz) = 1966880880c3779d02199fbcd1acb771bc57f754 Size (xanim2801.tar.gz) = 441250 bytes +SHA1 (xa2.0_cvid_netbsd386.o.Z) = eea4f7c94bd7dcfd7e592add0fa415cb1514efa0 +Size (xa2.0_cvid_netbsd386.o.Z) = 4067 bytes +SHA1 (xa2.0_iv32_netbsd386.o.Z) = e096322d85c21a8bf6afb5c8cd066c52cdd6e132 +Size (xa2.0_iv32_netbsd386.o.Z) = 46631 bytes +SHA1 (xa1.0_cyuv_netbsd386.o.Z) = 08ad405baeffb1f72b9f9d960d0c11f6d81e7c07 +Size (xa1.0_cyuv_netbsd386.o.Z) = 937 bytes SHA1 (xa2.0_cvid_linuxELF.o.Z) = 7ce0db7c2007f13294342a863a90000a5d097b4f Size (xa2.0_cvid_linuxELF.o.Z) = 4382 bytes SHA1 (xa2.0_iv32_linuxELF.o.Z) = 937368f4f90f9023955b59e54c1182804e40d7ed Size (xa2.0_iv32_linuxELF.o.Z) = 46511 bytes SHA1 (xa1.0_cyuv_linuxELF.o.Z) = 71a81709b161a48e75d05a2a612f1f62034fee15 Size (xa1.0_cyuv_linuxELF.o.Z) = 1242 bytes +SHA1 (xa2.0_cvid_netbsd68k.o.Z) = 1e56d834c6bb3a0e26e2872601dfa9082487345c +Size (xa2.0_cvid_netbsd68k.o.Z) = 3779 bytes +SHA1 (xa2.0_iv32_netbsd68k.o.Z) = 9de53c2225d0ae117c7b23fa7415017611058441 +Size (xa2.0_iv32_netbsd68k.o.Z) = 44353 bytes +SHA1 (xa1.0_cyuv_netbsd68k.o.Z) = 8478c3240581c2887dc63a7a9eac2cdb79f610a2 +Size (xa1.0_cyuv_netbsd68k.o.Z) = 942 bytes +SHA1 (xa2.0_cvid_sparcCOFF.o.Z) = 1306ee5c88415b4a67b65247d41fa03101526a64 +Size (xa2.0_cvid_sparcCOFF.o.Z) = 4535 bytes +SHA1 (xa2.0_iv32_sparcCOFF.o.Z) = 0307f18f02763b2b3229ed4b3a00eeec7bc2c56d +Size (xa2.0_iv32_sparcCOFF.o.Z) = 48525 bytes +SHA1 (xa1.0_cyuv_sparcAOUT.o.Z) = c31c60ac3a519bbdce9e4d9652f274b1194e880a +Size (xa1.0_cyuv_sparcAOUT.o.Z) = 1048 bytes SHA1 (xa2.0_cvid_linuxPPC.o.Z) = d6736d7fe65008293863c31b8f4c28e13152afda Size (xa2.0_cvid_linuxPPC.o.Z) = 5192 bytes SHA1 (xa1.0_cyuv_linuxPPC.o.Z) = b9af24646b46d94ccfb5e042ca20f32006a8b0af diff --git a/graphics/xanim/files/patch-sum b/graphics/xanim/files/patch-sum new file mode 100644 index 00000000000..01b1e8aa359 --- /dev/null +++ b/graphics/xanim/files/patch-sum @@ -0,0 +1,4 @@ +$NetBSD: patch-sum,v 1.3.2.1 2002/06/23 18:47:02 jlam Exp $ + +MD5 (patch-ab) = 7ccc04ad7ca0af49a9b0b05372caeb0e +MD5 (patch-ae) = 7c9d722e2ec3e20296db301db5e91f22 diff --git a/graphics/xanim/patches/patch-ae b/graphics/xanim/patches/patch-ae index 080076a2869..b832d154abe 100644 --- a/graphics/xanim/patches/patch-ae +++ b/graphics/xanim/patches/patch-ae @@ -1,3 +1,4 @@ +$NetBSD: patch-ae,v 1.1.2.1 2002/06/23 18:47:03 jlam Exp $ --- xa_audio.c.original Fri Aug 24 17:33:57 2001 +++ xa_audio.c Fri Aug 24 17:35:14 2001 @@ -4665,10 +4665,10 @@ diff --git a/graphics/xpm/distinfo b/graphics/xpm/distinfo index bd2006162f0..d4f3bcc972b 100644 --- a/graphics/xpm/distinfo +++ b/graphics/xpm/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.5 2001/07/06 21:11:33 tron Exp $ +$NetBSD: distinfo,v 1.5.2.1 2002/06/23 18:47:03 jlam Exp $ SHA1 (xpm-3.4k.tar.gz) = a8eac19e5772bf7b3b177353686c1401fbf334bd Size (xpm-3.4k.tar.gz) = 148887 bytes SHA1 (patch-aa) = 86264a0d832382eef43af740f16bcdf9448f4573 SHA1 (patch-ab) = 0c8f317cdbde27929790e46d1711ada5e454b79d SHA1 (patch-ac) = a0f1692ecfbf0160f5e5a5e3f31ac9398ff667b7 +SHA1 (patch-ad) = fb85487779cf5430224ae6f0a8cdc55350687eae diff --git a/graphics/xpm/patches/patch-ad b/graphics/xpm/patches/patch-ad new file mode 100644 index 00000000000..dac16f49ee4 --- /dev/null +++ b/graphics/xpm/patches/patch-ad @@ -0,0 +1,12 @@ +$NetBSD: patch-ad,v 1.3.2.2 2002/06/23 18:47:04 jlam Exp $ + +--- lib/XpmI.h.orig Thu Mar 19 20:51:00 1998 ++++ lib/XpmI.h Mon May 13 00:33:23 2002 +@@ -42,6 +42,7 @@ + #ifndef XPMI_h + #define XPMI_h + ++#include <X11/Xmd.h> + #include "xpm.h" + + /* diff --git a/ham/cwtext/Makefile b/ham/cwtext/Makefile index 5719a926d01..80fbe532abd 100644 --- a/ham/cwtext/Makefile +++ b/ham/cwtext/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2002/04/19 15:19:07 zuntum Exp $ +# $NetBSD: Makefile,v 1.2.2.1 2002/06/23 18:47:05 jlam Exp $ DISTNAME= cwtext-0.91 CATEGORIES= ham -MASTER_SITES= http://prdownloads.sourceforge.net/cwtext/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cwtext/} MAINTAINER= packages@netbsd.org HOMEPAGE= http://cwtext.sourceforge.net/ diff --git a/ham/yaesu/distinfo b/ham/yaesu/distinfo index 900735c0113..7d13c58a19b 100644 --- a/ham/yaesu/distinfo +++ b/ham/yaesu/distinfo @@ -1,7 +1,8 @@ + SHA1 (yaesu-0.12.tar.gz) = a073e78f0635c84222176941e39cc62dca92f00d Size (yaesu-0.12.tar.gz) = 24694 bytes -SHA1 (patch-aa) = 45e9d3ad4f1078314c7d511b30b361ca3e1296dd -SHA1 (patch-ab) = 8cbb28d281b0155fac1eb38f9e83ba764adc4f46 -SHA1 (patch-ac) = 8445a04d1d341410d23f533ca34ea3a4841af400 -SHA1 (patch-ad) = 2c464c4610ce9340b3582c0daf6124de87bf2d5e +SHA1 (patch-aa) = 9fc04c222e7ed26c8e73449e475ff639d7ced051 +SHA1 (patch-ab) = 0a96f808929b7d1f1d4363e57c24dd33142e5f4e +SHA1 (patch-ac) = cd5ee0384a53f436e07b4cec904c3a2176a40cdf +SHA1 (patch-ad) = 89bb7dc00a7da82778ed357594cb5d0dfa756f64 diff --git a/ham/yaesu/patches/patch-aa b/ham/yaesu/patches/patch-aa index ca9772672c6..68e0ad55f73 100644 --- a/ham/yaesu/patches/patch-aa +++ b/ham/yaesu/patches/patch-aa @@ -1,12 +1,13 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/05/08 00:02:39 hubertf Exp $ +$NetBSD: patch-aa,v 1.1.1.1.2.1 2002/06/23 18:47:06 jlam Exp $ ---- main.c.orig Sat Apr 13 21:01:49 2002 -+++ main.c -@@ -5,7 +5,6 @@ - #include <stdlib.h> - #include <termios.h> - #include <signal.h> --#include <asm/io.h> - #include <config.h> - float freq_to_change_to; - char flag_data_return[5]; +--- Makefile.orig Mon Aug 21 00:25:07 1995 ++++ Makefile +@@ -1,6 +1,7 @@ + INCDIR = ./ + CC = gcc +-FLAGS = -m486 -funsigned-char ++#FLAGS = -m486 -funsigned-char ++FLAGS = -funsigned-char + OBJS = aux.o bright.o clar.o ctcss.o freq_out.o ham_gen.o lock.o main.o mem_hide.o mem_2vfo.o mem_scsk.o meter_rd.o mode.o outport.o pacing.o ptt.o rd_flags.o mem_rec.o rptr_off.o save_mem.o splt_tog.o strt_tun.o stat_upd.o stat_out.o step.o tuner10.o vfo_ab.o vfo_2mem.o repeater.o vfo_a2b.o wwv_find.o yaesu.o + all: program + diff --git a/ham/yaesu/patches/patch-ab b/ham/yaesu/patches/patch-ab index 46dff3a5f72..b2d9970b2be 100644 --- a/ham/yaesu/patches/patch-ab +++ b/ham/yaesu/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/05/08 00:02:39 hubertf Exp $ +$NetBSD: patch-ab,v 1.1.1.1.2.1 2002/06/23 18:47:06 jlam Exp $ ---- README.orig Sat Apr 13 21:05:20 2002 +--- README.orig Sun Sep 20 11:34:46 1998 +++ README -@@ -34,8 +34,8 @@ +@@ -34,13 +34,20 @@ to make a note of it. Off to usage... Using my program is very simple, to execute it you must provide the com port @@ -13,3 +13,16 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/05/08 00:02:39 hubertf Exp $ type in the following... 'yaesu 3' + +-where 3 represents com4. Once you have gotten this far with the correct port, ++where 3 represents com4. ++ ++If you need to use a different device, you can specify that with -p serial_device, ++for example: ++ ++ yaesu -p /dev/ttyC1 ++ ++Once you have gotten this far with the correct port, + the program's menu should guide you along. Please see the bug list, disclaimer + and copying section below. + diff --git a/ham/yaesu/patches/patch-ac b/ham/yaesu/patches/patch-ac index 2c7a8fe8597..8ff02a92146 100644 --- a/ham/yaesu/patches/patch-ac +++ b/ham/yaesu/patches/patch-ac @@ -1,6 +1,6 @@ -$NetBSD: patch-ac,v 1.1.1.1 2002/05/08 00:02:39 hubertf Exp $ +$NetBSD: patch-ac,v 1.1.1.1.2.1 2002/06/23 18:47:06 jlam Exp $ ---- config.h.orig Sat Apr 13 21:06:53 2002 +--- config.h.orig Mon Aug 21 00:25:07 1995 +++ config.h @@ -1,10 +1,10 @@ /* diff --git a/ham/yaesu/patches/patch-ad b/ham/yaesu/patches/patch-ad index 21a1968d3d1..b87a569121c 100644 --- a/ham/yaesu/patches/patch-ad +++ b/ham/yaesu/patches/patch-ad @@ -1,15 +1,26 @@ -$NetBSD: patch-ad,v 1.1.1.1 2002/05/08 00:02:39 hubertf Exp $ +$NetBSD: patch-ad,v 1.1.1.1.2.1 2002/06/23 18:47:07 jlam Exp $ ---- main.c.orig Sat Apr 13 21:07:41 2002 +the addition of the -p flag is required for non-PC machines which +might use a different serial device. + +--- main.c.orig Sat Nov 4 17:48:33 1995 +++ main.c -@@ -100,29 +100,29 @@ +@@ -5,7 +5,6 @@ + #include <stdlib.h> + #include <termios.h> + #include <signal.h> +-#include <asm/io.h> + #include <config.h> + float freq_to_change_to; + char flag_data_return[5]; +@@ -100,29 +99,29 @@ if (argc == 2) { switch(argv[1][0]) { case '0': - if ((fdSer = open("/dev/ttyS0", O_RDWR )) < 0) { - perror("open of /dev/ttyS0 failed!!!\n"); -+ if ((fdSer = open("/dev/ttyE0", O_RDWR )) < 0) { -+ perror("open of /dev/ttyE0 failed!!!\n"); ++ if ((fdSer = open("/dev/tty00", O_RDWR )) < 0) { ++ perror("open of /dev/tty00 failed!!!\n"); exit(3); } break; @@ -17,8 +28,8 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/05/08 00:02:39 hubertf Exp $ case '1': - if ((fdSer = open("/dev/ttyS1", O_RDWR )) < 0) { - perror("open of /dev/ttyS1 failed!!!\n"); -+ if ((fdSer = open("/dev/ttyE1", O_RDWR )) < 0) { -+ perror("open of /dev/ttyE1 failed!!!\n"); ++ if ((fdSer = open("/dev/tty01", O_RDWR )) < 0) { ++ perror("open of /dev/tty01 failed!!!\n"); exit(3); } break; @@ -26,8 +37,8 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/05/08 00:02:39 hubertf Exp $ case '2': - if ((fdSer = open("/dev/ttyS2", O_RDWR )) < 0) { - perror("open of /dev/ttyS2 failed"); -+ if ((fdSer = open("/dev/ttyE2", O_RDWR )) < 0) { -+ perror("open of /dev/ttyE2 failed"); ++ if ((fdSer = open("/dev/tty02", O_RDWR )) < 0) { ++ perror("open of /dev/tty02 failed"); exit(3); } break; @@ -35,8 +46,24 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/05/08 00:02:39 hubertf Exp $ case '3': - if ((fdSer = open("/dev/ttyS3", O_RDWR )) < 0) { - perror("open of /dev/ttyS3 failed"); -+ if ((fdSer = open("/dev/ttyE3", O_RDWR )) < 0) { -+ perror("open of /dev/ttyE3 failed"); ++ if ((fdSer = open("/dev/tty03", O_RDWR )) < 0) { ++ perror("open of /dev/tty03 failed"); exit(3); } break; +@@ -130,6 +129,15 @@ + printf("Invalid serial port number!!!\n Remember: com1 is 0, com2 is 1, etc.\n"); + return(-1); + } ++ } else if (argc == 3) { ++ if (strcmp("-p",argv[1]) != 0) { ++ perror("Invalid flag"); ++ exit(3); ++ } ++ if ((fdSer = open(argv[2], O_RDWR )) < 0) { ++ perror("open of serial port failed"); ++ exit(3); ++ } + } else { + printf("usage: yaesu [port #]\n"); + exit(3); diff --git a/inputmethod/Chinput/DESCR b/inputmethod/Chinput/DESCR new file mode 100644 index 00000000000..b95786025cf --- /dev/null +++ b/inputmethod/Chinput/DESCR @@ -0,0 +1,5 @@ +Chinput is a Chinese input server. It supports XIM(X Input Method) +Protocol and its own protocol for Chinese platform. XIM is the +standard input protocol for DBCS input in X11. All the clients can +use it if they support XIM. Chinput now use the input engine(IME) +from Unicon, and it can support both GB and Big5 charset. diff --git a/inputmethod/Chinput/Makefile b/inputmethod/Chinput/Makefile new file mode 100644 index 00000000000..6c5645bfad1 --- /dev/null +++ b/inputmethod/Chinput/Makefile @@ -0,0 +1,38 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:47:08 jlam Exp $ + +DISTNAME= Chinput-3.0 +CATEGORIES= inputmethod +MASTER_SITES= http://download.linuxbyte.net/Chinese/Input/ + +MAINTAINER= rxg@netbsd.org +HOMEPAGE= http://www.opencjk.org/~yumj/project-chinput.html +COMMENT= Chinese input server + +DEPENDS+= unicon-im>=1.2:../../inputmethod/unicon-im + +USE_PTHREAD= native pth +USE_X11BASE= yes + +ALL_TARGET= chinput + +post-patch: + ${SED} -e 's:/usr/dict:'${LOCALBASE}/lib/unicon':g' < \ + ${WRKSRC}/src/init.c > ${WRKSRC}/src/init.c.tmp + ${SED} -e 's:/usr/lib/ZWinPro:'${PREFIX}/etc':g' < \ + ${WRKSRC}/src/init.c.tmp > ${WRKSRC}/src/init.c + ${MV} ${WRKSRC}/resource/Chinput.ad ${WRKSRC}/resource/Chinput.ad.tmp + ${SED} -e 's:/usr/lib/unicon2:'${LOCALBASE}/lib/unicon':g' < \ + ${WRKSRC}/resource/Chinput.ad.tmp > \ + ${WRKSRC}/resource/Chinput.ad + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/src/chinput ${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/resource/Chinput.ad ${PREFIX}/etc + +post-install: + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/Chinput + ${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/Chinput + +.include "../../mk/pthread.buildlink.mk" +.include "../../mk/x11.buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/inputmethod/Chinput/PLIST b/inputmethod/Chinput/PLIST new file mode 100644 index 00000000000..7e59b940195 --- /dev/null +++ b/inputmethod/Chinput/PLIST @@ -0,0 +1,12 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.48.2 2002/06/23 18:47:08 jlam Exp $ +bin/chinput +etc/Chinput.ad +share/doc/Chinput/API +share/doc/Chinput/BUGS +share/doc/Chinput/CHANGES +share/doc/Chinput/COPYING +share/doc/Chinput/FAQ +share/doc/Chinput/INSTALL +share/doc/Chinput/README +share/doc/Chinput/USAGE +@dirrm share/doc/Chinput diff --git a/inputmethod/Chinput/distinfo b/inputmethod/Chinput/distinfo new file mode 100644 index 00000000000..5888fba5ad1 --- /dev/null +++ b/inputmethod/Chinput/distinfo @@ -0,0 +1,10 @@ +$NetBSD: distinfo,v 1.1.1.1.12.2 2002/06/23 18:47:09 jlam Exp $ + +SHA1 (Chinput-3.0.tar.gz) = de6da2c8c53b38c1b23aee73c1aced90628e57d8 +Size (Chinput-3.0.tar.gz) = 484374 bytes +SHA1 (patch-aa) = c014ab66c2e6f32d66b55dec073ad9fccc1c5df0 +SHA1 (patch-ab) = e2b98ae50ddc28c986e3235345a67af964f02a60 +SHA1 (patch-ac) = f4d45c2ea45e3e8288cdb0363dc9dba127288990 +SHA1 (patch-ad) = 8a9fb407307bcd823e6050ab65e9e20bb512e367 +SHA1 (patch-ae) = f3854f86cb2780bf710db84e2bc38b51671dd4b1 +SHA1 (patch-af) = db621ebb06d22d948513451c4b5b670494dd5d46 diff --git a/inputmethod/Chinput/patches/patch-aa b/inputmethod/Chinput/patches/patch-aa new file mode 100644 index 00000000000..a5b301f3fbc --- /dev/null +++ b/inputmethod/Chinput/patches/patch-aa @@ -0,0 +1,36 @@ +$NetBSD: patch-aa,v 1.1.1.1.50.2 2002/06/23 18:47:10 jlam Exp $ + +--- src/Makefile.orig Mon Jun 10 21:05:56 2002 ++++ src/Makefile +@@ -1,20 +1,16 @@ + +-CC = gcc + + # do you have imlib? + #No, I don't have that strange library + #IMLIB = + #LIBIMLIB = +-#Yes I have +-IMLIB = -DIMLIB +-LIBIMLIB = -lImlib + + #CFLAGS = -Wall -g -DFOR_PILOT_COMPAT -O2 -fno-strength-reduce -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE=500L -D_BSD_SOURCE -D_SVID_SOURCE -DFUNCPROTO=15 -DNARROWPROTO +-CFLAGS = -Wall -g -DFOR_PILOT_COMPAT -O2 -fno-strength-reduce ++CFLAGS += -Wall -DFOR_PILOT_COMPAT -O2 -fno-strength-reduce + + INC = -I./include -I./IMdkit/include -I/usr/include -I/usr/X11R6/include + +-LIB = -L/usr/X11R6/lib -lXext -lX11 ./IMdkit/lib/libXimd.a -L/usr/lib/unicon2 -limmclient -Wl,-rpath=/usr/lib/unicon2 -limm_server -lpth -ldl ++LIB = -lXext -lX11 ./IMdkit/lib/libXimd.a -limmclient -limm_server -lpth + + SRC = chinput.c init.c server.c config.c color.c util.c convert.c IC.c XIM.c focus.c root.c overspot.c onspot.c offspot.c voice.c keyboard.c handw.c hwengine.c loop.c + +@@ -23,7 +19,7 @@ + all: chinput + + chinput: IMdkit/lib/libXimd.a $(OBJ) +- g++ -o chinput $(OBJ) $(LIB) $(LIBIMLIB) ++ $(CC) -o chinput $(OBJ) $(LDFLAGS) $(LIB) $(LIBIMLIB) + + .c.o: + $(CC) -c $(CFLAGS) $(IMLIB) $(INC) $< diff --git a/inputmethod/Chinput/patches/patch-ab b/inputmethod/Chinput/patches/patch-ab new file mode 100644 index 00000000000..97259df183c --- /dev/null +++ b/inputmethod/Chinput/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1.1.1.50.2 2002/06/23 18:47:11 jlam Exp $ + +--- src/XIM.h.orig Mon Jun 10 21:19:55 2002 ++++ src/XIM.h +@@ -25,7 +25,7 @@ + //setenv XMODIFIERS @im=Chinput (csh, tcsh) + #define DEFAULT_IMNAME "Chinput" + +-#define LOCALE_GB "zh_CN.GBK" ++#define LOCALE_GB "zh_CN.eucCN" + #define LOCALE_BIG5 "zh_TW.Big5" + + //This input server support CJK by default diff --git a/inputmethod/Chinput/patches/patch-ac b/inputmethod/Chinput/patches/patch-ac new file mode 100644 index 00000000000..572a3f7a3d5 --- /dev/null +++ b/inputmethod/Chinput/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.1.1.1.50.2 2002/06/23 18:47:11 jlam Exp $ + +--- src/chinput.c.orig Mon Jun 10 21:16:56 2002 ++++ src/chinput.c +@@ -75,7 +75,7 @@ + HZloadRCFile(); //resource file + HZloadRCIME(); //IME lists from Chinput.ad + HZparseParameters(argc, argv); //parse parameters +- setlocale(LC_ALL, deflocale); //locale set ++ setlocale(LC_CTYPE, deflocale); //locale set + HZinitDisplay(); //display init + HZinitServerFont(); //font init + HZinitWindows(); //windows geometry init diff --git a/inputmethod/Chinput/patches/patch-ad b/inputmethod/Chinput/patches/patch-ad new file mode 100644 index 00000000000..962feb5f0dc --- /dev/null +++ b/inputmethod/Chinput/patches/patch-ad @@ -0,0 +1,31 @@ +$NetBSD: patch-ad,v 1.1.1.1.50.2 2002/06/23 18:47:12 jlam Exp $ + +--- src/config.c.orig Mon Jun 10 22:53:45 2002 ++++ src/config.c +@@ -388,7 +388,7 @@ + if(method == cur_inputmethod) return; + + //change the encoding for later use +- if(!strcmp(chinputime[method].encoding, "GB")) ++ if(!strcmp(chinputime[method].encoding, "eucCN")) + HZServer.encoding = HZSERVER_ENCODING_GB; + else + HZServer.encoding = HZSERVER_ENCODING_BIG5; +@@ -681,7 +681,7 @@ + if(HZServer.encoding == HZSERVER_ENCODING_GB){ + for(i=0; i<index_ime; i++){ + if(!strcmp(chinputime[i].name, imd) && +- !strcmp(chinputime[i].encoding, "GB")){ ++ !strcmp(chinputime[i].encoding, "eucCN")){ + return i; + } + } +@@ -738,7 +738,7 @@ + //chinput_imserver = IMM_OpenClient("127.0.0.1", 9010); + + cur_inputmethod = id; +- if(!strcmp(chinputime[cur_inputmethod].encoding, "GB")) ++ if(!strcmp(chinputime[cur_inputmethod].encoding, "eucCN")) + HZServer.encoding = HZSERVER_ENCODING_GB; + else + HZServer.encoding = HZSERVER_ENCODING_BIG5; diff --git a/inputmethod/Chinput/patches/patch-ae b/inputmethod/Chinput/patches/patch-ae new file mode 100644 index 00000000000..4b470a53755 --- /dev/null +++ b/inputmethod/Chinput/patches/patch-ae @@ -0,0 +1,22 @@ +$NetBSD: patch-ae,v 1.1.1.1.50.2 2002/06/23 18:47:12 jlam Exp $ + +--- src/init.c.orig Mon Jun 10 21:23:44 2002 ++++ src/init.c +@@ -342,7 +342,7 @@ + //enable two locales at the same time + strcpy(imlocale, IMLOCALE); + +- if(getenv("LC_ALL") && strstr(getenv("LC_ALL"), "zh_TW")){ ++ if(getenv("LC_CTYPE") && strstr(getenv("LC_CTYPE"), "zh_TW.Big5")){ + strcpy(deflocale, LOCALE_BIG5); + //strcpy(imlocale, "zh_TW"); + flag_encoding = HZSERVER_ENCODING_BIG5; +@@ -567,7 +567,7 @@ + } + fclose(fp); + +- if(strstr(getenv("LC_ALL"), "zh_TW")) ++ if(strstr(getenv("LC_CTYPE"), "zh_TW.Big5")) + cur_inputmethod = HZgetInputMethod(input_method_big5); + else + cur_inputmethod = HZgetInputMethod(input_method_gb); diff --git a/inputmethod/Makefile b/inputmethod/Makefile new file mode 100644 index 00000000000..836cfacb0c7 --- /dev/null +++ b/inputmethod/Makefile @@ -0,0 +1,28 @@ +# $NetBSD: Makefile,v 1.6.2.2 2002/06/23 18:47:07 jlam Exp $ +# + +COMMENT= Input method tools and libraries + +SUBDIR+= Chinput +SUBDIR+= canna-dict +SUBDIR+= canna-lib +SUBDIR+= canna-server +SUBDIR+= canna-server-bin +SUBDIR+= canuum +SUBDIR+= ja-freewnn-dict +SUBDIR+= ja-freewnn-lib +SUBDIR+= ja-freewnn-server +SUBDIR+= ja-freewnn-server-bin +SUBDIR+= kinput2 +SUBDIR+= libtabe +SUBDIR+= sj3-dict +SUBDIR+= sj3-lib +SUBDIR+= sj3-server +SUBDIR+= sj3-server-bin +SUBDIR+= skkfep +SUBDIR+= skkinput +SUBDIR+= skkserv +SUBDIR+= unicon-im +SUBDIR+= xcin + +.include "../mk/bsd.pkg.subdir.mk" |