ports/127454: [PATCH] Update ttyload

[Dennis Herrmann]

>Number:         127454
>Category:       ports
>Synopsis:       [PATCH] Update ttyload
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Sep 17 22:10:02 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Dennis Herrmann
>Release:        FreeBSD 7.1-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD contempt 7.1-PRERELEASE FreeBSD 7.1-PRERELEASE #2: Sun Sep 14 08:19:18 CEST 2008 root at contempt:/usr/obj/usr/src/sys/CONTEMPT i386

>Description:
I update this port and add my mail to MAINTAINER.

>How-To-Repeat:
>Fix:

--- ttyload.diff begins here ---
diff -ruN ttyload.orig/Makefile ttyload/Makefile
--- ttyload.orig/Makefile	2008-09-17 23:07:29.000000000 +0200
+++ ttyload/Makefile	2008-09-17 23:05:28.000000000 +0200
@@ -6,22 +6,32 @@
 # $FreeBSD: ports/sysutils/ttyload/Makefile,v 1.7 2006/05/13 04:15:48 edwin Exp $
 
 PORTNAME=	ttyload
-PORTVERSION=	0.4.4
+PORTVERSION=	0.5
 CATEGORIES=	sysutils
-MASTER_SITES=	http://www.daveltd.com/src/util/ttyload/
+MASTER_SITES=	http://www.daveltd.com/src/util/ttyload/ \
+		http://mirror.mcx2.org/
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	adox at mcx2.org
 COMMENT=	Give a color-coded graph of load averages over time
 
-PLIST_FILES=	bin/ttyload
-ALL_TARGET=	default
+#.include <bsd.port.pre.mk>
 
-post-patch:
-	@${REINPLACE_CMD} -e "s,^CC,#CC,g ; \
-		s,^DEBUG,#DEBUG,g ; \
-		s,^CFLAGS\t=,CFLAGS+=,g" ${WRKSRC}/Makefile
+PLIST_FILES=	bin/ttyload \
+		%%DOCSDIR%%/README \
+		%%DOCSDIR%%/LICENSE
+PLIST_DIRS=	%%DOCSDIR%%
+ALL_TARGET=	default
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/ttyload ${PREFIX}/bin
+post-install:
+.if !defined(NOPORTDOCS)
+	@${ECHO_MSG} "Installing additional documentation to ${DOCSDIR}"
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/README
+	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR}/LICENSE
+.endif
+
+	@${ECHO_MSG} ""
+	@${CAT} ${PKGMESSAGE}
+	@${ECHO_MSG} ""
 
 .include	<bsd.port.mk>
diff -ruN ttyload.orig/distinfo ttyload/distinfo
--- ttyload.orig/distinfo	2008-09-17 23:07:29.000000000 +0200
+++ ttyload/distinfo	2008-09-17 22:02:06.000000000 +0200
@@ -1,3 +1,3 @@
-MD5 (ttyload-0.4.4.tar.gz) = f331a7aa48f62cc1ff4d53d16b1fe032
-SHA256 (ttyload-0.4.4.tar.gz) = 0d68c41416188383745b6eca81b68edc6cdc7fb422ec17cd6fd1a4100df3a2c7
-SIZE (ttyload-0.4.4.tar.gz) = 12950
+MD5 (ttyload-0.5.tar.gz) = b7f81a7f7c7069d76884e1f7c67e478b
+SHA256 (ttyload-0.5.tar.gz) = d068b61155b81e6982f6886a67f51bd4357eed84853afc5367e43887cc7f5f53
+SIZE (ttyload-0.5.tar.gz) = 14681
diff -ruN ttyload.orig/files/patch-Makefile ttyload/files/patch-Makefile
--- ttyload.orig/files/patch-Makefile	1970-01-01 01:00:00.000000000 +0100
+++ ttyload/files/patch-Makefile	2008-09-17 22:28:56.000000000 +0200
@@ -0,0 +1,65 @@
+--- Makefile.orig	2005-09-09 21:52:11.000000000 +0200
++++ Makefile	2008-09-17 22:28:53.000000000 +0200
+@@ -4,13 +4,13 @@
+ 
+ # change this if you want to use 'make install' and have it go
+ # somewhere else:
+-INSTALLDIR	= /usr/local/bin
++PREFIX?= /usr/local
+ 
+-ARCH	= `uname -s | sed -e 's/ /-/g'`
++OS	= `uname -s | sed -e 's/ /-/g'`
+ LDFLAGS	= `./ldflags`
+ 
+-OBJS	=	arch/${ARCH}/getload.o	\
+-		arch/${ARCH}/terminfo.o	\
++OBJS	=	arch/${OS}/getload.o	\
++		arch/${OS}/terminfo.o	\
+ 		${NULL}
+ 
+ # this is what I use most places...
+@@ -18,7 +18,7 @@
+ 
+ # for the things in the sub-directory:
+ INCLUDES	=	-I$${PWD:-.} \
+-			-I$${PWD:-.}/arch/${ARCH} \
++			-I$${PWD:-.}/arch/${OS} \
+ 			-I$${PWD:-.}/arch/default
+ 
+ # Debugging compiles?
+@@ -26,7 +26,7 @@
+ 
+ VERSION	= -DVERSION='"'`cat Version`'"'
+ 
+-CFLAGS	= $(INCLUDES) $(OTHER_FLAGS) $(DEBUG) $(VERSION)
++CFLAGS+= $(INCLUDES) $(OTHER_FLAGS) $(DEBUG) $(VERSION)
+ 
+ # most people won't want loader, so don't bother building it:
+ # PROGRAMS =	archbuild loader
+@@ -57,12 +57,12 @@
+ 	ln -s FreeBSD $@
+ 
+ $(ARCHLINKS_THISARCH):
+-	ln -s ${ARCH} $@
++	ln -s ${OS} $@
+ 
+ archlinks: $(ARCHLINKS)
+ 
+ archbuild: archlinks
+-	make archtest ttyload ARCH=$(ARCH)
++	make archtest ttyload OS=$(OS)
+ 
+ ttyload.c:	ttyload.h Version
+ 	touch ttyload.c
+@@ -82,7 +82,10 @@
+ 
+ # install, gently.  not much to it:
+ install:	$(PROGRAMS)
+-	/bin/cp ttyload ${INSTALLDIR}/ttyload
++	install -m 755 ttyload ${PREFIX}/bin/
++
++deinstall:
++	rm -f ${PREFIX}/bin/ttyload
+ 
+ # because different systems' make have different behaviors on how they
+ # deal with building stuff in subdirectories, and because I don't feel
diff -ruN ttyload.orig/pkg-message ttyload/pkg-message
--- ttyload.orig/pkg-message	1970-01-01 01:00:00.000000000 +0100
+++ ttyload/pkg-message	2008-09-17 22:43:17.000000000 +0200
@@ -0,0 +1,8 @@
+###########################################################################
+ttyload has been installed.
+
+If you have questions read %%DOCSDIR%%/README
+
+For more information about ttyload visit:
+http://www.daveltd.com/src/util/ttyload/
+###########################################################################
--- ttyload.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: