summaryrefslogtreecommitdiff
path: root/devel/sdcc
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>2000-08-25 21:49:28 +0000
committertron <tron@pkgsrc.org>2000-08-25 21:49:28 +0000
commit4873d8e544ac74924eeef828d2f21b41a8572643 (patch)
tree594fd44913e545a052ba5df5f7fe00f9c2bbdbb0 /devel/sdcc
parentb267ad78748285fe593e32e17af7f25c3b8d3a8c (diff)
downloadpkgsrc-4873d8e544ac74924eeef828d2f21b41a8572643.tar.gz
Adapt this package to NetBSD and use a better master site with a
distribution file with correct compression.
Diffstat (limited to 'devel/sdcc')
-rw-r--r--devel/sdcc/Makefile32
-rw-r--r--devel/sdcc/files/md54
-rw-r--r--devel/sdcc/files/patch-sum17
-rw-r--r--devel/sdcc/patches/asxxxx.diff46
-rw-r--r--devel/sdcc/patches/patch-aa33
-rw-r--r--devel/sdcc/patches/patch-ab133
-rw-r--r--devel/sdcc/patches/patch-ac29
-rw-r--r--devel/sdcc/patches/patch-ad82
-rw-r--r--devel/sdcc/patches/patch-ae49
-rw-r--r--devel/sdcc/patches/patch-af51
-rw-r--r--devel/sdcc/patches/patch-ag41
-rw-r--r--devel/sdcc/patches/patch-ah16
-rw-r--r--devel/sdcc/patches/patch-ai13
-rw-r--r--devel/sdcc/patches/patch-aj13
-rw-r--r--devel/sdcc/patches/patch-ak42
-rw-r--r--devel/sdcc/patches/patch-al13
-rw-r--r--devel/sdcc/patches/patch-am13
-rw-r--r--devel/sdcc/patches/patch-an13
-rw-r--r--devel/sdcc/patches/patch-ao13
-rw-r--r--devel/sdcc/pkg/PLIST7
20 files changed, 309 insertions, 351 deletions
diff --git a/devel/sdcc/Makefile b/devel/sdcc/Makefile
index 1570591a24d..2505f10e82e 100644
--- a/devel/sdcc/Makefile
+++ b/devel/sdcc/Makefile
@@ -1,22 +1,28 @@
-# New ports collection makefile for: bcc
-# Version required: "1995 Mar 12 10:29 UTC"
-# Date created: 26 March 1995
-# Whom: joerg
-#
+# $NetBSD: Makefile,v 1.2 2000/08/25 21:49:28 tron Exp $
# FreeBSD: ports/devel/sdcc/Makefile,v 1.5 2000/04/15 15:13:38 knu Exp
-#
-PORTNAME= sdcc
-PORTVERSION= 2.1.9
+DISTNAME= sdcc-2.1.9Ea
+PKGNAME= ${DISTNAME:S/Ea//}
CATEGORIES= devel lang
-MASTER_SITES= http://www.geocities.com/ResearchTriangle/Forum/1353/
-DISTNAME= ${PORTNAME}-${PORTVERSION}Ea
+MASTER_SITES= http://web.kd0yu.com/sdcc/
-MAINTAINER= ambrisko@whistle.com
+MAINTAINER= packages@netbsd.org
+HOMEPAGE= http://sdcc.sourceforge.net/
-WRKSRC= ${WRKDIR}/sdcc219Ea
GNU_CONFIGURE= yes
USE_GMAKE= yes
+
ALL_TARGET= dep all
+WRKSRC= ${WRKDIR}/${DISTNAME:C/[\.-]//g}
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD"
+CONFIGURE_ENV+= CPPFLAGS=-I${WRKDIR}/include
+
+post-extract:
+ ${MKDIR} ${WRKDIR}/include
+ ${LN} -fs /usr/include/sys/endian.h ${WRKDIR}/include
+.endif
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/sdcc/files/md5 b/devel/sdcc/files/md5
index 888665d8616..aab598809a9 100644
--- a/devel/sdcc/files/md5
+++ b/devel/sdcc/files/md5
@@ -1 +1,3 @@
-MD5 (sdcc-2.1.9Ea.tar.gz) = 1145e06feb766e98842e307f561d0fcf
+$NetBSD: md5,v 1.2 2000/08/25 21:49:28 tron Exp $
+
+MD5 (sdcc-2.1.9Ea.tar.gz) = 72dcc81984e116c6a800b0eac9599ad2
diff --git a/devel/sdcc/files/patch-sum b/devel/sdcc/files/patch-sum
new file mode 100644
index 00000000000..32cf1e1ba0d
--- /dev/null
+++ b/devel/sdcc/files/patch-sum
@@ -0,0 +1,17 @@
+$NetBSD: patch-sum,v 1.1 2000/08/25 21:49:28 tron Exp $
+
+MD5 (patch-aa) = a1121629fead51dacb1e919a7aa6eb84
+MD5 (patch-ab) = dd2476181ea812d643f48a2c49913a00
+MD5 (patch-ac) = 73f491762286c9cb67413f1fb3f0e7b5
+MD5 (patch-ad) = 71f4aef46260624f7aaa5c82f2966a0a
+MD5 (patch-ae) = ea4f355a2fd2d4edce4948a58a588ddc
+MD5 (patch-af) = 9f72b52715289c6774bddfaa28634aeb
+MD5 (patch-ag) = 37c37d9472d58388af091ddf9c2d8302
+MD5 (patch-ah) = e9347c246a06fd182b970b47446e79c4
+MD5 (patch-ai) = e8185e83b2edba9ce7d4d797aa666deb
+MD5 (patch-aj) = 02595179f11d36d3bca64f87f1edd693
+MD5 (patch-ak) = f33d97da5d72877f53c0ef7451ee9209
+MD5 (patch-al) = e32fcca18140b4351cedcc62ad0228d9
+MD5 (patch-am) = 08a393e5e1679700348d24225c395a87
+MD5 (patch-an) = 19099cdca747970d401f7afb86641992
+MD5 (patch-ao) = d8b5a21d559e6e9a233b94b164c1d099
diff --git a/devel/sdcc/patches/asxxxx.diff b/devel/sdcc/patches/asxxxx.diff
deleted file mode 100644
index 8b5348a98b9..00000000000
--- a/devel/sdcc/patches/asxxxx.diff
+++ /dev/null
@@ -1,46 +0,0 @@
---- asxxxx/i51mch.c.orig Mon Jun 28 23:27:59 1999
-+++ asxxxx/i51mch.c Mon Jun 28 23:47:41 1999
-@@ -389,8 +389,8 @@
- v1 = -3;
- else
- v1 = e1.e_addr - dot.s_addr - 1;
-- /* if ((v1 < -128) || (v1 > 127))
-- aerr(); */
-+ if (((v1 < -128) || (v1 > 127)) && pass > 0)
-+ aerr();
- outab(v1);
- } else {
- outrb(&e1, R_PCR);
-@@ -408,8 +408,8 @@
- v1 = -2;
- else
- v1 = e1.e_addr - dot.s_addr - 1;
-- /* if ((v1 < -128) || (v1 > 127))
-- aerr();*/
-+ if (((v1 < -128) || (v1 > 127)) && pass > 0)
-+ aerr();
- outab(v1);
- } else {
- outrb(&e1, R_PCR);
-@@ -463,8 +463,8 @@
- v1 = -3;
- else
- v1 = e1.e_addr - dot.s_addr - 1;
-- /* if ((v1 < -128) || (v1 > 127))
-- aerr(); */
-+ if (((v1 < -128) || (v1 > 127)) && pass > 0)
-+ aerr();
- outab(v1);
- } else {
- outrb(&e1, R_PCR);
-@@ -500,8 +500,8 @@
- v1 = -3;
- else
- v1 = e1.e_addr - dot.s_addr - 1;
-- /* if ((v1 < -128) || (v1 > 127))
-- aerr(); */
-+ if (((v1 < -128) || (v1 > 127)) && pass > 0)
-+ aerr();
- outab(v1);
- } else {
- outrb(&e1, R_PCR);
diff --git a/devel/sdcc/patches/patch-aa b/devel/sdcc/patches/patch-aa
index 509e0815a76..fb60d319c19 100644
--- a/devel/sdcc/patches/patch-aa
+++ b/devel/sdcc/patches/patch-aa
@@ -1,20 +1,13 @@
-diff -c -r ../sdcc218Ma.orig/cpp/cpplib.c cpp/cpplib.c
-*** ../sdcc218Ma.orig/cpp/cpplib.c Wed May 26 15:06:08 1999
---- cpp/cpplib.c Wed Aug 25 12:51:57 1999
-***************
-*** 7452,7458 ****
- #if defined(bsd4_4)
- extern const char *const sys_errlist[];
- #else
-! #if !defined(linux)
- extern char *sys_errlist[];
- #endif
- #endif
---- 7452,7458 ----
- #if defined(bsd4_4)
- extern const char *const sys_errlist[];
- #else
-! #if !defined(linux) && !defined(__FreeBSD__)
- extern char *sys_errlist[];
- #endif
- #endif
+$NetBSD: patch-aa,v 1.2 2000/08/25 21:49:29 tron Exp $
+
+--- asxxxx/Makefile.in.orig Thu May 27 00:31:32 1999
++++ asxxxx/Makefile.in Fri Aug 25 23:17:26 2000
+@@ -26,7 +26,7 @@
+ man2dir = $(mandir)/man2
+ infodir = ${prefix}/info
+
+-CPPFLAGS = @CPPFLAGS@ -I. -I$(PRJDIR)
++CPPFLAGS = @CPPFLAGS@ -I. -I$(PRJDIR) -Dunix
+ CFLAGS = @CFLAGS@ -Wall
+ M_OR_MM = @M_OR_MM@
+ LDFLAGS = @LDFLAGS@
diff --git a/devel/sdcc/patches/patch-ab b/devel/sdcc/patches/patch-ab
index f2e8f2b7ec2..987b83e2a8d 100644
--- a/devel/sdcc/patches/patch-ab
+++ b/devel/sdcc/patches/patch-ab
@@ -1,85 +1,48 @@
-*** sdcc.src/SDCCval.h.orig Thu Jul 1 09:28:12 1999
---- sdcc.src/SDCCval.h Mon Nov 29 19:06:01 1999
-***************
-*** 67,73 ****
- value *charVal (char * );
- value *symbolVal (symbol * );
- void printVal (value * );
-! double floatFromVal (value * );
- value *array2Ptr (value * );
- value *valUnaryPM (value * );
- value *valComplement (value * );
---- 67,73 ----
- value *charVal (char * );
- value *symbolVal (symbol * );
- void printVal (value * );
-! long floatFromVal (value * );
- value *array2Ptr (value * );
- value *valUnaryPM (value * );
- value *valComplement (value * );
-*** sdcc.src/SDCCval.c.orig Mon Nov 29 19:08:57 1999
---- sdcc.src/SDCCval.c Mon Nov 29 19:07:48 1999
-***************
-*** 578,584 ****
- /*------------------------------------------------------------------*/
- /* floatFromVal - value to unsinged integer conversion */
- /*------------------------------------------------------------------*/
-! double floatFromVal ( value *val )
- {
- if (!val)
- return 0;
---- 578,584 ----
- /*------------------------------------------------------------------*/
- /* floatFromVal - value to unsinged integer conversion */
- /*------------------------------------------------------------------*/
-! long floatFromVal ( value *val )
- {
- if (!val)
- return 0;
-***************
-*** 591,612 ****
- /* if it is not a specifier then we can assume that */
- /* it will be an unsigned long */
- if (!IS_SPEC(val->type))
-! return (double) SPEC_CVAL(val->etype).v_ulong;
-
- if (SPEC_NOUN(val->etype) == V_FLOAT )
-! return (double) SPEC_CVAL(val->etype).v_float ;
- else {
- if (SPEC_LONG(val->etype)) {
- if (SPEC_USIGN(val->etype))
-! return (double) SPEC_CVAL(val->etype).v_ulong ;
- else
-! return (double) SPEC_CVAL(val->etype).v_long ;
- }
- else {
- if (SPEC_USIGN(val->etype))
-! return (double) SPEC_CVAL(val->etype).v_uint ;
- else
-! return (double) SPEC_CVAL(val->etype).v_int ;
- }
- }
- }
---- 591,612 ----
- /* if it is not a specifier then we can assume that */
- /* it will be an unsigned long */
- if (!IS_SPEC(val->type))
-! return (long) SPEC_CVAL(val->etype).v_ulong;
-
- if (SPEC_NOUN(val->etype) == V_FLOAT )
-! return (long) SPEC_CVAL(val->etype).v_float ;
- else {
- if (SPEC_LONG(val->etype)) {
- if (SPEC_USIGN(val->etype))
-! return (long) SPEC_CVAL(val->etype).v_ulong ;
- else
-! return (long) SPEC_CVAL(val->etype).v_long ;
- }
- else {
- if (SPEC_USIGN(val->etype))
-! return (long) SPEC_CVAL(val->etype).v_uint ;
- else
-! return (long) SPEC_CVAL(val->etype).v_int ;
- }
- }
- }
+$NetBSD: patch-ab,v 1.2 2000/08/25 21:49:29 tron Exp $
+
+--- asxxxx/i51mch.c.orig Mon Sep 13 14:48:29 1999
++++ asxxxx/i51mch.c Fri Aug 25 23:17:56 2000
+@@ -390,8 +390,8 @@
+ v1 = -3;
+ else
+ v1 = e1.e_addr - dot.s_addr - 1;
+- /* if ((v1 < -128) || (v1 > 127))
+- aerr(); */
++ if (((v1 < -128) || (v1 > 127)) && pass > 0)
++ aerr();
+ outab(v1);
+ } else {
+ outrb(&e1, R_PCR);
+@@ -409,8 +409,8 @@
+ v1 = -2;
+ else
+ v1 = e1.e_addr - dot.s_addr - 1;
+- /* if ((v1 < -128) || (v1 > 127))
+- aerr();*/
++ if (((v1 < -128) || (v1 > 127)) && pass > 0)
++ aerr();
+ outab(v1);
+ } else {
+ outrb(&e1, R_PCR);
+@@ -464,8 +464,8 @@
+ v1 = -3;
+ else
+ v1 = e1.e_addr - dot.s_addr - 1;
+- /* if ((v1 < -128) || (v1 > 127))
+- aerr(); */
++ if (((v1 < -128) || (v1 > 127)) && pass > 0)
++ aerr();
+ outab(v1);
+ } else {
+ outrb(&e1, R_PCR);
+@@ -501,8 +501,8 @@
+ v1 = -2;
+ else
+ v1 = e1.e_addr - dot.s_addr - 1;
+- /* if ((v1 < -128) || (v1 > 127))
+- aerr(); */
++ if (((v1 < -128) || (v1 > 127)) && pass > 0)
++ aerr();
+ outab(v1);
+ } else {
+ outrb(&e1, R_PCR);
diff --git a/devel/sdcc/patches/patch-ac b/devel/sdcc/patches/patch-ac
index 23c309d11f1..26b27f0a08f 100644
--- a/devel/sdcc/patches/patch-ac
+++ b/devel/sdcc/patches/patch-ac
@@ -1,16 +1,13 @@
-*** s51.src/cmd.src/newcmd.cc.orig Mon Nov 29 19:14:29 1999
---- s51.src/cmd.src/newcmd.cc Mon Nov 29 19:15:37 1999
-***************
-*** 704,710 ****
---- 704,714 ----
- cl_listen_console::proc_input(void)
- {
- int newsock;
-+ #ifdef __FreeBSD__
-+ socklen_t size;
-+ #else
- uint size;
-+ #endif
- struct sockaddr_in sock_addr;
-
- size= sizeof(struct sockaddr);
+$NetBSD: patch-ac,v 1.2 2000/08/25 21:49:29 tron Exp $
+
+--- configure.orig Fri Oct 8 16:50:42 1999
++++ configure Fri Aug 25 23:17:26 2000
+@@ -1075,7 +1075,7 @@
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
+ echo "configure:1078: checking for a BSD compatible install" >&5
+-if test -z "$INSTALL"; then
++if true; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
diff --git a/devel/sdcc/patches/patch-ad b/devel/sdcc/patches/patch-ad
index ca6e695d44d..d9ced6b7957 100644
--- a/devel/sdcc/patches/patch-ad
+++ b/devel/sdcc/patches/patch-ad
@@ -1,69 +1,13 @@
-*** sdcc51lib/Makefile.in.orig Mon Nov 22 15:49:50 1999
---- sdcc51lib/Makefile.in Mon Nov 29 19:28:44 1999
-***************
-*** 63,69 ****
-
- models:
- for model in $(MODELS); do \
-! mkdir $$model; \
- $(MAKE) CFLAGS="$(CFLAGS) --model-$$model" objects; \
- mv *.rel $$model; \
- mv *.asm $$model; \
---- 63,69 ----
-
- models:
- for model in $(MODELS); do \
-! $(INSTALL) -d -m 755 $$model; \
- $(MAKE) CFLAGS="$(CFLAGS) --model-$$model" objects; \
- mv *.rel $$model; \
- mv *.asm $$model; \
-***************
-*** 73,84 ****
- # Compiling and installing everything and runing test
- # ---------------------------------------------------
- install: installdirs
-! $(CP) *.c $(datadir)/sdcc51lib/
- for model in $(MODELS); do \
- [ -d $$model ] || $(MAKE) all; \
-! $(CP) $$model/*.rel *.lib $(datadir)/sdcc51lib/$$model/; \
-! $(CP) $$model/*.asm $(datadir)/sdcc51lib/$$model/; \
-! $(CP) $$model/*.cdb $(datadir)/sdcc51lib/$$model/; \
- done
-
-
---- 73,84 ----
- # Compiling and installing everything and runing test
- # ---------------------------------------------------
- install: installdirs
-! $(INSTALL) *.c $(datadir)/sdcc51lib/
- for model in $(MODELS); do \
- [ -d $$model ] || $(MAKE) all; \
-! $(INSTALL) $$model/*.rel *.lib $(datadir)/sdcc51lib/$$model/; \
-! $(INSTALL) $$model/*.asm $(datadir)/sdcc51lib/$$model/; \
-! $(INSTALL) $$model/*.cdb $(datadir)/sdcc51lib/$$model/; \
- done
-
-
-***************
-*** 104,113 ****
- # Creating installation directories
- # ---------------------------------
- installdirs:
-! [ -d $(datadir)/sdcc51lib ] || mkdir -p $(datadir)/sdcc51lib
- for model in $(MODELS); do \
- [ -d $(datadir)/sdcc51lib/$$model ] || \
-! mkdir -p $(datadir)/sdcc51lib/$$model; \
- done
-
-
---- 104,113 ----
- # Creating installation directories
- # ---------------------------------
- installdirs:
-! [ -d $(datadir)/sdcc51lib ] || $(INSTALL) -d -m 755 $(datadir)/sdcc51lib
- for model in $(MODELS); do \
- [ -d $(datadir)/sdcc51lib/$$model ] || \
-! $(INSTALL) -d -m 755 $(datadir)/sdcc51lib/$$model; \
- done
-
-
+$NetBSD: patch-ad,v 1.2 2000/08/25 21:49:29 tron Exp $
+
+--- cpp/cpplib.c.orig Thu May 27 00:06:08 1999
++++ cpp/cpplib.c Fri Aug 25 23:17:26 2000
+@@ -7452,7 +7452,7 @@
+ #if defined(bsd4_4)
+ extern const char *const sys_errlist[];
+ #else
+-#if !defined(linux)
++#if !defined(linux) && !defined(__FreeBSD__) && !defined(__NetBSD__)
+ extern char *sys_errlist[];
+ #endif
+ #endif
diff --git a/devel/sdcc/patches/patch-ae b/devel/sdcc/patches/patch-ae
index dfc87db1328..8af5085ce1d 100644
--- a/devel/sdcc/patches/patch-ae
+++ b/devel/sdcc/patches/patch-ae
@@ -1,36 +1,13 @@
-*** sdcc51inc/Makefile.in.orig Mon Oct 18 09:39:07 1999
---- sdcc51inc/Makefile.in Fri Nov 12 17:21:47 1999
-***************
-*** 37,43 ****
- # Compiling and installing everything and runing test
- # ---------------------------------------------------
- install: all installdirs
-! $(CP) *.h $(datadir)/sdcc51inc/
-
-
- # Deleting all the installed files
---- 37,43 ----
- # Compiling and installing everything and runing test
- # ---------------------------------------------------
- install: all installdirs
-! $(INSTALL) -m 644 *.h $(datadir)/sdcc51inc/
-
-
- # Deleting all the installed files
-***************
-*** 59,65 ****
- # Creating installation directories
- # ---------------------------------
- installdirs:
-! [ -d $(datadir)/sdcc51inc ] || mkdir -p $(datadir)/sdcc51inc
-
-
- # Creating dependencies
---- 59,65 ----
- # Creating installation directories
- # ---------------------------------
- installdirs:
-! [ -d $(datadir)/sdcc51inc ] || $(INSTALL) -d -m 755 $(datadir)/sdcc51inc
-
-
- # Creating dependencies
+$NetBSD: patch-ae,v 1.2 2000/08/25 21:49:29 tron Exp $
+
+--- cpp/Makefile.in.orig Thu May 6 20:29:32 1999
++++ cpp/Makefile.in Fri Aug 25 23:17:26 2000
+@@ -27,7 +27,7 @@
+ infodir = ${prefix}/info
+
+ STD_INC = @sdcc_include_dir@
+-CPPFLAGS = @CPPFLAGS@ -I. -I$(PRJDIR) -D_FORASXXXX_
++CPPFLAGS = @CPPFLAGS@ -I. -I$(PRJDIR) -D_FORASXXXX_ -Dunix
+ CFLAGS = @CFLAGS@
+ M_OR_MM = @M_OR_MM@
+ LDFLAGS = @LDFLAGS@
diff --git a/devel/sdcc/patches/patch-af b/devel/sdcc/patches/patch-af
index bd1aa572a8b..0678f89a8bf 100644
--- a/devel/sdcc/patches/patch-af
+++ b/devel/sdcc/patches/patch-af
@@ -1,38 +1,13 @@
-*** configure.orig Thu May 27 14:51:34 1999
---- configure Thu Aug 26 18:15:36 1999
-***************
-*** 1075,1081 ****
- # ./install, which can be erroneously created by make from ./install.sh.
- echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
- echo "configure:1078: checking for a BSD compatible install" >&5
-! if test -z "$INSTALL"; then
- if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
---- 1075,1081 ----
- # ./install, which can be erroneously created by make from ./install.sh.
- echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
- echo "configure:1078: checking for a BSD compatible install" >&5
-! if true; then
- if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-*** s51.src/configure.orig Thu Aug 26 18:13:19 1999
---- s51.src/configure Thu Aug 26 18:13:49 1999
-***************
-*** 812,818 ****
- # ./install, which can be erroneously created by make from ./install.sh.
- echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
- echo "configure:815: checking for a BSD compatible install" >&5
-! if test -z "$INSTALL"; then
- if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
---- 812,818 ----
- # ./install, which can be erroneously created by make from ./install.sh.
- echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
- echo "configure:815: checking for a BSD compatible install" >&5
-! if true ; then
- if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
+$NetBSD: patch-af,v 1.2 2000/08/25 21:49:29 tron Exp $
+
+--- gc/Makefile.in.orig Tue May 11 17:14:06 1999
++++ gc/Makefile.in Fri Aug 25 23:17:26 2000
+@@ -18,7 +18,7 @@
+ # Under Irix 6, you will have to specify the ABI for as if you specify
+ # it for the C compiler.
+
+-CFLAGS= -O2 -DATOMIC_UNCOLLECTABLE -DNO_SIGNALS -DALL_INTERIOR_POINTERS -DNO_EXECUTE_PERMISSION -DSILENT -I /usr/local/include
++CFLAGS= -O2 -DATOMIC_UNCOLLECTABLE -DNO_SIGNALS -DALL_INTERIOR_POINTERS -DNO_EXECUTE_PERMISSION -DSILENT -I /usr/local/include -Dunix
+
+ # For dynamic library builds, it may be necessary to add flags to generate
+ # PIC code, e.g. -fPIC on Linux.
diff --git a/devel/sdcc/patches/patch-ag b/devel/sdcc/patches/patch-ag
index 152e79fb614..1c1127b073f 100644
--- a/devel/sdcc/patches/patch-ag
+++ b/devel/sdcc/patches/patch-ag
@@ -1,21 +1,20 @@
-*** sdcdb/Makefile.in.orig Mon Nov 29 19:38:51 1999
---- sdcdb/Makefile.in Mon Nov 29 19:39:26 1999
-***************
-*** 53,60 ****
- # ---------------------------------------------------
- install: all installdirs
- $(INSTALL) -s $(TARGET) $(bindir)/sdcdb
-! cp $(PRJDIR)/sdcdb/sdcdb.el $(bindir)/sdcdb.el
-! cp $(PRJDIR)/sdcdb/sdcdbsrc.el $(bindir)/sdcdbsrc.el
-
-
- # Deleting all the installed files
---- 53,60 ----
- # ---------------------------------------------------
- install: all installdirs
- $(INSTALL) -s $(TARGET) $(bindir)/sdcdb
-! $(INSTALL) -c $(PRJDIR)/sdcdb/sdcdb.el $(bindir)/sdcdb.el
-! $(INSTALL) -c $(PRJDIR)/sdcdb/sdcdbsrc.el $(bindir)/sdcdbsrc.el
-
-
- # Deleting all the installed files
+$NetBSD: patch-ag,v 1.2 2000/08/25 21:49:29 tron Exp $
+
+--- gc/mach_dep.c.orig Mon Oct 11 17:04:00 1999
++++ gc/mach_dep.c Fri Aug 25 23:17:26 2000
+@@ -197,6 +197,7 @@
+ && !defined(SCO) && !defined(SCO_ELF) \
+ && !(defined(LINUX) && defined(__ELF__)) \
+ && !(defined(__FreeBSD__) && defined(__ELF__)) \
++ && !(defined(__NetBSD__) && defined(__ELF__)) \
+ && !defined(DOS4GW)
+ /* I386 code, generic code does not appear to work */
+ /* It does appear to work under OS2, and asms dont */
+@@ -212,6 +213,7 @@
+
+ # if ( defined(I386) && defined(LINUX) && defined(__ELF__) ) \
+ || ( defined(I386) && defined(__FreeBSD__) && defined(__ELF__) )
++ || ( defined(I386) && defined(__NetBSD__) && defined(__ELF__) )
+
+ /* This is modified for Linux with ELF (Note: _ELF_ only) */
+ /* This section handles FreeBSD with ELF. */
diff --git a/devel/sdcc/patches/patch-ah b/devel/sdcc/patches/patch-ah
new file mode 100644
index 00000000000..75e872cfade
--- /dev/null
+++ b/devel/sdcc/patches/patch-ah
@@ -0,0 +1,16 @@
+$NetBSD: patch-ah,v 1.1 2000/08/25 21:49:29 tron Exp $
+
+--- s51.src/cmd.src/newcmd.cc.orig Mon Oct 4 18:05:49 1999
++++ s51.src/cmd.src/newcmd.cc Fri Aug 25 23:17:26 2000
+@@ -704,7 +704,11 @@
+ cl_listen_console::proc_input(void)
+ {
+ int newsock;
++#if defined(__FreeBSD__) || defined(__NetBSD__)
++ socklen_t size;
++#else
+ uint size;
++#endif
+ struct sockaddr_in sock_addr;
+
+ size= sizeof(struct sockaddr);
diff --git a/devel/sdcc/patches/patch-ai b/devel/sdcc/patches/patch-ai
new file mode 100644
index 00000000000..2c8be56f368
--- /dev/null
+++ b/devel/sdcc/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2000/08/25 21:49:29 tron Exp $
+
+--- s51.src/configure.orig Thu Jul 29 20:17:03 1999
++++ s51.src/configure Fri Aug 25 23:17:26 2000
+@@ -812,7 +812,7 @@
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
+ echo "configure:815: checking for a BSD compatible install" >&5
+-if test -z "$INSTALL"; then
++if true ; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
diff --git a/devel/sdcc/patches/patch-aj b/devel/sdcc/patches/patch-aj
new file mode 100644
index 00000000000..2e3ce28b541
--- /dev/null
+++ b/devel/sdcc/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2000/08/25 21:49:29 tron Exp $
+
+--- sdcc.src/SDCCval.h.orig Thu Jul 1 18:28:12 1999
++++ sdcc.src/SDCCval.h Fri Aug 25 23:17:26 2000
+@@ -67,7 +67,7 @@
+ value *charVal (char * );
+ value *symbolVal (symbol * );
+ void printVal (value * );
+-double floatFromVal (value * );
++long floatFromVal (value * );
+ value *array2Ptr (value * );
+ value *valUnaryPM (value * );
+ value *valComplement (value * );
diff --git a/devel/sdcc/patches/patch-ak b/devel/sdcc/patches/patch-ak
new file mode 100644
index 00000000000..4e80e258976
--- /dev/null
+++ b/devel/sdcc/patches/patch-ak
@@ -0,0 +1,42 @@
+$NetBSD: patch-ak,v 1.1 2000/08/25 21:49:29 tron Exp $
+
+--- sdcc.src/SDCCval.c.orig Fri Sep 10 15:35:45 1999
++++ sdcc.src/SDCCval.c Fri Aug 25 23:17:26 2000
+@@ -578,7 +578,7 @@
+ /*------------------------------------------------------------------*/
+ /* floatFromVal - value to unsinged integer conversion */
+ /*------------------------------------------------------------------*/
+-double floatFromVal ( value *val )
++long floatFromVal ( value *val )
+ {
+ if (!val)
+ return 0;
+@@ -591,22 +591,22 @@
+ /* if it is not a specifier then we can assume that */
+ /* it will be an unsigned long */
+ if (!IS_SPEC(val->type))
+- return (double) SPEC_CVAL(val->etype).v_ulong;
++ return (long) SPEC_CVAL(val->etype).v_ulong;
+
+ if (SPEC_NOUN(val->etype) == V_FLOAT )
+- return (double) SPEC_CVAL(val->etype).v_float ;
++ return (long) SPEC_CVAL(val->etype).v_float ;
+ else {
+ if (SPEC_LONG(val->etype)) {
+ if (SPEC_USIGN(val->etype))
+- return (double) SPEC_CVAL(val->etype).v_ulong ;
++ return (long) SPEC_CVAL(val->etype).v_ulong ;
+ else
+- return (double) SPEC_CVAL(val->etype).v_long ;
++ return (long) SPEC_CVAL(val->etype).v_long ;
+ }
+ else {
+ if (SPEC_USIGN(val->etype))
+- return (double) SPEC_CVAL(val->etype).v_uint ;
++ return (long) SPEC_CVAL(val->etype).v_uint ;
+ else
+- return (double) SPEC_CVAL(val->etype).v_int ;
++ return (long) SPEC_CVAL(val->etype).v_int ;
+ }
+ }
+ }
diff --git a/devel/sdcc/patches/patch-al b/devel/sdcc/patches/patch-al
new file mode 100644
index 00000000000..620b8578fc2
--- /dev/null
+++ b/devel/sdcc/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1 2000/08/25 21:49:29 tron Exp $
+
+--- sdcc.src/Makefile.in.orig Mon May 24 18:40:50 1999
++++ sdcc.src/Makefile.in Fri Aug 25 23:17:26 2000
+@@ -34,7 +34,7 @@
+
+ # Flags
+ DEFS = $(subs -DHAVE_CONFIG_H,,@DEFS@)
+-CPPFLAGS = @CPPFLAGS@ -I$(PRJDIR)
++CPPFLAGS = @CPPFLAGS@ -I$(PRJDIR) -Dunix
+ CFLAGS = @CFLAGS@ -Wall
+ M_OR_MM = @M_OR_MM@
+ LIBS = -lgc @LIBS@
diff --git a/devel/sdcc/patches/patch-am b/devel/sdcc/patches/patch-am
new file mode 100644
index 00000000000..da285f0e07f
--- /dev/null
+++ b/devel/sdcc/patches/patch-am
@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.1 2000/08/25 21:49:29 tron Exp $
+
+--- sdcc51inc/Makefile.in.orig Fri Aug 25 23:17:26 2000
++++ sdcc51inc/Makefile.in Fri Aug 25 23:17:26 2000
+@@ -26,7 +26,7 @@
+ infodir = @infodir@
+ srcdir = @srcdir@
+
+-CPPFLAGS = @CPPFLAGS@ -I$(PRJDIR)
++CPPFLAGS = @CPPFLAGS@ -I$(PRJDIR) -Dunix
+
+
+ # Compiling entire program or any subproject
diff --git a/devel/sdcc/patches/patch-an b/devel/sdcc/patches/patch-an
new file mode 100644
index 00000000000..c5c312756cc
--- /dev/null
+++ b/devel/sdcc/patches/patch-an
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.1 2000/08/25 21:49:29 tron Exp $
+
+--- sdcc51lib/Makefile.in.orig Fri Aug 25 23:17:26 2000
++++ sdcc51lib/Makefile.in Fri Aug 25 23:17:26 2000
+@@ -30,7 +30,7 @@
+ infodir = @infodir@
+ srcdir = @srcdir@
+
+-CPPFLAGS = -I$(INCDIR)
++CPPFLAGS = -I$(INCDIR) -Dunix
+ CFLAGS =
+
+ OBJECTS = _atoi.rel _atol.rel _autobaud.rel _bp.rel _char2fs.rel \
diff --git a/devel/sdcc/patches/patch-ao b/devel/sdcc/patches/patch-ao
new file mode 100644
index 00000000000..d48951e4f4f
--- /dev/null
+++ b/devel/sdcc/patches/patch-ao
@@ -0,0 +1,13 @@
+$NetBSD: patch-ao,v 1.1 2000/08/25 21:49:29 tron Exp $
+
+--- sdcdb/Makefile.in.orig Fri Aug 25 23:17:26 2000
++++ sdcdb/Makefile.in Fri Aug 25 23:17:26 2000
+@@ -27,7 +27,7 @@
+ infodir = ${prefix}/info
+
+ STD_INC = @sdcc_include_dir@
+-CPPFLAGS = @CPPFLAGS@ -I. -I$(PRJDIR)
++CPPFLAGS = @CPPFLAGS@ -I. -I$(PRJDIR) -Dunix
+ CFLAGS = @CFLAGS@
+ M_OR_MM = @M_OR_MM@
+ LDFLAGS = @LDFLAGS@
diff --git a/devel/sdcc/pkg/PLIST b/devel/sdcc/pkg/PLIST
index 79f8c4fe20e..4a01130ccf1 100644
--- a/devel/sdcc/pkg/PLIST
+++ b/devel/sdcc/pkg/PLIST
@@ -1,3 +1,4 @@
+@comment $NetBSD: PLIST,v 1.2 2000/08/25 21:49:30 tron Exp $
bin/aslink
bin/asx8051
bin/s51
@@ -335,9 +336,7 @@ share/sdcc51lib/large/ser_ir.rel
share/sdcc51lib/large/serial.asm
share/sdcc51lib/large/serial.cdb
share/sdcc51lib/large/serial.rel
-share/sdcc51lib/large/vprintf.asm
share/sdcc51lib/large/vprintf.cdb
-share/sdcc51lib/large/vprintf.rel
share/sdcc51lib/malloc.c
share/sdcc51lib/printf_large.c
share/sdcc51lib/printfl.c
@@ -564,9 +563,7 @@ share/sdcc51lib/small/malloc.rel
share/sdcc51lib/small/printf_large.asm
share/sdcc51lib/small/printf_large.cdb
share/sdcc51lib/small/printf_large.rel
-share/sdcc51lib/small/printfl.asm
share/sdcc51lib/small/printfl.cdb
-share/sdcc51lib/small/printfl.rel
share/sdcc51lib/small/puts.asm
share/sdcc51lib/small/puts.cdb
share/sdcc51lib/small/puts.rel
@@ -576,9 +573,7 @@ share/sdcc51lib/small/ser_ir.rel
share/sdcc51lib/small/serial.asm
share/sdcc51lib/small/serial.cdb
share/sdcc51lib/small/serial.rel
-share/sdcc51lib/small/vprintf.asm
share/sdcc51lib/small/vprintf.cdb
-share/sdcc51lib/small/vprintf.rel
share/sdcc51lib/vprintf.c
@dirrm share/sdcc51inc
@dirrm share/sdcc51lib/large