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: 15-Jan-2003 10:04:47
Branch: HEAD Handle: 2003011509044501
Added files:
openpkg-src/magicpoint magicpoint.patch
Modified files:
openpkg-src/magicpoint magicpoint.spec
openpkg-web news.txt
Log:
fix imake build, fix system header conflict
Summary:
Revision Changes Path
1.1 +21 -0 openpkg-src/magicpoint/magicpoint.patch
1.22 +10 -4 openpkg-src/magicpoint/magicpoint.spec
1.2800 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/magicpoint/magicpoint.patch
============================================================================
$ cvs diff -u -r0 -r1.1 magicpoint.patch
--- /dev/null 2003-01-15 10:04:47.000000000 +0100
+++ magicpoint.patch 2003-01-15 10:04:47.000000000 +0100
@@ -0,0 +1,21 @@
+--- image/path.c.dist Wed Jan 15 09:49:05 2003
++++ image/path.c Wed Jan 15 09:49:14 2003
+@@ -8,8 +8,6 @@
+ * See included file "copyright.h" for complete copyright information.
+ */
+
+-#include "copyright.h"
+-#include "xloadimage.h"
+ #include <X11/Xos.h>
+ #include <sys/stat.h>
+ #include <ctype.h>
+@@ -20,6 +18,9 @@
+ #if 1 /* SYSV */
+ #include <unistd.h>
+ #endif
++
++#include "copyright.h"
++#include "xloadimage.h"
+
+ /* SUPPRESS 530 */
+ /* SUPPRESS 560 */
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/magicpoint/magicpoint.spec
============================================================================
$ cvs diff -u -r1.21 -r1.22 magicpoint.spec
--- openpkg-src/magicpoint/magicpoint.spec 3 Jan 2003 10:53:14 -0000 1.21
+++ openpkg-src/magicpoint/magicpoint.spec 15 Jan 2003 09:04:46 -0000 1.22
@@ -33,16 +33,17 @@
Group: Graphics
License: GPL
Version: 1.09a
-Release: 20020810
+Release: 20030115
# list of sources
Source0: ftp://ftp.mew.org/pub/mgp/magicpoint-%{version}.tar.gz
Source1: ftp://ftp.mew.org/pub/mgp/ttf.tar.gz
+Patch0: magicpoint.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020206, X11, flex, bison, make
+BuildPreReq: OpenPKG, openpkg >= 20020206, X11, flex, bison, make, gcc
PreReq: OpenPKG, openpkg >= 20020206, X11
AutoReq: no
AutoReqProv: no
@@ -54,6 +55,7 @@
%prep
%setup -q
%setup1 -q -T -D -a 1
+ %patch0 -p0
%build
CC="%{l_cc}" \
@@ -66,8 +68,12 @@
--x-includes=`%{l_prefix}/etc/rc --query x11_incdir` \
--x-libraries=`%{l_prefix}/etc/rc --query x11_libdir`
PATH="`%{l_prefix}/etc/rc --query x11_bindir`:$PATH"
- xmkmf -a
- %{l_make} %{l_mflags}
+ x11config=`%{l_prefix}/etc/rc --query x11_libdir`/X11/config
+ imake -DHasGcc2 -UHasSunC -DUseInstalled -I$x11config
+ %{l_make} Makefiles IMAKE_DEFINES="-DHasGcc2 -UHasSunC"
+ %{l_make} includes
+
+ %{l_make}
%install
rm -rf $RPM_BUILD_ROOT
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.2799 -r1.2800 news.txt
--- openpkg-web/news.txt 15 Jan 2003 08:39:19 -0000 1.2799
+++ openpkg-web/news.txt 15 Jan 2003 09:04:45 -0000 1.2800
@@ -1,3 +1,4 @@
+15-Jan-2003: Upgraded package: P<magicpoint-1.09a-20030115>
15-Jan-2003: Upgraded package: P<j2se-1.3.1-20030115>
15-Jan-2003: Upgraded package: P<openjade-1.3.2-20030115>
15-Jan-2003: Upgraded package: P<perl-tk-20030115-20030115>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
