- add in pre-build warning message about possible memory exhaustion

durring compile and where to look for info on raising soft memory limit
- make use of EGCS
- fix a few patches that were backwards
- add in a few missing patches
- mark broken because kdelibs will not compile at the moment
This commit is contained in:
brad 1999-06-15 20:44:37 +00:00
parent 5ab7a7cb8f
commit 5f26ea2048
8 changed files with 106 additions and 33 deletions

View File

@ -1,22 +1,34 @@
# OpenBSD makefile for: kdebase
# Whom: Yannick Cote
#
# $OpenBSD: Makefile,v 1.4 1999/06/15 11:18:38 espie Exp $
#
# $OpenBSD: Makefile,v 1.5 1999/06/15 20:44:37 brad Exp $
# Original Author: Yanick Cote <yanick@fries.net>
DISTNAME= kdebase-1.1.1
CATEGORIES= x11
DISTNAME= kdebase-1.1.1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/1.1.1/distribution/tar/generic/source/bz2
MASTER_SITES= ftp://ftp.kde.org/pub/kde/stable/1.1.1/distribution/tar/generic/source/bz2/
NEED_VERSION= 1.92
BROKEN= "kdelibs will not compile due to a EGCS C++ bug"
LIB_DEPENDS= qt.1.44:${PORTSDIR}/x11/qt \
jpeg.62:${PORTSDIR}/graphics/jpeg \
gif.4.1:${PORTSDIR}/graphics/giflib \
kdecore.1:${PORTSDIR}/x11/kdelibs
BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
LIB_DEPENDS= qt.1.44:${PORTSDIR}/x11/qt \
jpeg.62:${PORTSDIR}/graphics/jpeg \
gif.4.1:${PORTSDIR}/graphics/giflib \
kdecore.1:${PORTSDIR}/x11/kdelibs
GNU_CONFIGURE= yes
USE_EGCC= yes
USE_EGXX= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
pre-build:
@echo ""
@echo "*** WARNING: you may see an error such as"
@echo "*** virtual memory exhausted"
@echo "*** when building this package. If you do you must increase"
@echo "*** your limits. See the man page for your shell and look"
@echo "*** for the 'limit' or 'ulimit' command."
@echo ""
.include <bsd.port.mk>

View File

@ -1,17 +1,17 @@
--- kscreensaver/science.cpp.orig Tue Jun 15 12:42:45 1999
+++ kscreensaver/science.cpp Tue Jun 15 12:42:56 1999
--- kscreensaver/science.cpp.orig Tue Jun 15 09:15:21 1999
+++ kscreensaver/science.cpp Tue Jun 15 09:16:45 1999
@@ -287,10 +287,10 @@
ycoord = (int) y;
switch( bpp ) {
- case 1 : applyLens = &KScienceSaver::applyLens8bpp; break;
- case 2 : applyLens = &KScienceSaver::applyLens16bpp; break;
- case 3 : applyLens = &KScienceSaver::applyLens24bpp; break;
- case 4 : applyLens = &KScienceSaver::applyLens32bpp; break;
+ case 1 : applyLens = &applyLens8bpp; break;
+ case 2 : applyLens = &applyLens16bpp; break;
+ case 3 : applyLens = &applyLens24bpp; break;
+ case 4 : applyLens = &applyLens32bpp; break;
- case 1 : applyLens = &applyLens8bpp; break;
- case 2 : applyLens = &applyLens16bpp; break;
- case 3 : applyLens = &applyLens24bpp; break;
- case 4 : applyLens = &applyLens32bpp; break;
+ case 1 : applyLens = &KScienceSaver::applyLens8bpp; break;
+ case 2 : applyLens = &KScienceSaver::applyLens16bpp; break;
+ case 3 : applyLens = &KScienceSaver::applyLens24bpp; break;
+ case 4 : applyLens = &KScienceSaver::applyLens32bpp; break;
default: myAssert( false, "unsupported colordepth "\
"(only 8, 16, 24, 32 bpp supported)" );
}

View File

@ -1,11 +1,11 @@
--- kscreensaver/space.cpp.orig Tue Jun 15 04:09:04 1999
+++ kscreensaver/space.cpp Tue Jun 15 12:44:01 1999
--- kscreensaver/space.cpp.orig Tue Jun 15 09:33:14 1999
+++ kscreensaver/space.cpp Tue Jun 15 09:33:38 1999
@@ -105,7 +105,7 @@
GLenum doubleBuffer, directRender;
GLint windW, windH;
-GLenum flag = (GLenum)NORMAL;
+GLenum flag = NORMAL;
-GLenum flag = NORMAL;
+GLenum flag = (GLenum)NORMAL;
GLint starCount = MAXSTARS / 2;
float speed = 1.0;
float warpinterval = 30000.0;

View File

@ -0,0 +1,29 @@
--- kdm/resource.c.orig Thu Jan 28 15:10:02 1999
+++ kdm/resource.c Sat Feb 13 19:44:33 1999
@@ -92,7 +92,7 @@
#define DEF_SESSION XDMDIR"/Xsession" /* QUOTE(XBINDIR) "xterm -ls" */
#endif
#ifndef DEF_USER_PATH
-# ifdef __FreeBSD__
+# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
# define DEF_USER_PATH "/bin:/usr/bin:" QUOTE(XBINDIR) ":/usr/local/bin"
# elif __linux__
# define DEF_USER_PATH "/bin:/usr/bin:" QUOTE(XBINDIR) ":/usr/local/bin"
@@ -101,7 +101,7 @@
# endif
#endif
#ifndef DEF_SYSTEM_PATH
-# ifdef __FreeBSD__
+# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
# define DEF_SYSTEM_PATH "/sbin:/usr/sbin:/bin:/usr/bin:" QUOTE(XBINDIR) ":/usr/local/bin"
# elif __linux__
# define DEF_SYSTEM_PATH "/sbin:/usr/sbin:/bin:/usr/bin:" QUOTE(XBINDIR) ":/usr/local/bin"
@@ -153,7 +153,7 @@
#define DEF_GREETER_LIB ""
#endif
#ifndef DEF_PID_FILE
-# ifdef __FreeBSD__
+# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
# define DEF_PID_FILE _PATH_VARRUN"kdm.pid"
# else
/* this may be readonly

View File

@ -0,0 +1,10 @@
--- kdm/session.c.orig Tue Sep 29 18:44:21 1998
+++ kdm/session.c Sun Feb 21 13:48:56 1999
@@ -50,6 +50,7 @@
#include <pwd.h>
#include <grp.h>
#include <sys/types.h>
+#include <sys/param.h>
#ifdef AIXV3
# include <usersec.h>
#endif

View File

@ -0,0 +1,11 @@
--- kaudio/Makefile.in.orig Tue Jun 1 11:02:42 1999
+++ kaudio/Makefile.in Tue Jun 1 11:03:16 1999
@@ -202,7 +202,7 @@
CPPFLAGS = @CPPFLAGS@
LIBS = @LIBS@
maudio_OBJECTS = io_oss.o maudio.o sample.o
-maudio_LDADD = $(LDADD)
+maudio_LDADD = $(LDADD) -lossaudio
maudio_DEPENDENCIES =
maudio_LDFLAGS =
kaudioserver_OBJECTS = kaudioserver.o

View File

@ -0,0 +1,11 @@
--- kcheckpass/kcheckpass.c.orig Tue Jun 1 21:54:15 1999
+++ kcheckpass/kcheckpass.c Wed Jun 2 00:40:04 1999
@@ -53,7 +53,7 @@
#include <syslog.h>
#include <memory.h>
-#ifndef __FreeBSD__
+#if !defined(__FreeBSD__) && !defined(__OpenBSD__)
#include <malloc.h>
#endif

View File

@ -1,11 +1,11 @@
--- configure.orig Tue Jun 15 03:16:13 1999
+++ configure Tue Jun 15 12:41:33 1999
--- configure.orig Tue Jun 15 09:43:27 1999
+++ configure Tue Jun 15 09:43:42 1999
@@ -1784,7 +1784,7 @@
aix*)
ac_symcode='[BCDTU]'
;;
-sunos* | cygwin32* | mingw32* | openbsd* )
+sunos* | cygwin32* | mingw32*)
-sunos* | cygwin32* | mingw32*)
+sunos* | cygwin32* | mingw32* | openbsd*)
ac_sympat='_\([_A-Za-z][_A-Za-z0-9]*\)'
ac_symxfrm='_\1 \1'
;;