OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 16-Jul-2003 10:32:43
Branch: HEAD Handle: 2003071609324102
Added files:
openpkg-src/pstoedit pstoedit.patch
Modified files:
openpkg-src/pstoedit pstoedit.spec
openpkg-web news.txt
Log:
better platform checks
Summary:
Revision Changes Path
1.1 +78 -0 openpkg-src/pstoedit/pstoedit.patch
1.13 +3 -1 openpkg-src/pstoedit/pstoedit.spec
1.5585 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/pstoedit/pstoedit.patch
============================================================================
$ cvs diff -u -r0 -r1.1 pstoedit.patch
--- /dev/null 2003-07-16 10:32:43.000000000 +0200
+++ pstoedit.patch 2003-07-16 10:32:43.000000000 +0200
@@ -0,0 +1,78 @@
+--- src/dynload.cpp.dist 2003-07-16 10:25:08.000000000 +0200
++++ src/dynload.cpp 2003-07-16 10:30:42.000000000 +0200
+@@ -24,7 +24,7 @@
+
+ // we need __linux__ instead of just linux since the latter is not defined when
-ansi is used.
+
+-#if defined(__sparc) || defined(__linux) || defined(__linux__) ||
defined(__FreeBSD__) || defined(_WIN32) || defined(__OS2__) || (HAVE_DLFCN_H==1)
++#if defined(__sun) || defined(__linux) || defined(__linux__) ||
defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(_WIN32)
|| defined(__OS2__) || (HAVE_DLFCN_H==1)
+ #define HAVESHAREDLIBS
+ #endif
+
+@@ -47,11 +47,11 @@
+ #if defined(__linux) || defined(__linux__)
+ #include <dlfcn.h>
+ // static const char * const libsuffix = ".so";
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+ #include <dlfcn.h>
+ #elif defined(__hpux)
+ #include <dlfcn.h>
+-#elif defined(__sparc)
++#elif defined(__sun)
+ #if defined(__SVR4)
+ #include <dlfcn.h>
+ #else
+@@ -103,13 +103,13 @@
+ #if defined(__linux) || defined(__linux__)
+ int loadmode = RTLD_LAZY; // RTLD_NOW
+ handle = dlopen(fulllibname, loadmode);
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+ int loadmode = RTLD_LAZY; // RTLD_NOW
+ handle = dlopen(fulllibname, loadmode);
+ #elif defined(__hpux)
+ int loadmode = RTLD_LAZY; // RTLD_NOW
+ handle = dlopen(fulllibname, loadmode);
+-#elif defined(__sparc)
++#elif defined(__sun)
+ int loadmode = RTLD_LAZY; // RTLD_NOW
+ handle = dlopen(fulllibname, loadmode);
+ #elif defined(__OS2__)
+@@ -146,11 +146,11 @@
+ if (handle) {
+ #if defined(__linux) || defined(__linux__)
+ dlclose(handle);
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+ dlclose(handle);
+ #elif defined(__hpux)
+ dlclose(handle);
+-#elif defined(__sparc)
++#elif defined(__sun)
+ dlclose(handle);
+ #elif defined(__OS2__)
+ dlclose(handle);
+@@ -177,11 +177,11 @@
+ {
+ #if defined(__linux) || defined(__linux__)
+ DynLoader::fptr rfptr = (DynLoader::fptr) dlsym(handle, name); //lint !e611
//: Suspicious cast
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+ DynLoader::fptr rfptr = (DynLoader::fptr) dlsym(handle, name); //lint !e611
//: Suspicious cast
+ #elif defined(__hpux)
+ DynLoader::fptr rfptr = (DynLoader::fptr) dlsym(handle, name); //lint !e611
//: Suspicious cast
+-#elif defined(__sparc)
++#elif defined(__sun)
+ DynLoader::fptr rfptr = (DynLoader::fptr) dlsym(handle, name); //lint !e611
//: Suspicious cast
+ #elif defined(__OS2__)
+ DynLoader::fptr rfptr = (DynLoader::fptr) dlsym(handle, name); //lint !e611
//: Suspicious cast
+@@ -265,7 +265,7 @@
+ }
+
+
+-#if defined(__linux) || defined(__linux__) || defined(__FreeBSD__) ||
defined(__sparc) || defined(__hpux) || defined(__OS2__)
++#if defined(__linux) || defined(__linux__) || defined(__FreeBSD__) ||
defined(__NetBSD__) || defined(__OpenBSD__) || defined(__sun) || defined(__hpux) ||
defined(__OS2__)
+ // for directory search
+ #if HAVE_DIRENT_H
+ #include <dirent.h>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pstoedit/pstoedit.spec
============================================================================
$ cvs diff -u -r1.12 -r1.13 pstoedit.spec
--- openpkg-src/pstoedit/pstoedit.spec 8 Jul 2003 14:42:03 -0000 1.12
+++ openpkg-src/pstoedit/pstoedit.spec 16 Jul 2003 08:32:43 -0000 1.13
@@ -33,10 +33,11 @@
Group: Converter
License: GPL
Version: 3.33
-Release: 20030707
+Release: 20030716
# list of sources
Source0:
http://home.t-online.de/home/helga.glunz/wglunz/pstoedit/pstoedit-%{version}.tar.gz
+Patch0: pstoedit.patch
# build information
Prefix: %{l_prefix}
@@ -54,6 +55,7 @@
%prep
%setup -q
+ %patch -p0
%build
CC="%{l_cc}" \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5584 -r1.5585 news.txt
--- openpkg-web/news.txt 16 Jul 2003 08:13:47 -0000 1.5584
+++ openpkg-web/news.txt 16 Jul 2003 08:32:41 -0000 1.5585
@@ -1,3 +1,4 @@
+16-Jul-2003: Upgraded package: P<pstoedit-3.33-20030716>
16-Jul-2003: Upgraded package: P<openpkg-20030716-20030716>
16-Jul-2003: Upgraded package: P<xmlsec-1.0.4-20030716>
16-Jul-2003: Upgraded package: P<sasl-2.1.15-20030716>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
