From owner-freebsd-ports Wed Jan 6 02:50:23 1999 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id CAA24229 for freebsd-ports-outgoing; Wed, 6 Jan 1999 02:50:23 -0800 (PST) (envelope-from owner-freebsd-ports@FreeBSD.ORG) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id CAA24192 for ; Wed, 6 Jan 1999 02:50:10 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.8.8/8.8.5) id CAA08821; Wed, 6 Jan 1999 02:50:01 -0800 (PST) Received: from axl.noc.iafrica.com (axl.noc.iafrica.com [196.31.1.175]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id CAA22554 for ; Wed, 6 Jan 1999 02:42:54 -0800 (PST) (envelope-from sheldonh@axl.noc.iafrica.com) Received: from sheldonh (helo=axl.noc.iafrica.com) by axl.noc.iafrica.com with local-esmtp (Exim 2.10 #1) id 0zxqOy-0004uO-00 for FreeBSD-gnats-submit@freebsd.org; Wed, 6 Jan 1999 12:41:24 +0200 Message-Id: <18871.915619284@axl.noc.iafrica.com> Date: Wed, 06 Jan 1999 12:41:24 +0200 From: Sheldon Hearn Reply-To: Sheldon Hearn To: FreeBSD-gnats-submit@FreeBSD.ORG X-Send-Pr-Version: 3.2 Subject: ports/9345: [PATCH] unbreak net/xicq Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 9345 >Category: ports >Synopsis: [PATCH] unbreak net/xicq >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Jan 6 02:50:01 PST 1999 >Closed-Date: >Last-Modified: >Originator: Sheldon Hearn >Release: FreeBSD 2.2.7-STABLE i386 >Organization: UUNET Internet Africa >Environment: N/A >Description: The xicq port is currently marked broken because of breakage at build-time. >How-To-Repeat: N/A >Fix: The following diffs fix build-time breakage and teach the port to honour local CFLAGS. Index: Makefile =================================================================== RCS file: /home/ncvs/ports/net/xicq/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- Makefile 1998/08/25 05:03:18 1.4 +++ Makefile 1998/12/15 16:58:48 @@ -15,9 +15,8 @@ WRKSRC= ${WRKDIR}/xicq-071298 -BROKEN= build - USE_GMAKE= yes +MAKE_ENV= OPT="${CFLAGS}" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/xicq/main ${PREFIX}/bin/xicq Index: patches/patch-aa =================================================================== RCS file: patch-aa diff -N patch-aa --- /dev/null Wed Jan 6 12:18:46 1999 +++ patch-aa Tue Dec 15 19:15:31 1998 @@ -0,0 +1,28 @@ +diff -urN src.orig/libXicq/Makefile src/libXicq/Makefile +--- src.orig/libXicq/Makefile Tue Dec 15 19:13:57 1998 ++++ src/libXicq/Makefile Tue Dec 15 19:14:51 1998 +@@ -1,8 +1,8 @@ + CC = g++ + SHELL = /bin/sh + INCLUDE = -I. +-CFLAGS = -g -Wall $(INCLUDE) +-CXXFLAGS= -g -Wall $(INCLUDE) ++CFLAGS = $(OPT) -g -Wall $(INCLUDE) ++CXXFLAGS= $(OPT) -g -Wall $(INCLUDE) + + OBJECTS = libXicq.o net.o misc.o parse.o packets.o ui2lib.o contact.o + +diff -urN src.orig/xicq/Makefile src/xicq/Makefile +--- src.orig/xicq/Makefile Tue Dec 15 19:13:59 1998 ++++ src/xicq/Makefile Tue Dec 15 19:15:08 1998 +@@ -1,8 +1,8 @@ + CC = g++ + SHELL = /bin/sh + INCLUDE = -I. -I../libXicq +-CXXFLAGS= -g -Wall $(INCLUDE) +-CFLAGS = -g -Wall $(INCLUDE) ++CXXFLAGS= $(OPT) -g -Wall $(INCLUDE) ++CFLAGS = $(OPT) -g -Wall $(INCLUDE) + LIBDIR = -L../libXicq + LIB = -lXicq + Index: patches/patch-af =================================================================== RCS file: /home/ncvs/ports/net/xicq/patches/patch-af,v retrieving revision 1.1 diff -u -r1.1 patch-af --- patch-af 1998/08/23 04:18:52 1.1 +++ patch-af 1998/12/15 16:33:56 @@ -1,8 +1,8 @@ ---- Makefile.o Sun Aug 23 01:05:29 1998 -+++ Makefile Sun Aug 23 01:05:34 1998 +--- Makefile.orig Tue Dec 15 18:33:35 1998 ++++ Makefile Tue Dec 15 18:33:42 1998 @@ -1,4 +1,4 @@ -all: lib xicq kxicq +all: lib xicq + lib: - @${MAKE} -C src/libXicq all - + @${MAKE} -C src/libXicq all >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message