aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormiwi <miwi@FreeBSD.org>2007-10-30 18:54:00 +0800
committermiwi <miwi@FreeBSD.org>2007-10-30 18:54:00 +0800
commit3ff2ad9f7829c8a6390af6beeb32e85cee188c74 (patch)
treeb6fb799b6aea48006badc56cbc032e823953c32c
parent1386106a4f91825288f04c90f17a540baf8ea6e4 (diff)
downloadfreebsd-ports-gnome-3ff2ad9f7829c8a6390af6beeb32e85cee188c74.tar.gz
freebsd-ports-gnome-3ff2ad9f7829c8a6390af6beeb32e85cee188c74.tar.zst
freebsd-ports-gnome-3ff2ad9f7829c8a6390af6beeb32e85cee188c74.zip
- Unbreak
- Fix build with gcc 4.2 - pet portlint PR: 117648 (based on) Submitted by: Pietro Cerutti <gahr@gahr.ch>
-rw-r--r--devel/a2dev/Makefile29
-rw-r--r--devel/a2dev/files/patch-aa4
-rw-r--r--devel/a2dev/files/patch-ab4
-rw-r--r--devel/a2dev/files/patch-ac4
-rw-r--r--devel/a2dev/files/patch-ad4
-rw-r--r--devel/a2dev/files/patch-ae4
-rw-r--r--devel/a2dev/files/patch-af4
-rw-r--r--devel/a2dev/files/patch-ag5
-rw-r--r--devel/a2dev/files/patch-ah5
-rw-r--r--devel/a2dev/files/patch-asm_emit.c38
-rw-r--r--devel/a2dev/files/patch-util_error.c10
-rw-r--r--devel/a2dev/files/patch-util_hash.c17
-rw-r--r--devel/a2dev/files/patch-util_names.c10
-rw-r--r--devel/a2dev/pkg-plist4
14 files changed, 104 insertions, 38 deletions
diff --git a/devel/a2dev/Makefile b/devel/a2dev/Makefile
index 4aa26e1adf08..4f49ffddacbe 100644
--- a/devel/a2dev/Makefile
+++ b/devel/a2dev/Makefile
@@ -5,29 +5,26 @@
# $FreeBSD$
#
-PORTNAME= a2dev
-PORTVERSION= 1.2
-PORTREVISION= 1
-CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_LOCAL}
+PORTNAME= a2dev
+PORTVERSION= 1.2
+PORTREVISION= 1
+CATEGORIES= devel
+MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= archie
-EXTRACT_SUFX= .tgz
+EXTRACT_SUFX= .tgz
-MAINTAINER= ports@FreeBSD.org
-COMMENT= Apple II 6502 assembler, linker, loader, and object file viewer
+MAINTAINER= ports@FreeBSD.org
+COMMENT= Apple II 6502 assembler, linker, loader, and object file viewer
-USE_GMAKE= defined
-PATCH_STRIP= -p1
-MAN1= a2asm.1 a2link.1 a2load.1 a2objx.1
+USE_GMAKE= yes
+MAN1= a2asm.1 a2link.1 a2load.1 a2objx.1
+
+PLIST_FILES= bin/a2asm bin/a2link bin/a2load bin/a2objx
.include <bsd.port.pre.mk>
.if ${ARCH} != "i386"
-BROKEN= "Does not compile on !i386"
-.endif
-
-.if ${OSVERSION} >= 700042
-BROKEN= Does not compile with GCC 4.2
+BROKEN= Does not compile on !i386
.endif
post-patch:
diff --git a/devel/a2dev/files/patch-aa b/devel/a2dev/files/patch-aa
index ea6aad22d43c..47b39bd9b605 100644
--- a/devel/a2dev/files/patch-aa
+++ b/devel/a2dev/files/patch-aa
@@ -1,6 +1,6 @@
diff -ur a2dev-1.2.orig/Make.defs a2dev-1.2/Make.defs
---- a2dev-1.2.orig/Make.defs Tue Mar 28 07:14:43 1995
-+++ a2dev-1.2/Make.defs Wed Jul 1 18:22:36 1998
+--- Make.defs Tue Mar 28 07:14:43 1995
++++ Make.defs Wed Jul 1 18:22:36 1998
@@ -7,8 +7,8 @@
# Where are installation "bin" and "man" subdirectories?
diff --git a/devel/a2dev/files/patch-ab b/devel/a2dev/files/patch-ab
index ec45013a2d0b..f4aa038beb57 100644
--- a/devel/a2dev/files/patch-ab
+++ b/devel/a2dev/files/patch-ab
@@ -1,6 +1,6 @@
diff -ur a2dev-1.2.orig/Makefile a2dev-1.2/Makefile
---- a2dev-1.2.orig/Makefile Sun Mar 26 06:08:22 1995
-+++ a2dev-1.2/Makefile Wed Jul 1 18:27:21 1998
+--- Makefile Sun Mar 26 06:08:22 1995
++++ Makefile Wed Jul 1 18:27:21 1998
@@ -13,7 +13,7 @@
include Make.defs
diff --git a/devel/a2dev/files/patch-ac b/devel/a2dev/files/patch-ac
index 8b48049ac335..22b1ce084da4 100644
--- a/devel/a2dev/files/patch-ac
+++ b/devel/a2dev/files/patch-ac
@@ -1,5 +1,5 @@
---- a2dev-1.2/asm/Makefile.orig Sat Mar 25 21:52:23 1995
-+++ a2dev-1.2/asm/Makefile Tue Oct 13 21:25:02 1998
+--- asm/Makefile.orig Sat Mar 25 21:52:23 1995
++++ asm/Makefile Tue Oct 13 21:25:02 1998
@@ -25,15 +25,15 @@
### Abstract rules
###
diff --git a/devel/a2dev/files/patch-ad b/devel/a2dev/files/patch-ad
index 9cda38829334..480d6f9ff774 100644
--- a/devel/a2dev/files/patch-ad
+++ b/devel/a2dev/files/patch-ad
@@ -1,5 +1,5 @@
---- a2dev-1.2/link/Makefile.orig Sat Mar 25 21:52:45 1995
-+++ a2dev-1.2/link/Makefile Tue Oct 13 21:28:09 1998
+--- link/Makefile.orig Sat Mar 25 21:52:45 1995
++++ link/Makefile Tue Oct 13 21:28:09 1998
@@ -16,15 +16,15 @@
### Abstract rules
###
diff --git a/devel/a2dev/files/patch-ae b/devel/a2dev/files/patch-ae
index 220cb20063de..dceef93c17ba 100644
--- a/devel/a2dev/files/patch-ae
+++ b/devel/a2dev/files/patch-ae
@@ -1,5 +1,5 @@
---- a2dev-1.2/load/Makefile.orig Sat Mar 25 21:52:37 1995
-+++ a2dev-1.2/load/Makefile Tue Oct 13 21:29:06 1998
+--- load/Makefile.orig Sat Mar 25 21:52:37 1995
++++ load/Makefile Tue Oct 13 21:29:06 1998
@@ -16,15 +16,15 @@
### Abstract rules
###
diff --git a/devel/a2dev/files/patch-af b/devel/a2dev/files/patch-af
index b2fb32e8ff61..b08b01d96fa6 100644
--- a/devel/a2dev/files/patch-af
+++ b/devel/a2dev/files/patch-af
@@ -1,5 +1,5 @@
---- a2dev-1.2/objx/Makefile.orig Sat Mar 25 21:52:54 1995
-+++ a2dev-1.2/objx/Makefile Tue Oct 13 21:29:51 1998
+--- objx/Makefile.orig Sat Mar 25 21:52:54 1995
++++ objx/Makefile Tue Oct 13 21:29:51 1998
@@ -16,15 +16,15 @@
### Abstract rules
###
diff --git a/devel/a2dev/files/patch-ag b/devel/a2dev/files/patch-ag
index 43f1ec2bfe9f..0faf4965ce12 100644
--- a/devel/a2dev/files/patch-ag
+++ b/devel/a2dev/files/patch-ag
@@ -1,6 +1,5 @@
-diff -ur a2dev-1.2.orig/test/Makefile a2dev-1.2/test/Makefile
---- a2dev-1.2.orig/test/Makefile Mon Mar 27 22:16:25 1995
-+++ a2dev-1.2/test/Makefile Wed Jul 1 18:34:39 1998
+--- test/Makefile Mon Mar 27 22:16:25 1995
++++ test/Makefile Wed Jul 1 18:34:39 1998
@@ -11,11 +11,12 @@
### Default is to do nothing -- "make verify" runs the test.
###
diff --git a/devel/a2dev/files/patch-ah b/devel/a2dev/files/patch-ah
index 7787a3c51e3a..35ba52c1aabd 100644
--- a/devel/a2dev/files/patch-ah
+++ b/devel/a2dev/files/patch-ah
@@ -1,6 +1,5 @@
-diff -ur a2dev-1.2.orig/util/Makefile a2dev-1.2/util/Makefile
---- a2dev-1.2.orig/util/Makefile Wed Mar 22 19:05:32 1995
-+++ a2dev-1.2/util/Makefile Wed Jul 1 18:41:55 1998
+--- util/Makefile Wed Mar 22 19:05:32 1995
++++ util/Makefile Wed Jul 1 18:41:55 1998
@@ -9,14 +9,15 @@
UTIL := util.a
diff --git a/devel/a2dev/files/patch-asm_emit.c b/devel/a2dev/files/patch-asm_emit.c
new file mode 100644
index 000000000000..e3c5e7f623a0
--- /dev/null
+++ b/devel/a2dev/files/patch-asm_emit.c
@@ -0,0 +1,38 @@
+--- asm/emit.c.orig 2007-10-30 11:43:34.000000000 +0100
++++ asm/emit.c 2007-10-30 11:44:37.000000000 +0100
+@@ -191,7 +191,7 @@
+
+ /* Try to do zero page */
+
+- if (zmode >= 0 && CheckOp(ins, zmode) >= 0)
++ if (zmode >= 0 && CheckOp(ins, zmode) >= 0) {
+ if (ivalue->type == iSegRel
+ && ivalue->u.segrel.segment == AbsSegment
+ && (ivalue->u.segrel.offset & ~0xFF) == 0)
+@@ -207,7 +207,7 @@
+ EmitIvalue(ivalue, FALSE, 0x01);
+ return;
+ }
+-
++ }
+ /* Can we ONLY do zero page (but didn't)? */
+
+ if (mode < 0)
+@@ -239,7 +239,7 @@
+
+ /* Compute displacement to target address */
+
+- if (gPass == 2)
++ if (gPass == 2) {
+ if (ivalue->type != iSegRel || ivalue->u.segrel.segment != gSegment)
+ uerror("illegal branch address");
+ else
+@@ -248,7 +248,7 @@
+ if (disp < -128 || disp > 127)
+ uerror("branch of %d bytes is out of range", disp);
+ }
+-
++ }
+ /* Done */
+
+ Emit(disp);
diff --git a/devel/a2dev/files/patch-util_error.c b/devel/a2dev/files/patch-util_error.c
new file mode 100644
index 000000000000..e6c4cf17e96a
--- /dev/null
+++ b/devel/a2dev/files/patch-util_error.c
@@ -0,0 +1,10 @@
+--- util/error.c.orig 2007-10-30 11:34:36.000000000 +0100
++++ util/error.c 2007-10-30 11:35:48.000000000 +0100
+@@ -7,6 +7,7 @@
+ */
+
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <stdarg.h>
+ #include "util.h"
+ #include "error.h"
diff --git a/devel/a2dev/files/patch-util_hash.c b/devel/a2dev/files/patch-util_hash.c
new file mode 100644
index 000000000000..da60d94c2ac4
--- /dev/null
+++ b/devel/a2dev/files/patch-util_hash.c
@@ -0,0 +1,17 @@
+--- util/hash.c.orig 2007-10-30 11:34:44.000000000 +0100
++++ util/hash.c 2007-10-30 11:39:58.000000000 +0100
+@@ -29,8 +29,12 @@
+ {
+ unsigned crc = CRC_INIT;
+
+- while (length--)
+- crc = table[(crc ^ *((unsigned char *) bytes)++) & 0xFF] ^ (crc >> 8);
++ unsigned char byte;
++ unsigned len = 0;
++ for(len=0; len<length; len++){
++ byte = ((unsigned char *)bytes)[len];
++ crc = table[(crc ^ byte) & 0xFF] ^ (crc >> 8);
++ }
+ return(crc ^ CRC_FINAL);
+ }
+
diff --git a/devel/a2dev/files/patch-util_names.c b/devel/a2dev/files/patch-util_names.c
new file mode 100644
index 000000000000..da296eb75975
--- /dev/null
+++ b/devel/a2dev/files/patch-util_names.c
@@ -0,0 +1,10 @@
+--- util/names.c.orig 2007-10-30 11:34:51.000000000 +0100
++++ util/names.c 2007-10-30 11:40:14.000000000 +0100
+@@ -6,6 +6,7 @@
+ */
+
+ #include <stdio.h>
++#include <string.h>
+ #include "util.h"
+ #include "error.h"
+ #include "hash.h"
diff --git a/devel/a2dev/pkg-plist b/devel/a2dev/pkg-plist
deleted file mode 100644
index cefa281fca8c..000000000000
--- a/devel/a2dev/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/a2asm
-bin/a2link
-bin/a2load
-bin/a2objx