4 files changed, 94 insertions, 14 deletions

diff --git a/sysutils/ttyload/Makefile b/sysutils/ttyload/Makefile
index 7b45e1bf2873..806502b6b334 100644
--- a/sysutils/ttyload/Makefile
+++ b/sysutils/ttyload/Makefile
@@ -6,22 +6,29 @@
 # $FreeBSD$
 
 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@FreeBSD.org
+MAINTAINER=	adox@mcx2.org
 COMMENT=	Give a color-coded graph of load averages over time
 
-PLIST_FILES=	bin/ttyload
 ALL_TARGET=	default
 
-post-patch:
-	@${REINPLACE_CMD} -e "s,^CC,#CC,g ; \
-		s,^DEBUG,#DEBUG,g ; \
-		s,^CFLAGS\t=,CFLAGS+=,g" ${WRKSRC}/Makefile
+PLIST_FILES=	bin/ttyload
+PORTDOCS=	*
+
+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
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/ttyload ${PREFIX}/bin
+	@${ECHO_MSG} ""
+	@${CAT} ${PKGMESSAGE}
+	@${ECHO_MSG} ""
 
-.include	<bsd.port.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/ttyload/distinfo b/sysutils/ttyload/distinfo
index 915517d5d97a..0d71da7e4d8c 100644
--- a/sysutils/ttyload/distinfo
+++ b/sysutils/ttyload/distinfo
@@ -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 --git a/sysutils/ttyload/files/patch-Makefile b/sysutils/ttyload/files/patch-Makefile
new file mode 100644
index 000000000000..95c0d6fb0ab0
--- /dev/null
+++ b/sysutils/ttyload/files/patch-Makefile
@@ -0,0 +1,65 @@
+--- Makefile.orig	2005-09-09 23:52:11.000000000 +0400
++++ Makefile	2008-10-11 18:04:07.000000000 +0400
+@@ -4,21 +4,18 @@
+ 
+ # 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...
+-CC=gcc -pedantic -Wall
+-
+ # 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 +23,7 @@
+ 
+ VERSION	= -DVERSION='"'`cat Version`'"'
+ 
+-CFLAGS	= $(INCLUDES) $(OTHER_FLAGS) $(DEBUG) $(VERSION)
++CFLAGS+= $(INCLUDES) $(OTHER_FLAGS) $(DEBUG) $(VERSION) -pedantic -Wall
+ 
+ # most people won't want loader, so don't bother building it:
+ # PROGRAMS =	archbuild loader
+@@ -57,12 +54,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 +79,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 --git a/sysutils/ttyload/pkg-message b/sysutils/ttyload/pkg-message
new file mode 100644
index 000000000000..b05fb29982ed
--- /dev/null
+++ b/sysutils/ttyload/pkg-message
@@ -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/
+###########################################################################