summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Hay <jhay@FreeBSD.org>2003-11-24 19:00:54 +0000
committerJohn Hay <jhay@FreeBSD.org>2003-11-24 19:00:54 +0000
commit43490840e55627a491d61e904d094e4cac6b8dda (patch)
treea3507ce82642738183331e27a69992e79d963e6c
parentUpdate to nqc 2.5 r3. (diff)
Backout my upgrade to nqc 2.5 r3. We are in a code freeze.
Notes
Notes: svn path=/head/; revision=94767
-rw-r--r--lang/nqc/Makefile2
-rw-r--r--lang/nqc/distinfo2
-rw-r--r--lang/nqc/files/patch-aa28
3 files changed, 13 insertions, 19 deletions
diff --git a/lang/nqc/Makefile b/lang/nqc/Makefile
index 9bc40d40427c..bccbc4e68f48 100644
--- a/lang/nqc/Makefile
+++ b/lang/nqc/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= nqc
-PORTVERSION= 2.5.r3
+PORTVERSION= 2.5.r1
CATEGORIES= lang
MASTER_SITES= http://www.baumfamily.org/nqc/release/
EXTRACT_SUFX= .tgz
diff --git a/lang/nqc/distinfo b/lang/nqc/distinfo
index fbb81acf4899..d9100e037e8e 100644
--- a/lang/nqc/distinfo
+++ b/lang/nqc/distinfo
@@ -1 +1 @@
-MD5 (nqc-2.5.r3.tgz) = 65917b5057533f9c12b9504f0c966f8d
+MD5 (nqc-2.5.r1.tgz) = b765ac5077aba731861157c265748075
diff --git a/lang/nqc/files/patch-aa b/lang/nqc/files/patch-aa
index b0f77ab7c472..338eb7133622 100644
--- a/lang/nqc/files/patch-aa
+++ b/lang/nqc/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.orig Sun Nov 9 06:14:20 2003
-+++ Makefile Mon Nov 24 19:57:31 2003
+--- Makefile.orig Tue Jan 28 06:24:21 2003
++++ Makefile Thu Jan 30 20:19:25 2003
@@ -28,20 +28,20 @@
#
# Pick your C++ compiler.
@@ -54,25 +54,19 @@
-USBOBJ = rcxlib/RCX_USBTowerPipe_none.o
+USBOBJ = rcxlib/RCX_USBTowerPipe_fbsd.o
-
#
-@@ -87,18 +88,23 @@
+ # Platform specific tweaks
+@@ -78,9 +79,6 @@
+ ifeq ($TARGET),solaris)
# Solaris
CFLAGS += -DSOLARIS
- else
-+ifneq (,$(strip $(findstring $(OSTYPE), FreeBSD)))
-+ # FreeBSD
-+ # Don't need to set anything
-+else
- # default Unix build without USB support
- CFLAGS += -O6
+-else
+- # default - works for Linux
+- CFLAGS += -O6
endif
endif
- endif
-+endif
-
- # this must happen after the platform tweaks just in case the platform
+@@ -88,7 +86,7 @@
# wants to redefine the default serial name
#
ifndef DEFAULT_SERIAL_NAME
@@ -81,7 +75,7 @@
endif
CFLAGS += -DDEFAULT_SERIAL_NAME='$(DEFAULT_SERIAL_NAME)'
-@@ -150,10 +156,10 @@
+@@ -140,10 +138,10 @@
$(MKDIR) bin
bin/nqc : compiler/parse.cpp $(OBJ)
@@ -94,7 +88,7 @@
#
# clean up stuff
-@@ -213,7 +219,7 @@
+@@ -203,7 +201,7 @@
# general rule for compiling
#
.cpp.o: