cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Eliminate the use of the malloc.h header and/or replace

Browse Source 
with stdlib.h.
This commit is contained in:
brad 2014-11-30 05:41:34 +00:00
parent 365e1b5dd5
commit b70345e22c
50 changed files with 517 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
games/irrlamb/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.1.1.1 2013/05/20 14:45:54 bcallah Exp $
# $OpenBSD: Makefile,v 1.2 2014/11/30 05:41:34 brad Exp $
V = 0.1.1
COMMENT = third person, 3D physics game
DISTNAME = irrlamb-${V}-src
PKGNAME = irrlamb-${V}
REVISION = 0
CATEGORIES = games x11
HOMEPAGE = https://code.google.com/p/irrlamb/
@ -26,6 +27,10 @@ LIB_DEPENDS = audio/openal \
RUN_DEPENDS = devel/desktop-file-utils
# dos2unix the code before applying a patch
post-extract:
perl -pi -e 'tr/\r//d' ${WRKSRC}/src/stb_vorbis/stb_vorbis.c
post-patch:
perl -pi -e "s,games/,,g" ${WRKSRC}/CMakeLists.txt \
${WRKSRC}/deployment/irrlamb

15
games/irrlamb/patches/patch-src_stb_vorbis_stb_vorbis_c Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-src_stb_vorbis_stb_vorbis_c,v 1.1 2014/11/30 05:41:34 brad Exp $
Don't use malloc.h header on OpenBSD.
--- src/stb_vorbis/stb_vorbis.c.orig Wed Nov 19 22:17:29 2014
+++ src/stb_vorbis/stb_vorbis.c Wed Nov 19 22:17:45 2014
@@ -200,7 +200,7 @@
#include <string.h>
#include <assert.h>
#include <math.h>
-#if !(defined(__APPLE__) || defined(MACOSX) || defined(macintosh) || defined(Macintosh))
+#if !(defined(__APPLE__) || defined(MACOSX) || defined(macintosh) || defined(Macintosh) || defined(__OpenBSD__))
#include <malloc.h>
#endif
#else

4
games/nethack/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.55 2013/03/11 11:07:40 espie Exp $
# $OpenBSD: Makefile,v 1.56 2014/11/30 05:41:35 brad Exp $
COMMENT = dungeon explorin', hackin', game. Piece of cake
V = 3.4.3
DISTNAME = nethack-$V
PKGNAME = ${DISTNAME}
REVISION = 5
REVISION = 6
CATEGORIES = games
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=nethack/} \

15
games/nethack/patches/patch-win_Qt_qt_win_cpp Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-win_Qt_qt_win_cpp,v 1.6 2014/11/30 05:41:35 brad Exp $
Don't use malloc.h header on OpenBSD.
--- win/Qt/qt_win.cpp.orig Thu Nov 20 22:02:50 2014
+++ win/Qt/qt_win.cpp Thu Nov 20 22:13:01 2014
@@ -104,8 +104,6 @@ extern "C" {
#include <dirent.h>
#ifdef Q_WS_MACX
# include <sys/malloc.h>
-#else
-# include <malloc.h>
#endif
#ifdef _WS_X11_

4
games/xmoto/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.17 2014/07/08 11:11:15 kirby Exp $
# $OpenBSD: Makefile,v 1.18 2014/11/30 05:41:35 brad Exp $
COMMENT = challenging 2D motocross platform game
V = 0.5.10
DISTNAME = xmoto-${V}-src
PKGNAME = xmoto-${V}
REVISION = 0
REVISION = 1
CATEGORIES = games
MAINTAINER = Antti Harri <iku@openbsd.fi>

15
games/xmoto/patches/patch-src_image_tim_memory_crt_cpp Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-src_image_tim_memory_crt_cpp,v 1.1 2014/11/30 05:41:35 brad Exp $
Replace the malloc.h header with stdlib.h.
--- src/image/tim_memory_crt.cpp.orig Wed Nov 19 22:32:58 2014
+++ src/image/tim_memory_crt.cpp Wed Nov 19 22:33:24 2014
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* CRT memory driver.
*/
-#if defined(__FreeBSD__) || (defined(__APPLE__) && defined(__MACH__))
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || (defined(__APPLE__) && defined(__MACH__))
#include <stdlib.h>
#else
#include <malloc.h>

4
graphics/DevIL/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.14 2014/11/05 11:43:59 sthen Exp $
# $OpenBSD: Makefile,v 1.15 2014/11/30 05:41:34 brad Exp $
COMMENT= library for powerful image loading capabilities
DISTNAME= DevIL-1.7.8
REVISION= 7
REVISION= 8
SHARED_LIBS+= IL 0.0 # 2.0
SHARED_LIBS+= ILU 0.0 # 2.0
SHARED_LIBS+= ILUT 0.0 # 2.0

14
graphics/DevIL/patches/patch-src-ILU_ilur_ilur_c Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-src-ILU_ilur_ilur_c,v 1.1 2014/11/30 05:41:34 brad Exp $
Replace the malloc.h header with stdlib.h.
--- src-ILU/ilur/ilur.c.orig Wed Nov 19 22:50:22 2014
+++ src-ILU/ilur/ilur.c Wed Nov 19 22:50:57 2014
@@ -1,6 +1,6 @@
#include <string.h>
#include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
#include <IL/il.h>
#include <IL/ilu.h>

3
graphics/gle/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.21 2013/03/21 08:45:18 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.22 2014/11/30 05:41:34 brad Exp $
COMMENT= OpenGL Extrusion library
DISTNAME= gle-3.1.0
REVISION= 0
CATEGORIES= graphics devel
SHARED_LIBS += gle 4.0 # 4.0

14
graphics/gle/patches/patch-src_ex_angle_c Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-src_ex_angle_c,v 1.1 2014/11/30 05:41:34 brad Exp $
Don't use malloc.h header on OpenBSD.
--- src/ex_angle.c.orig Wed Nov 19 22:56:35 2014
+++ src/ex_angle.c Wed Nov 19 22:56:40 2014
@@ -18,7 +18,6 @@
*/
-#include <malloc.h>
#include <math.h>
#include <stdio.h>
#include <stdlib.h>

14
graphics/gle/patches/patch-src_ex_cut_round_c Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-src_ex_cut_round_c,v 1.1 2014/11/30 05:41:34 brad Exp $
Don't use malloc.h header on OpenBSD.
--- src/ex_cut_round.c.orig Wed Nov 19 22:57:13 2014
+++ src/ex_cut_round.c Wed Nov 19 22:57:20 2014
@@ -20,7 +20,6 @@
*/
-#include <malloc.h>
#include <math.h>
#include <stdio.h>
#include <stdlib.h>

14
graphics/gle/patches/patch-src_ex_raw_c Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-src_ex_raw_c,v 1.1 2014/11/30 05:41:34 brad Exp $
Don't use malloc.h header on OpenBSD.
--- src/ex_raw.c.orig Wed Nov 19 22:58:14 2014
+++ src/ex_raw.c Wed Nov 19 22:58:18 2014
@@ -17,7 +17,6 @@
*/
-#include <malloc.h>
#include <stdlib.h>
#include <math.h>
#include <string.h> /* for the memcpy() subroutine */

14
graphics/gle/patches/patch-src_extrude_c Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-src_extrude_c,v 1.1 2014/11/30 05:41:34 brad Exp $
Don't use malloc.h header on OpenBSD.
--- src/extrude.c.orig Wed Nov 19 22:58:41 2014
+++ src/extrude.c Wed Nov 19 22:58:47 2014
@@ -16,7 +16,6 @@
*/
-#include <malloc.h>
#include <math.h>
#include <stdlib.h>
#include <string.h> /* for the memcpy() subroutine */

14
graphics/gle/patches/patch-src_round_cap_c Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-src_round_cap_c,v 1.1 2014/11/30 05:41:34 brad Exp $
Don't use malloc.h header on OpenBSD.
--- src/round_cap.c.orig Wed Nov 19 22:59:05 2014
+++ src/round_cap.c Wed Nov 19 22:59:10 2014
@@ -12,7 +12,6 @@
*/
-#include <malloc.h>
#include <stdlib.h>
#include <math.h>
#include <string.h> /* for the memcpy() subroutine */

14
graphics/gle/patches/patch-src_segment_c Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-src_segment_c,v 1.1 2014/11/30 05:41:34 brad Exp $
Don't use malloc.h header on OpenBSD.
--- src/segment.c.orig Wed Nov 19 22:59:20 2014
+++ src/segment.c Wed Nov 19 22:59:27 2014
@@ -16,7 +16,6 @@
* Copyright (c) 1991,1993,2003 Linas Vepstas <linas@linas.org>
*/
-#include <malloc.h>
#include <stdlib.h>
#include <math.h>
#include <string.h> /* for the memcpy() subroutine */

14
graphics/gle/patches/patch-src_texgen_c Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-src_texgen_c,v 1.1 2014/11/30 05:41:34 brad Exp $
Don't use malloc.h header on OpenBSD.
--- src/texgen.c.orig Wed Nov 19 23:00:04 2014
+++ src/texgen.c Wed Nov 19 23:00:10 2014
@@ -13,7 +13,6 @@
* Copyright (c) 1994,1995 Linas Vepstas <linas@linas.org>
*/
-#include <malloc.h>
#include <math.h>
#include <stdlib.h>

3
graphics/iec16022/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.1.1.1 2013/10/29 09:26:29 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.2 2014/11/30 05:41:34 brad Exp $
COMMENT= 2D barcodes / DataMatrix creation tool
DISTNAME= iec16022-0.2.4
REVISION= 0
SHARED_LIBS += iec16022 0.0 # 0.0

14
graphics/iec16022/patches/patch-iec16022_c Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-iec16022_c,v 1.1 2014/11/30 05:41:34 brad Exp $
Don't use malloc.h header on OpenBSD.
--- iec16022.c.orig Wed Nov 19 23:09:44 2014
+++ iec16022.c Wed Nov 19 23:09:51 2014
@@ -29,7 +29,6 @@
#include <string.h>
#include <time.h>
#include <popt.h>
-#include <malloc.h>
#include "image.h"
#include "iec16022ecc200.h"
#include "config.h"

14
graphics/iec16022/patches/patch-iec16022ecc200_c Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-iec16022ecc200_c,v 1.1 2014/11/30 05:41:34 brad Exp $
Don't use malloc.h header on OpenBSD.
--- iec16022ecc200.c.orig Wed Nov 19 23:08:01 2014
+++ iec16022ecc200.c Wed Nov 19 23:08:06 2014
@@ -29,7 +29,6 @@
#include <string.h>
#include <time.h>
#include <popt.h>
-#include <malloc.h>
#include "reedsol.h"
#include "iec16022ecc200.h"

15
graphics/iec16022/patches/patch-image_c Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-image_c,v 1.1 2014/11/30 05:41:34 brad Exp $
Replace the malloc.h header with stdlib.h.
--- image.c.orig Wed Nov 19 23:08:29 2014
+++ image.c Wed Nov 19 23:08:48 2014
@@ -19,7 +19,7 @@
*/
#include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
#include <string.h>
#include <ctype.h>
#include "image.h"

6
graphics/zint/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.5 2014/11/07 10:40:05 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.6 2014/11/30 05:41:35 brad Exp $
COMMENT-main = library for encoding data in several barcode variants
COMMENT-x11 = graphical interface for the zint barcode generator
@ -8,8 +8,8 @@ DISTNAME = zint-${V}
PKGNAME-main = ${DISTNAME}
PKGNAME-x11 = zint-gui-${V}
REVISION-main = 1
REVISION-x11 = 1
REVISION-main = 2
REVISION-x11 = 2
SHARED_ONLY = Yes

15
graphics/zint/patches/patch-backend_code1_c Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-backend_code1_c,v 1.1 2014/11/30 05:41:35 brad Exp $
Replace the malloc.h header with stdlib.h.
--- backend/code1.c.orig Wed Nov 19 23:15:02 2014
+++ backend/code1.c Wed Nov 19 23:15:12 2014
@@ -28,7 +28,7 @@
#ifdef __APPLE__
#include <sys/malloc.h>
#else
-#include <malloc.h>
+#include <stdlib.h>
#endif
void horiz(struct zint_symbol *symbol, int row_no, int full)

15
graphics/zint/patches/patch-backend_maxicode_c Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-backend_maxicode_c,v 1.1 2014/11/30 05:41:35 brad Exp $
Don't use malloc.h header on OpenBSD.
--- backend/maxicode.c.orig Wed Nov 19 23:16:22 2014
+++ backend/maxicode.c Wed Nov 19 23:16:55 2014
@@ -28,8 +28,6 @@
#include <stdlib.h>
#ifdef __APPLE__
#include <sys/malloc.h>
-#else
-#include <malloc.h>
#endif
int maxi_codeword[144];

3
math/libqalculate/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.3 2013/11/25 14:16:23 sthen Exp $
# $OpenBSD: Makefile,v 1.4 2014/11/30 05:41:34 brad Exp $
COMMENT = applied math library
CATEGORIES = math devel
DISTNAME = libqalculate-0.9.7
REVISION = 0
HOMEPAGE = http://qalculate.sourceforge.net/
SHARED_LIBS = qalculate 0.0 # 5.0

20
math/libqalculate/patches/patch-src_qalc_cc
View File

@ -1,8 +1,12 @@
$OpenBSD: patch-src_qalc_cc,v 1.1.1.1 2013/04/11 13:38:31 zhuk Exp $
$OpenBSD: patch-src_qalc_cc,v 1.2 2014/11/30 05:41:34 brad Exp $
Unbreak build (wrong header path, triggered by SEPARATE_BUILD).
--- src/qalc.cc.orig Tue Sep 13 22:24:17 2011
+++ src/qalc.cc Tue Sep 13 22:27:36 2011
@@ -9,7 +9,7 @@
Replace the malloc.h header with stdlib.h.
--- src/qalc.cc.orig Tue Jan 5 10:17:29 2010
+++ src/qalc.cc Thu Nov 20 00:26:42 2014
@@ -9,14 +9,14 @@
(at your option) any later version.
*/
@ -11,3 +15,11 @@ Unbreak build (wrong header path, triggered by SEPARATE_BUILD).
#include <libqalculate/qalculate.h>
#include <sys/stat.h>
#include <unistd.h>
#include <time.h>
#include <pthread.h>
#include <dirent.h>
-#include <malloc.h>
+#include <stdlib.h>
#include <stdio.h>
#include <vector>
#include <glib.h>

3
math/lpsolve/python/Makefile
View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.3 2013/03/11 11:23:55 espie Exp $
# $OpenBSD: Makefile,v 1.4 2014/11/30 05:41:35 brad Exp $
COMMENT = Python bindings for lpsolve
DISTNAME = lp_solve_${V}_Python_source
# interface version differs from pkg version
MODPY_EGG_VERSION = 5.5.0.9
PKGNAME = py-lpsolve-${V}
REVISION = 0
LIB_DEPENDS += math/lpsolve/core
BUILD_DEPENDS += math/py-numpy

14
math/lpsolve/python/patches/patch-hash_c Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-hash_c,v 1.1 2014/11/30 05:41:35 brad Exp $
Don't use malloc.h header on OpenBSD.
--- hash.c.orig Thu Nov 20 00:32:43 2014
+++ hash.c Thu Nov 20 00:32:50 2014
@@ -8,7 +8,6 @@
#include <sys/types.h>
#include <stdlib.h>
-#include <malloc.h>
#include <string.h>
#include "hash.h"

4
misc/astrolog/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.28 2013/03/11 11:23:56 espie Exp $
# $OpenBSD: Makefile,v 1.29 2014/11/30 05:41:34 brad Exp $
COMMENT= astrology program for X11 and alpha-numeric terminals
V= 5.40
DISTNAME= ast54unx
PKGNAME= astrolog-${V}
REVISION= 0
REVISION= 1
CATEGORIES= misc
HOMEPAGE= http://www.astrolog.org/astrolog.htm

16
misc/astrolog/patches/patch-placalc_h Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-placalc_h,v 1.1 2014/11/30 05:41:34 brad Exp $
Don't use malloc.h header on OpenBSD.
--- placalc.h.orig Thu Nov 20 00:36:12 2014
+++ placalc.h Thu Nov 20 01:01:14 2014
@@ -123,7 +123,9 @@ auto-dectection of MSDOS (TURBO_C or MS_C) or HPUNIX
#if HPUNIX
#ifndef MAC
#ifndef NeXT
+#ifndef __OpenBSD__
#include <malloc.h>
+#endif
#endif
#endif /* MAC */
typedef double REAL8; /* real with at least 64 bit precision */

4
misc/wordnet/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.11 2013/03/11 11:23:58 espie Exp $
# $OpenBSD: Makefile,v 1.12 2014/11/30 05:41:35 brad Exp $
COMMENT= browser for a large lexical database of English
V= 3.0
DISTNAME= WordNet-$V
PKGNAME= wordnet-$V
REVISION= 4
REVISION= 5
CATEGORIES= misc

29
misc/wordnet/patches/patch-lib_wnutil_c
View File

@ -1,7 +1,22 @@
$OpenBSD: patch-lib_wnutil_c,v 1.1 2008/09/01 20:02:53 sthen Exp $
--- lib/wnutil.c.orig Sat Jan 20 20:50:23 2007
+++ lib/wnutil.c Mon Sep 1 20:53:39 2008
@@ -48,7 +48,7 @@ int wninit(void)
$OpenBSD: patch-lib_wnutil_c,v 1.2 2014/11/30 05:41:35 brad Exp $
Don't use malloc.h header on OpenBSD.
--- lib/wnutil.c.orig Sat Jan 20 15:50:23 2007
+++ lib/wnutil.c Thu Nov 20 01:29:11 2014
@@ -14,9 +14,11 @@
#ifdef __unix__
#ifndef __MACH__
+#ifndef __OpenBSD__
#include <malloc.h>
#endif
#endif
+#endif
#include <assert.h>
#include <string.h>
@@ -48,7 +50,7 @@ int wninit(void)
char *env;
if (!done) {
@ -10,7 +25,7 @@ $OpenBSD: patch-lib_wnutil_c,v 1.1 2008/09/01 20:02:53 sthen Exp $
wnrelease = strdup(env); /* set release */
assert(wnrelease);
}
@@ -70,7 +70,7 @@ int re_wninit(void)
@@ -70,7 +72,7 @@ int re_wninit(void)
closefps();
@ -19,7 +34,7 @@ $OpenBSD: patch-lib_wnutil_c,v 1.1 2008/09/01 20:02:53 sthen Exp $
wnrelease = strdup(env); /* set release */
assert(wnrelease);
}
@@ -149,25 +149,25 @@ static int do_init(void)
@@ -149,25 +151,25 @@ static int do_init(void)
sprintf(searchdir, DEFAULTPATH);
#else
if ((env = getenv("WNSEARCHDIR")) != NULL)
@ -51,7 +66,7 @@ $OpenBSD: patch-lib_wnutil_c,v 1.1 2008/09/01 20:02:53 sthen Exp $
"WordNet library error: Can't open indexfile(%s)\n",
tmpbuf);
display_message(msgbuf);
@@ -178,35 +178,35 @@ static int do_init(void)
@@ -178,35 +180,35 @@ static int do_init(void)
/* This file isn't used by the library and doesn't have to
be present. No error is reported if the open fails. */

3
productivity/librcps/Makefile
View File

@ -1,7 +1,8 @@
# $OpenBSD: Makefile,v 1.2 2014/07/09 14:56:53 landry Exp $
# $OpenBSD: Makefile,v 1.3 2014/11/30 05:41:34 brad Exp $
COMMENT = library for resource constrained project scheduling
CATEGORIES = productivity
DISTNAME = librcps-0.3
REVISION = 0
HOMEPAGE = http://www.librcps.org/
SHARED_LIBS = rcps 0.0

12
productivity/librcps/patches/patch-src_fitness_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_fitness_c,v 1.1 2014/11/30 05:41:34 brad Exp $
Don't use malloc.h header on OpenBSD.
--- src/fitness.c.orig Thu Nov 20 01:46:34 2014
+++ src/fitness.c Thu Nov 20 01:46:49 2014
@@ -1,5 +1,4 @@
#include <assert.h>
-#include <malloc.h>
#include <stdio.h>
#include "fitness.h"

11
productivity/librcps/patches/patch-src_initial_c Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-src_initial_c,v 1.1 2014/11/30 05:41:34 brad Exp $
Don't use malloc.h header on OpenBSD.
--- src/initial.c.orig Thu Nov 20 01:43:38 2014
+++ src/initial.c Thu Nov 20 01:43:44 2014
@@ -1,4 +1,3 @@
-#include <malloc.h>
#include <stdlib.h>
#include <assert.h>

11
productivity/librcps/patches/patch-src_librcps_c Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-src_librcps_c,v 1.1 2014/11/30 05:41:34 brad Exp $
Don't use malloc.h header on OpenBSD.
--- src/librcps.c.orig Thu Nov 20 01:45:02 2014
+++ src/librcps.c Thu Nov 20 01:45:17 2014
@@ -1,4 +1,3 @@
-#include <malloc.h>
#include <string.h>
#include <stdlib.h>
#include <time.h>

12
productivity/librcps/patches/patch-src_repair_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_repair_c,v 1.1 2014/11/30 05:41:34 brad Exp $
Replace the malloc.h header with stdlib.h.
--- src/repair.c.orig Thu Nov 20 01:46:09 2014
+++ src/repair.c Thu Nov 20 01:46:21 2014
@@ -1,4 +1,4 @@
-#include <malloc.h>
+#include <stdlib.h>
#include <assert.h>
#include "repair.h"

14
productivity/librcps/patches/patch-src_slist_c Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-src_slist_c,v 1.1 2014/11/30 05:41:34 brad Exp $
Replace the malloc.h header with stdlib.h.
--- src/slist.c.orig Thu Nov 20 01:45:26 2014
+++ src/slist.c Thu Nov 20 01:45:42 2014
@@ -1,6 +1,6 @@
#include <assert.h>
#include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
#include <string.h>
#include "slist.h"

4
productivity/siag/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.16 2013/03/11 11:37:55 espie Exp $
# $OpenBSD: Makefile,v 1.17 2014/11/30 05:41:35 brad Exp $
COMMENT= tightly integrated, free office package
VERSION= 3.6.1
DISTNAME= siag-${VERSION}
REVISION= 3
REVISION= 4
CATEGORIES= productivity x11
HOMEPAGE= http://siag.nu/

14
productivity/siag/patches/patch-stocks_currency_c Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-stocks_currency_c,v 1.1 2014/11/30 05:41:35 brad Exp $
Don't use malloc.h header on OpenBSD.
--- stocks/currency.c.orig Thu Nov 20 01:56:30 2014
+++ stocks/currency.c Thu Nov 20 01:56:37 2014
@@ -23,7 +23,6 @@
#include <stdio.h>
#include <string.h>
-#include <malloc.h>
#include <stdlib.h>
#include "stocks.h"

15
productivity/siag/patches/patch-stocks_lists_c Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-stocks_lists_c,v 1.1 2014/11/30 05:41:35 brad Exp $
Replace the malloc.h header with stdlib.h.
--- stocks/lists.c.orig Thu Nov 20 01:55:29 2014
+++ stocks/lists.c Thu Nov 20 01:56:03 2014
@@ -20,7 +20,7 @@
#define __LISTS_C__
-#include <malloc.h>
+#include <stdlib.h>
#include <stdio.h>
#include <string.h>

14
productivity/siag/patches/patch-stocks_stocks_c Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-stocks_stocks_c,v 1.1 2014/11/30 05:41:35 brad Exp $
Don't use malloc.h header on OpenBSD.
--- stocks/stocks.c.orig Thu Nov 20 01:56:13 2014
+++ stocks/stocks.c Thu Nov 20 01:56:21 2014
@@ -22,7 +22,6 @@
#include <stdio.h>
#include <string.h>
-#include <malloc.h>
#include <stdlib.h>
#ifdef __WINDOWS__

4
security/mcrypt/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.28 2013/05/18 20:00:38 benoit Exp $
# $OpenBSD: Makefile,v 1.29 2014/11/30 05:41:34 brad Exp $
COMMENT = extendable encryption program that supports many ciphers
DISTNAME = mcrypt-2.6.8
REVISION = 3
REVISION = 4
CATEGORIES = security
HOMEPAGE = http://mcrypt.sf.net/

21
security/mcrypt/patches/patch-src_rfc2440_c
View File

@ -1,10 +1,19 @@
$OpenBSD: patch-src_rfc2440_c,v 1.1 2013/05/18 20:00:43 benoit Exp $
$OpenBSD: patch-src_rfc2440_c,v 1.2 2014/11/30 05:41:35 brad Exp $
- fix segv : http://sourceforge.net/p/mcrypt/patches/13/
- Don't use malloc.h header on OpenBSD
- Fix segv : http://sourceforge.net/p/mcrypt/patches/13/
--- src/rfc2440.c.orig Sun Nov 16 20:50:01 2008
+++ src/rfc2440.c Sat May 18 17:22:25 2013
@@ -497,7 +497,7 @@
--- src/rfc2440.c.orig Sun Nov 16 14:50:01 2008
+++ src/rfc2440.c Thu Nov 20 02:24:36 2014
@@ -23,7 +23,6 @@
#include <zlib.h>
#endif
#include <stdio.h>
-#include <malloc.h>
#include "xmalloc.h"
#include "keys.h"
@@ -497,7 +496,7 @@ plaintext_encode(const USTRING dat)
time_t t;
assert(dat->len > 0);
@ -13,7 +22,7 @@ $OpenBSD: patch-src_rfc2440_c,v 1.1 2013/05/18 20:00:43 benoit Exp $
newdat = (USTRING)dat;
result->d[pos++] = (0x80 | 0x40 | PKT_PLAINTEXT);
@@ -810,7 +810,8 @@
@@ -810,7 +809,8 @@ encrypted_encode(const USTRING pt, const DEK *dek)
_mcrypt_encrypt(dek->hd, rndpref, dek->blocklen + 2, NULL, 0);
_mcrypt_sync(dek->hd, rndpref, dek->blocklen);

4
textproc/lgrind/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.23 2013/03/11 11:42:42 espie Exp $
# $OpenBSD: Makefile,v 1.24 2014/11/30 05:41:34 brad Exp $
COMMENT= LaTeX vgrind(1) look-alike
@ -6,7 +6,7 @@ CATEGORIES= textproc devel print
VERSION= 3.67
DISTNAME= lgrind-${VERSION}
REVISION = 3
REVISION = 4
DISTFILES=source/lgrind.c source/lgutil.c source/lgrindef.c source/lgrindef.h \
source/regexp.c source/regexp.h source/v2lg.c \
source/retest.c source/lgrind.1 source/lgrindef.5 source/Makefile \

19
textproc/lgrind/patches/patch-lgrind_c
View File

@ -1,7 +1,18 @@
$OpenBSD: patch-lgrind_c,v 1.1 2004/04/11 19:12:24 sturm Exp $
--- lgrind.c.orig 2004-04-11 20:39:57.000000000 +0200
+++ lgrind.c 2004-04-11 20:40:28.000000000 +0200
@@ -516,7 +516,8 @@ int main(int argc, char **argv)
$OpenBSD: patch-lgrind_c,v 1.2 2014/11/30 05:41:34 brad Exp $
Don't use malloc.h header on OpenBSD.
--- lgrind.c.orig Thu Nov 20 04:15:55 2014
+++ lgrind.c Thu Nov 20 04:21:30 2014
@@ -94,7 +94,6 @@ static char rcsid[] =
#include <stdlib.h>
#include <ctype.h>
#include <string.h>
-#include <malloc.h>
#include <time.h>
/* One of the following two (depending on your system) */
#include <unistd.h>
@@ -516,7 +515,8 @@ int main(int argc, char **argv)
printf("\\File{");
putstr(fname);
printf("}{%d}{%d}{%d}{%d:%02d}{%ld}\n", modtime.tm_year+1900, modtime.tm_mon+1,

15
textproc/lgrind/patches/patch-regexp_c Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-regexp_c,v 1.1 2014/11/30 05:41:34 brad Exp $
Replace the malloc.h header with stdlib.h.
--- regexp.c.orig Thu Nov 20 04:27:49 2014
+++ regexp.c Thu Nov 20 04:28:00 2014
@@ -56,7 +56,7 @@ static char rcsid[] =
#include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
#include <ctype.h>
#include <string.h>
#include "regexp.h"

4
x11/fvwm95/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.20 2013/03/11 11:46:09 espie Exp $
# $OpenBSD: Makefile,v 1.21 2014/11/30 05:41:34 brad Exp $
COMMENT= win95-like window manager based on fvwm 2.x
DISTNAME= fvwm95-2.0.43a-Autoconf
PKGNAME= fvwm95-2.0.43a
REVISION= 2
REVISION= 3
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fvwm95/} \
ftp://ftp.plig.org/pub/fvwm95/ \

23
x11/fvwm95/patches/patch-modules_FvwmForm_FvwmForm_c
View File

@ -1,12 +1,23 @@
$OpenBSD: patch-modules_FvwmForm_FvwmForm_c,v 1.1 2008/07/02 18:16:19 ajacoutot Exp $
$OpenBSD: patch-modules_FvwmForm_FvwmForm_c,v 1.2 2014/11/30 05:41:34 brad Exp $
Don't use malloc.h header on OpenBSD.
--- modules/FvwmForm/FvwmForm.c.orig Tue Dec 10 11:41:43 1996
+++ modules/FvwmForm/FvwmForm.c Tue Jul 1 11:14:16 2008
@@ -180,6 +180,8 @@ int rel_cursor;
+++ modules/FvwmForm/FvwmForm.c Thu Nov 20 04:57:44 2014
@@ -16,7 +16,6 @@
#include <X11/cursorfont.h>
#define XK_MISCELLANY
#include <X11/keysymdef.h>
-#include <malloc.h>
#include <string.h>
#include <sys/types.h>
#include <sys/time.h>
@@ -179,6 +178,8 @@ int rel_cursor;
static char *buf;
static int N = 8;
+XFontStruct *GetFontOrFixed(Display *, char *);
+
+XFontStruct *GetFontOrFixed(Display *, char *);
/* copy a string until '\0', or up to n chars, and delete trailing spaces */
char *CopyString (char *cp, int n)
{

4
x11/xdrawchem/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.18 2013/11/25 14:16:24 sthen Exp $
# $OpenBSD: Makefile,v 1.19 2014/11/30 05:41:35 brad Exp $
COMMENT= two-dimensional molecule drawing program
DISTNAME= xdrawchem-1.9.9
REVISION= 5
REVISION= 6
CATEGORIES= x11 biology
HOMEPAGE= http://xdrawchem.sourceforge.net/

15
x11/xdrawchem/patches/patch-xdrawchem_application_ob_cpp Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-xdrawchem_application_ob_cpp,v 1.1 2014/11/30 05:41:35 brad Exp $
Replace the malloc.h header with stdlib.h.
--- xdrawchem/application_ob.cpp.orig Thu Nov 20 05:20:49 2014
+++ xdrawchem/application_ob.cpp Thu Nov 20 05:21:25 2014
@@ -9,7 +9,7 @@
#include <iostream>
#include <fstream>
#include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
using std::cout;
using std::endl;