From owner-freebsd-ports Mon Jun 18 9:20:12 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 48D2D37B403 for ; Mon, 18 Jun 2001 09:20:06 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.3/8.11.3) id f5IGK6N71890; Mon, 18 Jun 2001 09:20:06 -0700 (PDT) (envelope-from gnats) Received: from slappy.plambert.net (slappy.plambert.net [167.216.255.198]) by hub.freebsd.org (Postfix) with ESMTP id BDCC037B406 for ; Mon, 18 Jun 2001 09:11:42 -0700 (PDT) (envelope-from plambert@slappy.plambert.net) Received: (from plambert@localhost) by slappy.plambert.net (8.11.3/8.11.3) id f5IGBgS37324; Mon, 18 Jun 2001 09:11:42 -0700 (PDT) (envelope-from plambert) Message-Id: <200106181611.f5IGBgS37324@slappy.plambert.net> Date: Mon, 18 Jun 2001 09:11:42 -0700 (PDT) From: "Paul M. Lambert" Reply-To: plambert@plambert.net To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/28261: Update patch for misc/heyu Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 28261 >Category: ports >Synopsis: Update patch for misc/heyu >Confidential: no >Severity: non-critical >Priority: high >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Jun 18 09:20:02 PDT 2001 >Closed-Date: >Last-Modified: >Originator: Paul M. Lambert >Release: FreeBSD 4.3-RC i386 >Organization: >Environment: System: FreeBSD slappy.plambert.net 4.3-RC FreeBSD 4.3-RC #1: Tue Apr 3 10:45:46 PDT 2001 root@slappy.plambert.net:/usr/obj/usr/src/sys/SLAPPY i386 >Description: The misc/heyu port is broken; "David W . Chapman Jr ." was kind enough to give me a patch which seems to work great. >How-To-Repeat: cd /usr/ports/misc/heyu; make all install >Fix: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/misc/heyu/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- Makefile 2001/03/10 04:33:07 1.6 +++ Makefile 2001/06/03 06:26:03 @@ -6,7 +6,7 @@ # PORTNAME= heyu -PORTVERSION= 1.31.3 +PORTVERSION= 1.33 CATEGORIES= misc MASTER_SITES= http://heyu.tanj.com/ DISTNAME= x10_heyu @@ -14,8 +14,6 @@ MAINTAINER= plambert@plambert.net -BROKEN= "Patches need to be upgraded." - ALL_TARGET= heyu WRKSRC= ${WRKDIR}/heyu.dir @@ -25,6 +23,9 @@ do-configure: ${PERL} -pi.orig -e 's|/usr/local|${PREFIX}|' ${WRKSRC}/Makefile + +pre-patch: + (cd ${WRKSRC} && ./Configure) post-install: strip ${PREFIX}/bin/heyu Index: distinfo =================================================================== RCS file: /home/ncvs/ports/misc/heyu/distinfo,v retrieving revision 1.7 diff -u -r1.7 distinfo --- distinfo 2001/03/10 04:33:07 1.7 +++ distinfo 2001/06/03 06:26:03 @@ -1 +1 @@ -MD5 (x10_heyu.tgz) = 3658c75cbcb32e9f924cf5cfa031fde4 +MD5 (x10_heyu.tgz) = a942f8ad37189317e6b119b1949de7c0 Index: files/patch-aa =================================================================== RCS file: /home/ncvs/ports/misc/heyu/files/patch-aa,v retrieving revision 1.3 diff -u -r1.3 patch-aa --- files/patch-aa 2000/05/28 03:26:24 1.3 +++ files/patch-aa 2001/06/03 06:26:03 @@ -1,42 +1,28 @@ ---- Makefile.orig Tue May 23 22:57:17 2000 -+++ Makefile Sat May 27 17:06:28 2000 -@@ -4,7 +4,7 @@ +--- Makefile.orig Sun Jun 3 01:19:23 2001 ++++ Makefile Sun Jun 3 01:20:28 2001 +@@ -5,7 +5,7 @@ MAN = /usr/local/man/man1 MAN5 = /usr/local/man/man5 GROUP = sys -OWNER = bin +OWNER = root + # set DFLAGS equal to: + # -DSYSV if using SYSTEM V +@@ -13,9 +13,9 @@ - # set DFLAGS equal to: -@@ -16,14 +16,14 @@ - #LDFLAGS = -z -i - #LIBS = -lm -lc_s # uncomment if using shared libraries + #This makefile is built for freebsd CC = gcc -CFLAGS = -g -O $(DFLAGS) -Wall +#CFLAGS = -g -O $(DFLAGS) -Wall LIBS = -lm -lc +-DFLAGS= -DHASSELECT -DNEEDGTIME -DFREEBSD ++DFLAGS= -DHASSELECT -DNEEDGTIME -DFREEBSD -DLOCKDIR=\"/var/tmp\" + # # The rest of the makefile should need no changes - ## For LINUX, use the following - #DFLAGS = -DSYSV -DPOSIX -DHAS_ITIMER -DLINUX - CC = gcc - CFLAGS = -g -O $(DFLAGS) -Wall --DFLAGS = -DSYSV -DPOSIX -DHAS_ITIMER -DLINUX -DHASSELECT -+#DFLAGS = -DSYSV -DPOSIX -DHAS_ITIMER -DLINUX -DHASSELECT - #LIBS = -lm -lc_s # uncomment if using shared libraries - LIBS = -lm -lc # uncoment if not using shared libraries - -@@ -39,7 +39,7 @@ - # CC = gcc - # CFLAGS = -g -O $(DFLAGS) -Wall - # LIBS = -lm -lc --# DFLAGS= -DHASSELECT -+DFLAGS= -DHASSELECT -DLOCKDIR=\"/var/tmp\" - - ## for Alpha, OSF1 v4.0 , Use this - # GROUP = uucp -@@ -80,9 +80,10 @@ - EVERYTHING = $(OTHERSRC) $(SRCS) + ## Makefile template for Heyu, a program to control an X10 CM11A computer +@@ -42,9 +42,10 @@ + all: heyu dawndusk heyu: $(OBJS) version.h - $(CC) $(LDFLAGS) -o heyu $(OBJS) $(LIBS) Index: files/patch-ab =================================================================== RCS file: /home/ncvs/ports/misc/heyu/files/patch-ab,v retrieving revision 1.1 diff -u -r1.1 patch-ab --- files/patch-ab 2000/05/28 03:26:24 1.1 +++ files/patch-ab 2001/06/03 06:26:03 @@ -1,11 +1,12 @@ ---- xwrite.c.orig Sat May 27 17:07:40 2000 -+++ xwrite.c Sat May 27 17:08:09 2000 -@@ -30,7 +30,7 @@ - #include - #include - #else --# ifndef POSIX -+# if !defined(POSIX) && !defined(__FreeBSD__) +--- xwrite.c.orig Sun Jun 3 01:13:55 2001 ++++ xwrite.c Sun Jun 3 01:16:43 2001 +@@ -42,7 +42,9 @@ + # ifdef SCO + #include + # else ++# if !defined(POSIX) && !defined(__FreeBSD__) #include - # else - #include ++# endif + # endif + # endif + #endif >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message