From owner-freebsd-ports Sat Apr 28 12:50:14 2001 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E997B37B423 for ; Sat, 28 Apr 2001 12:50:06 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.1/8.11.1) id f3SJo6N56784; Sat, 28 Apr 2001 12:50:06 -0700 (PDT) (envelope-from gnats) Date: Sat, 28 Apr 2001 12:50:06 -0700 (PDT) Message-Id: <200104281950.f3SJo6N56784@freefall.freebsd.org> To: freebsd-ports@FreeBSD.org Cc: From: "Stephen J. Roznowski" Subject: Re: ports/26923: Port update for NQC 2.3.r1 Reply-To: "Stephen J. Roznowski" Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org The following reply was made to PR ports/26923; it has been noted by GNATS. From: "Stephen J. Roznowski" To: FreeBSD-gnats-submit@FreeBSD.ORG Cc: Subject: Re: ports/26923: Port update for NQC 2.3.r1 Date: Sat, 28 Apr 2001 15:45:45 -0400 (EDT) Apparently, I didn't look closely enough at what the previous patch file was doing.... Attached is a cleaner patch against the current version. diff -ur /usr/ports/lang/nqc/Makefile nqc/Makefile --- /usr/ports/lang/nqc/Makefile Fri Nov 10 03:00:52 2000 +++ nqc/Makefile Sat Apr 28 14:17:22 2001 @@ -6,7 +6,7 @@ # PORTNAME= nqc -PORTVERSION= 2.2.r2 +PORTVERSION= 2.3.r1 CATEGORIES= lang MASTER_SITES= http://www.enteract.com/~dbaum/nqc/release/ diff -ur /usr/ports/lang/nqc/distinfo nqc/distinfo --- /usr/ports/lang/nqc/distinfo Fri Nov 10 03:00:53 2000 +++ nqc/distinfo Sat Apr 28 14:17:29 2001 @@ -1 +1 @@ -MD5 (nqc-2.2.r2.tar.gz) = d315a4c36227923f2c010ab8e38df083 +MD5 (nqc-2.3.r1.tar.gz) = cba9619516329732933ab8bdc753dc93 diff -ur /usr/ports/lang/nqc/files/patch-aa nqc/files/patch-aa --- /usr/ports/lang/nqc/files/patch-aa Fri Nov 10 03:00:53 2000 +++ nqc/files/patch-aa Sat Apr 28 15:39:26 2001 @@ -1,24 +1,24 @@ ---- Makefile.orig Sun Oct 22 11:26:06 2000 -+++ Makefile Thu Nov 9 01:29:29 2000 -@@ -28,14 +28,14 @@ - # - # Pick your C++ compiler. - # --CC=g++ -+CC?=g++ - #CC=gcc - +--- Makefile.orig Sat Apr 28 15:36:50 2001 ++++ Makefile Sat Apr 28 15:39:10 2001 +@@ -34,8 +34,8 @@ # # Pick your YACC processor # -YACC = bison -y -# YACC = yacc -+#YACC = bison -y ++# YACC = bison -y +YACC = yacc # # Define the FLEX processor -@@ -47,24 +47,25 @@ +@@ -45,30 +45,31 @@ + + # Link in any necessary C++ libraries + # +-# LIBS = -lstdc++ ++LIBS = -lstdc++ + + # # Use this to define the default device driver name # for serial port connections. # @@ -35,12 +35,11 @@ # other commands --LD=$(CC) + LD=$(CC) -CP=cp -f -MKDIR=mkdir -MV=mv -f -RM=rm -f -+LD?=$(LD) +CP?=cp -f +MKDIR?=mkdir +MV?=mv -f @@ -49,21 +48,7 @@ IFLAGS=-Iplatform -Ircxlib -Inqc -Icompiler WFLAGS=-Wall -Wstrict-prototypes -Wmissing-prototypes -CFLAGS = -O6 -pipe $(IFLAGS) $(WFLAGS) -DDEFAULT_SERIAL_NAME='$(DEFAULT_SERIAL_NAME)' -+CFLAGS += $(IFLAGS) $(WFLAGS) -DDEFAULT_SERIAL_NAME='$(DEFAULT_SERIAL_NAME)' ++CFLAGS = $(IFLAGS) $(WFLAGS) -DDEFAULT_SERIAL_NAME='$(DEFAULT_SERIAL_NAME)' OBJ = $(NQCOBJ) $(COBJ) $(RCXOBJ) $(POBJ) -@@ -106,10 +107,10 @@ - $(MKDIR) bin - - bin/nqc : compiler/parse.cpp $(OBJ) -- $(LD) -o $@ $(OBJ) -+ $(CC) -o $@ $(OBJ) -lstdc++ - --bin/mkdata : mkdata/mkdata.cpp nqc/SRecord.cpp -- $(LD) -o bin/mkdata -Inqc/ -Iplatform/ mkdata/mkdata.cpp nqc/SRecord.cpp -+bin/mkdata : mkdata/mkdata.o nqc/SRecord.o -+ $(CC) -o bin/mkdata mkdata/mkdata.o nqc/SRecord.o -lstdc++ - - # - # clean up stuff To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message