Bug 16307 - Updated patch-aa for misc/heyu port
Summary: Updated patch-aa for misc/heyu port
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: freebsd-ports (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2000-01-22 23:10 UTC by Paul M. Lambert
Modified: 2000-01-29 21:27 UTC (History)
0 users

See Also:


Attachments
file.diff (1.31 KB, patch)
2000-01-22 23:10 UTC, Paul M. Lambert
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Paul M. Lambert 2000-01-22 23:10:01 UTC
my misc/heyu port just plain didn't work.  :-(  it's fixed now!

Fix: heyu now respects the LOCKDIR setting in the Makefile, as well as the
global CFLAGS.  i hate makefiles.

this should replace ports/misc/heyu/patches/patch-aa:
How-To-Repeat: 
(cd /usr/ports/misc/heyu; make all install clean); /usr/local/bin/heyu
Comment 1 Paul M. Lambert 2000-01-23 08:44:05 UTC
Ugh.  On further consideration, please do not commit the new patch-aa
I sent.

Here's the whole port, done slightly better.  (I'm awaiting a response
from the developer regarding a source for the distfile.  Until then,
version upgrades will break the port.  I'll either mirror distfiles
with actual version numbers in the filenames, or he'll add them.  It's
up to him.  ;-)

Anyway, here's a new port, with updated checksum, patch-aa, and
Makefile:

# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	heyu
#	heyu/files
#	heyu/files/md5
#	heyu/patches
#	heyu/patches/patch-aa
#	heyu/Makefile
#	heyu/pkg
#	heyu/pkg/COMMENT
#	heyu/pkg/DESCR
#	heyu/pkg/PLIST
#	heyu/mf
#
echo c - heyu
mkdir -p heyu > /dev/null 2>&1
echo c - heyu/files
mkdir -p heyu/files > /dev/null 2>&1
echo x - heyu/files/md5
sed 's/^X//' >heyu/files/md5 << 'END-of-heyu/files/md5'
XMD5 (x10_heyu.tgz) = 16127c9f27c15d5b7ec847b962e2625b
END-of-heyu/files/md5
echo c - heyu/patches
mkdir -p heyu/patches > /dev/null 2>&1
echo x - heyu/patches/patch-aa
sed 's/^X//' >heyu/patches/patch-aa << 'END-of-heyu/patches/patch-aa'
X--- work/heyu.dir/Makefile	Thu Jan  6 23:47:16 2000
X+++ Makefile	Sun Jan 23 00:35:45 2000
X@@ -4,7 +4,7 @@
X MAN = /usr/local/man/man1
X MAN5 = /usr/local/man/man5
X GROUP = sys
X-OWNER = bin
X+OWNER = root
X 
X 
X #	set DFLAGS equal to:
X@@ -13,19 +13,19 @@
X #	   -DVOID	if compiler doesn't understand 'void'
X #	   -DMINIEXCH	if using the DEC mini-exchange
X 
X-CFLAGS = -O $(DFLAGS) -Wall
X+#CFLAGS = -O $(DFLAGS) -Wall
X #LDFLAGS = -z -i
X #LIBS = -lm -lc_s		# uncomment if using shared libraries
X LIBS = -lm -lc
X 
X ##  For LINUX, use the following defines in addition to what's above
X-DFLAGS = -DSYSV -DPOSIX -DHAS_ITIMER -DLINUX 
X+#DFLAGS = -DSYSV -DPOSIX -DHAS_ITIMER -DLINUX 
X 
X ##  For solaris, use the following defines in addition to what's above
X # DFLAGS = -DSYSV -DPOSIX -DSOLARIS -DLOCKDIR=\"/var/spool/locks\" -DHASSELECT
X 
X ## if you're using freebsd, just set the flag for select.
X-# DFLAGS= -DHASSELECT
X+DFLAGS= -DHASSELECT -DLOCKDIR=\"/var/tmp\"
X 
X ## If you aren't sure, try this
X #DFLAGS = -DSYSV -DPOSIX 
X@@ -54,9 +54,10 @@
X EVERYTHING = $(OTHERSRC) $(SRCS)
X 
X heyu:	$(OBJS) version.h
X-	cc $(LDFLAGS) -o heyu $(OBJS) $(LIBS)
X+	$(CC) $(CFLAGS) $(LDFLAGS) $(DFLAGS) -o heyu $(OBJS) $(LIBS)
X 
X $(OBJS): x10.h
X+	cc $(CFLAGS) $(DFLAGS) -c $<
X 
X eeprom.o:	eeprom.h
X 
END-of-heyu/patches/patch-aa
echo x - heyu/Makefile
sed 's/^X//' >heyu/Makefile << 'END-of-heyu/Makefile'
X# New ports collection makefile for:	heyu
X# Version required:	1.28h
X# Date created:		27 December 1999
X# Whom:			plambert@plambert.net
X#
X# $FreeBSD: ports/misc/heyu/Makefile,v 1.1.1.1 2000/01/05 13:30:34 jedgar Exp $
X#
X
XDISTNAME=	x10_heyu
XPKGNAME=	heyu-1.28f
XCATEGORIES=	misc
XMASTER_SITES=	http://www.prado.com/~dbs/
XEXTRACT_SUFX=	.tgz
X
XMAINTAINER=	plambert@plambert.net
X
XALL_TARGET=	heyu
XWRKSRC=		${WRKDIR}/heyu.dir
X
XMAN1=		heyu.1
XMAN5=		x10config.5 \
X		x10sched.5
X
Xdo-configure:
X	${PERL} -pi.orig -e 's|/usr/local|${PREFIX}|' ${WRKSRC}/Makefile
X
Xpost-install:
X	strip ${PREFIX}/bin/heyu
X.if !defined(NOPORTDOCS)
X	${MKDIR} ${PREFIX}/share/examples/heyu
X	${INSTALL_DATA} ${WRKSRC}/x10config ${PREFIX}/share/examples/heyu/x10config.sample
X	${INSTALL_DATA} ${WRKSRC}/x10sched.conf.sample ${PREFIX}/share/examples/heyu
X.endif
X
X.include <bsd.port.mk>
END-of-heyu/Makefile
echo c - heyu/pkg
mkdir -p heyu/pkg > /dev/null 2>&1
echo x - heyu/pkg/COMMENT
sed 's/^X//' >heyu/pkg/COMMENT << 'END-of-heyu/pkg/COMMENT'
XControl a CM11A interface from the command line
END-of-heyu/pkg/COMMENT
echo x - heyu/pkg/DESCR
sed 's/^X//' >heyu/pkg/DESCR << 'END-of-heyu/pkg/DESCR'
XThe CM11A is a device built by the X10 company for controlling
Xdevices by sending signals through the power lines. It's a small
Xbox that plugs into an AC outlet and connects to a serial port.
XThe CM11A is shipped with Windows software.  Heyu will control your
XX10 devices, set the cm11a interface clock and monitor x10 signals
Xon the AC power lines. It will upload macros and timers to your
XCM11A for stand-alone execution.
X
XWWW: http://www.prado.com/~dbs/
X
X- plambert
Xplambert@plambert.net
END-of-heyu/pkg/DESCR
echo x - heyu/pkg/PLIST
sed 's/^X//' >heyu/pkg/PLIST << 'END-of-heyu/pkg/PLIST'
Xbin/heyu
Xshare/examples/heyu/x10config
Xshare/examples/heyu/x10sched.conf.sample
X@dirrm share/examples/heyu
END-of-heyu/pkg/PLIST
echo x - heyu/mf
sed 's/^X//' >heyu/mf << 'END-of-heyu/mf'
X# Makefile for CM11, a program to control an X10 CM11A computer interface.
X# $Revision: 1.12 $
XBIN = /usr/local/bin
XMAN = /usr/local/man/man1
XMAN5 = /usr/local/man/man5
XGROUP = sys
XOWNER = wheel
X
X
X#	set DFLAGS equal to:
X#	   -DVENIX	if using VENIX
X#	   -DSYSV	if using SYSTEM V
X#	   -DVOID	if compiler doesn't understand 'void'
X#	   -DMINIEXCH	if using the DEC mini-exchange
X
X#CFLAGS = -O $(DFLAGS) -Wall
X#LDFLAGS = -z -i
X#LIBS = -lm -lc_s		# uncomment if using shared libraries
XLIBS = -lm -lc
X
X##  For LINUX, use the following defines in addition to what's above
X#DFLAGS = -DSYSV -DPOSIX -DHAS_ITIMER -DLINUX 
X
X##  For solaris, use the following defines in addition to what's above
X# DFLAGS = -DSYSV -DPOSIX -DSOLARIS -DLOCKDIR=\"/var/spool/locks\" -DHASSELECT
X
X## if you're using freebsd, just set the flag for select.
XDFLAGS= -DHASSELECT -DLOCKDIR=\"/var/tmp\"
X
X## If you aren't sure, try this
X#DFLAGS = -DSYSV -DPOSIX 
X
X## Use the following for nextstep 3.3 (uncomment the next 4 lines)
X#DFLAGS =  -DPOSIX
X#CFLAGS = -g $(DFLAGS) -posix
X#LDFLAGS = -posix
X#LIBS = -lm -lposix
X##end of nextstep
X
XSRCS =	date.c erase.c info.c  message.c relay.c \
X	monitor.c reset.c setclock.c stop.c \
X	tty.c turn.c x10.c xread.c xwrite.c status.c cm11a.c \
X	eeprom.c preset.c parse_sched.c
X
XOBJS =	date.o erase.o info.o message.o relay.o \
X	monitor.o reset.o setclock.o stop.o \
X	tty.o turn.o x10.o xread.o xwrite.o status.o cm11a.o \
X	eeprom.o preset.o parse_sched.o
X
XOTHERSRC = README Makefile x10config protocol.txt eeprom.h \
X	x10sched.conf.sample  monit x10biff heyu.1 x10.h x10config.5 \
X	history.txt version.h heyufaq.txt x10sched.5
X
XEVERYTHING = $(OTHERSRC) $(SRCS)
X
Xheyu:	$(OBJS) version.h
X	$(CC) $(CFLAGS) $(LDFLAGS) $(DFLAGS) -o heyu $(OBJS) $(LIBS)
X
X$(OBJS): x10.h
X	cc $(CFLAGS) $(DFLAGS) -c $<
X
Xeeprom.o:	eeprom.h
X
Xinstall: $(BIN)/heyu  $(MAN)/heyu.1 $(MAN5)/x10config.5 $(MAN5)/x10sched.5
X
Xuninstall:
X	rm -f $(BIN)/heyu
X	rm -f $(MAN)/heyu.1
X	rm -f $(MAN5)/x10config.5
X	rm -f $(MAN5)/x10sched.5
X
X$(BIN)/heyu:	heyu
X	cp heyu $(BIN)
X	chgrp $(GROUP) $(BIN)/heyu
X	chmod 755 $(BIN)/heyu
X	chown $(OWNER) $(BIN)/heyu
X
X$(MAN)/heyu.1: heyu.1
X	cp heyu.1 $(MAN)
X	chmod 644 $(MAN)/heyu.1
X
X$(MAN5)/x10config.5: x10config.5
X	cp x10config.5 $(MAN5)
X	chmod 644 $(MAN5)/x10config.5
X
X$(MAN5)/x10sched.5: x10sched.5
X	cp x10sched.5 $(MAN5)
X	chmod 644 $(MAN5)/x10sched.5
X
Xlint:
X	lint $(DFLAGS) $(SRCS)
X
Xshar:	x10_heyu.shar.1 x10_heyu.shar.2
X
Xx10.o:	x10.c version.h
X
Xci:	$(SRCS) index.htm Makefile
X	@ for FL in $+ ; do \
X	if test -w $$FL ; then \
X        ci -l $$FL ;\
X	fi ;\
X	done
X
Xx10_heyu.shar.1:
X	shar $(OTHERSRC) >x10_heyu.shar.1
X
Xx10_heyu.shar.2:
X	shar $(SRCS) > x10_heyu.shar.2
X
Xbigshar:
X	shar $(EVERYTHING) > x10_heyu.shar
X
Xtar:    x10_heyu.tgz
X
Xx10_heyu.tgz:	$(EVERYTHING)
X	rm -fr heyu.dir
X	mkdir heyu.dir
X	cp -p $(EVERYTHING) heyu.dir
X	tar -czvf x10_heyu.tgz heyu.dir
X
Xzip:	x10_heyu.zip
X
Xx10_heyu.zip:	$(EVERYTHING)
X	rm -f x10_heyu.zip
X	zip -kl x10_heyu.zip $(EVERYTHING)
X
Xtouch:
X	touch $(OTHERSRC)
X	touch $(SRCS)
X
Xclean:
X	rm -f *.o
X
Xclobber: clean
X	rm -f heyu
X
Xupload:	heyu index.htm x10_heyu.tgz x10_heyu.zip
X	/bin/sh -c ./upload.sh
X
Xrcsdiffrw:
X	@-for x in `$(MAKE) rw`	;\
X	do	\
X		echo 		;\
X		echo $$x	;\
X		echo =========	;\
X		rcsdiff $$x	;\
X	done 2>&1		;\
X	echo			;\
X	echo all done
X
Xlist:
X	@ls $(EVERYTHING) | more
X
Xrw:
X	@ls -l $(EVERYTHING) | \
X		egrep '^[^l].w' | \
X		sed 's;.* ;;'   # strip to last space
X
Xpopulate: $(EVERYTHING)
X
X$(EVERYTHING):
X	co -r$(revision) $@
X
END-of-heyu/mf
exit


-- 
I hate bombs, terrorism, fear, plans, future and past injustices, manifestos,
popular sentiment, ignition, timetables, meetings, and poorly adjusted
weasels.  A warm hello to my friends and fans in domestic surveillance!
Comment 2 Steve Price freebsd_committer freebsd_triage 2000-01-29 21:24:43 UTC
State Changed
From-To: open->closed

Update committed, thanks!