head 1.6; access; symbols pkgsrc-2013Q2:1.6.0.52 pkgsrc-2013Q2-base:1.6 pkgsrc-2012Q4:1.6.0.50 pkgsrc-2012Q4-base:1.6 pkgsrc-2011Q4:1.6.0.48 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q2:1.6.0.46 pkgsrc-2011Q2-base:1.6 pkgsrc-2009Q4:1.6.0.44 pkgsrc-2009Q4-base:1.6 pkgsrc-2008Q4:1.6.0.42 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.6.0.40 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.38 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.6.0.36 pkgsrc-2008Q2-base:1.6 pkgsrc-2008Q1:1.6.0.34 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.6.0.32 pkgsrc-2007Q4-base:1.6 pkgsrc-2007Q3:1.6.0.30 pkgsrc-2007Q3-base:1.6 pkgsrc-2007Q2:1.6.0.28 pkgsrc-2007Q2-base:1.6 pkgsrc-2007Q1:1.6.0.26 pkgsrc-2007Q1-base:1.6 pkgsrc-2006Q4:1.6.0.24 pkgsrc-2006Q4-base:1.6 pkgsrc-2006Q3:1.6.0.22 pkgsrc-2006Q3-base:1.6 pkgsrc-2006Q2:1.6.0.20 pkgsrc-2006Q2-base:1.6 pkgsrc-2006Q1:1.6.0.18 pkgsrc-2006Q1-base:1.6 pkgsrc-2005Q4:1.6.0.16 pkgsrc-2005Q4-base:1.6 pkgsrc-2005Q3:1.6.0.14 pkgsrc-2005Q3-base:1.6 pkgsrc-2005Q2:1.6.0.12 pkgsrc-2005Q2-base:1.6 pkgsrc-2005Q1:1.6.0.10 pkgsrc-2005Q1-base:1.6 pkgsrc-2004Q4:1.6.0.8 pkgsrc-2004Q4-base:1.6 pkgsrc-2004Q3:1.6.0.6 pkgsrc-2004Q3-base:1.6 pkgsrc-2004Q2:1.6.0.4 pkgsrc-2004Q2-base:1.6 pkgsrc-2004Q1:1.6.0.2 pkgsrc-2004Q1-base:1.6 pkgsrc-2003Q4:1.5.0.2 pkgsrc-2003Q4-base:1.5 netbsd-1-6-1:1.4.0.6 netbsd-1-6-1-base:1.4 netbsd-1-6:1.4.0.8 netbsd-1-6-RELEASE-base:1.4 pkgviews:1.4.0.4 pkgviews-base:1.4 buildlink2:1.4.0.2 buildlink2-base:1.4 netbsd-1-5-PATCH003:1.4 netbsd-1-5-PATCH001:1.3; locks; strict; comment @# @; 1.6 date 2004.01.10.22.43.09; author wiz; state dead; branches; next 1.5; 1.5 date 2003.07.02.18.06.40; author jmmv; state Exp; branches; next 1.4; 1.4 date 2001.09.10.08.23.20; author skrll; state Exp; branches; next 1.3; 1.3 date 2001.03.20.12.08.40; author fredb; state Exp; branches; next 1.2; 1.2 date 2001.03.20.05.27.10; author fredb; state Exp; branches; next 1.1; 1.1 date 2001.03.20.00.20.41; author fredb; state Exp; branches; next ; desc @@ 1.6 log @Remove KDE1 packages (and dependencies) from pkgsrc, since the KDE authors have dropped support for it and have not been backporting security fixes. As proposed on tech-pkg numerous times (last one: Dec 27 2003). @ text @$NetBSD: patch-bc,v 1.5 2003/07/02 18:06:40 jmmv Exp $ --- kdehelp/man.cpp.orig Thu Aug 19 20:32:11 1999 +++ kdehelp/man.cpp @@@@ -20,6 +20,9 @@@@ #include "man.h" #include "error.h" #include +#ifdef __NetBSD__ +#include +#endif #include "dbnew.h" @@@@ -171,11 +174,17 @@@@ } else { -#ifndef __FreeBSD__ - searchPath[numPaths++] = StrDup("/usr/man"); -#else +#ifdef __FreeBSD__ searchPath[numPaths++] = StrDup(_PATH_MAN); searchPath[numPaths++] = StrDup("/usr/X11R6/man"); +#else +#ifdef __NetBSD__ + searchPath[numPaths++] = StrDup(PREFIX "/man"); + searchPath[numPaths++] = StrDup("/usr/share/man"); + searchPath[numPaths++] = StrDup("/usr/X11R6/man"); +#else + searchPath[numPaths++] = StrDup("/usr/man"); +#endif #endif searchPath[numPaths++] = StrDup("/usr/local/man"); } @@@@ -271,10 +280,18 @@@@ // void cManSection::ReadDir(const char *dirName ) { +#ifdef __NetBSD__ + DIR *dir, *subdir; +#else DIR *dir; +#endif struct dirent *dirEntry; char *ptr; +#ifdef __NetBSD__ + char buffer[256], subdirName[256]; +#else char buffer[256]; +#endif // cout << klocale->translate("Reading Dir: ") << dirName << endl; @@@@ -287,6 +304,39 @@@@ if ( dirEntry->d_name[0] == '.' ) continue; +#ifdef __NetBSD__ + if ( !strcmp( dirEntry->d_name, MACHINE_ARCH ) ) + { + sprintf( subdirName, "%s/%s", dirName, MACHINE_ARCH ); + subdir = opendir(subdirName); + if ( subdir ) + { + while ( (dirEntry = readdir(subdir)) ) + { + if ( dirEntry->d_name[0] == '.' ) + continue; + + strcpy( buffer, dirEntry->d_name ); + + ptr = strrchr( buffer, '.' ); + if ( !strcmp(ptr, ".gz") || !strcmp(ptr, ".Z") || + !strcmp(ptr,".bz2") ) // skip compress extn + { + *ptr = '\0'; + ptr = strrchr( buffer, '.' ); + } + if (ptr) + { + *ptr = '\0'; + AddPage( buffer ); + } + } + closedir(subdir); + } + continue; + } +#endif /* __NetBSD__ */ + strcpy( buffer, dirEntry->d_name ); ptr = strrchr( buffer, '.' ); @@@@ -475,8 +525,12 @@@@ sprintf(errFile, "%s/khelpXXXXXX", _PATH_TMP); // temp file mktemp(errFile); +#ifdef RMAN + sprintf(rmanCmd, "%s -f HTML", RMAN); +#else sprintf(rmanCmd, "%s/rman -f HTML", (const char *)KApplication::kde_bindir()); +#endif // create the system cmd to read the man page if ( (ptr = strchr(tmpName, '(')) ) @ 1.5 log @Avoid hardcoding /usr/pkg in patch files (untested, sorry). @ text @d1 1 a1 1 $NetBSD: patch-bc,v 1.4 2001/09/10 08:23:20 skrll Exp $ @ 1.4 log @Normalise patch format. patchdiff now works. @ text @d1 1 a1 1 $NetBSD$ d27 1 a29 1 + searchPath[numPaths++] = StrDup("/usr/pkg/man"); @ 1.3 log @Try again. Default MANPATH for NetBSD should now be "/usr/share/man:/usr/X11R6/man:/usr/pkg/man:/usr/local/man". @ text @d1 1 a1 1 $NetBSD: patch-bc,v 1.2 2001/03/20 05:27:10 fredb Exp $ d3 2 a4 2 --- kdehelp/man.cpp.orig Thu Aug 19 14:32:11 1999 +++ kdehelp/man.cpp Tue Mar 20 06:03:40 2001 @ 1.2 log @Grok NetBSD-style ${MACHINE_ARCH} subdirs in man path. Choose defaults more suitably for NetBSD when ${MANPATH} is not set: include /usr/X11R6/man and /usr/pkg/man. @ text @d1 1 a1 1 $NetBSD: patch-bc,v 1.1 2001/03/20 00:20:41 fredb Exp $ d4 1 a4 1 +++ kdehelp/man.cpp Mon Mar 19 23:18:51 2001 d15 1 a15 1 @@@@ -171,11 +174,15 @@@@ a25 1 + searchPath[numPaths++] = StrDup("/usr/man"); d27 1 d30 2 d36 1 a36 1 @@@@ -271,10 +278,18 @@@@ d55 1 a55 1 @@@@ -287,6 +302,39 @@@@ d95 1 a95 1 @@@@ -475,8 +523,12 @@@@ @ 1.1 log @Don't let kde install it's own "rman". Instead, compile in the correct path to rman. The determination as to whether it's the package rman or the XFree86-4.x installed rman is left to bsd.pkg.mk (via USE_RMAN). Closes PR pkg/8755. @ text @d1 1 a1 1 $NetBSD$ d4 90 a93 2 +++ kdehelp/man.cpp @@@@ -475,8 +475,12 @@@@ @