Attachment #90303 for bug #127454

View | Details | Raw Unified | Return to bug 127454
Collapse All | Expand All




# $FreeBSD: ports/sysutils/ttyload/Makefile,v 1.7 2006/05/13 04:15:48 edwin Exp $

PORTNAME=	ttyload
PORTVERSION=	0.5
CATEGORIES=	sysutils
MASTER_SITES=	http://www.daveltd.com/src/util/ttyload/ \
		http://mirror.mcx2.org/

MAINTAINER=	adox@mcx2.org
COMMENT=	Give a color-coded graph of load averages over time

#.include <bsd.port.pre.mk>
ALL_TARGET=	default

PLIST_FILES=	bin/ttyload \
		%%DOCSDIR%%/README \
		%%DOCSDIR%%/LICENSE
PLIST_DIRS=	%%DOCSDIR%%
ALL_TARGET=	default

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>

Lines 1-3 Link Here

(-)ttyload/distinfo (-3 / +3 lines)
1	MD5 (ttyload-0.4.4.tar.gz) = f331a7aa48f62cc1ff4d53d16b1fe032	1	MD5 (ttyload-0.5.tar.gz) = b7f81a7f7c7069d76884e1f7c67e478b
2	SHA256 (ttyload-0.4.4.tar.gz) = 0d68c41416188383745b6eca81b68edc6cdc7fb422ec17cd6fd1a4100df3a2c7	2	SHA256 (ttyload-0.5.tar.gz) = d068b61155b81e6982f6886a67f51bd4357eed84853afc5367e43887cc7f5f53
3	SIZE (ttyload-0.4.4.tar.gz) = 12950	3	SIZE (ttyload-0.5.tar.gz) = 14681




--- 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

Line 0 Link Here

(-)ttyload/pkg-message (+8 lines)
	1	###########################################################################
	2	ttyload has been installed.
	3
	4	If you have questions read %%DOCSDIR%%/README
	5
	6	For more information about ttyload visit:
	7	http://www.daveltd.com/src/util/ttyload/
	8	###########################################################################

Return to bug 127454

Lines 6-27 Link Here

(-)ttyload/Makefile (-11 / +21 lines)
6	# $FreeBSD: ports/sysutils/ttyload/Makefile,v 1.7 2006/05/13 04:15:48 edwin Exp $	6	# $FreeBSD: ports/sysutils/ttyload/Makefile,v 1.7 2006/05/13 04:15:48 edwin Exp $
7		7
8	PORTNAME= ttyload	8	PORTNAME= ttyload
9	PORTVERSION= 0.4.4	9	PORTVERSION= 0.5
10	CATEGORIES= sysutils	10	CATEGORIES= sysutils
11	MASTER_SITES= http://www.daveltd.com/src/util/ttyload/	11	MASTER_SITES= http://www.daveltd.com/src/util/ttyload/ \
		12	http://mirror.mcx2.org/
12		13
13	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= adox@mcx2.org
14	COMMENT= Give a color-coded graph of load averages over time	15	COMMENT= Give a color-coded graph of load averages over time
15		16
16	PLIST_FILES= bin/ttyload	17	#.include <bsd.port.pre.mk>
17	ALL_TARGET= default
18		18
19	post-patch:	19	PLIST_FILES= bin/ttyload \
20	@${REINPLACE_CMD} -e "s,^CC,#CC,g ; \	20	%%DOCSDIR%%/README \
21	s,^DEBUG,#DEBUG,g ; \	21	%%DOCSDIR%%/LICENSE
22	s,^CFLAGS\t=,CFLAGS+=,g" ${WRKSRC}/Makefile	22	PLIST_DIRS= %%DOCSDIR%%
		23	ALL_TARGET= default
23		24
24	do-install:	25	post-install:
25	${INSTALL_PROGRAM} ${WRKSRC}/ttyload ${PREFIX}/bin	26	.if !defined(NOPORTDOCS)
		27	@${ECHO_MSG} "Installing additional documentation to ${DOCSDIR}"
		28	@${MKDIR} ${DOCSDIR}
		29	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/README
		30	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR}/LICENSE
		31	.endif
		32
		33	@${ECHO_MSG} ""
		34	@${CAT} ${PKGMESSAGE}
		35	@${ECHO_MSG} ""
26		36
27	.include <bsd.port.mk>	37	.include <bsd.port.mk>

Line 0 Link Here

(-)ttyload/files/patch-Makefile (+65 lines)
		1	--- Makefile.orig 2005-09-09 21:52:11.000000000 +0200
		2	+++ Makefile 2008-09-17 22:28:53.000000000 +0200
		3	@@ -4,13 +4,13 @@
		4
		5	# change this if you want to use 'make install' and have it go
		6	# somewhere else:
		7	-INSTALLDIR = /usr/local/bin
		8	+PREFIX?= /usr/local
		9
		10	-ARCH = `uname -s \| sed -e 's/ /-/g'`
		11	+OS = `uname -s \| sed -e 's/ /-/g'`
		12	LDFLAGS = `./ldflags`
		13
		14	-OBJS = arch/${ARCH}/getload.o \
		15	- arch/${ARCH}/terminfo.o \
		16	+OBJS = arch/${OS}/getload.o \
		17	+ arch/${OS}/terminfo.o \
		18	${NULL}
		19
		20	# this is what I use most places...
		21	@@ -18,7 +18,7 @@
		22
		23	# for the things in the sub-directory:
		24	INCLUDES = -I$${PWD:-.} \
		25	- -I$${PWD:-.}/arch/${ARCH} \
		26	+ -I$${PWD:-.}/arch/${OS} \
		27	-I$${PWD:-.}/arch/default
		28
		29	# Debugging compiles?
		30	@@ -26,7 +26,7 @@
		31
		32	VERSION = -DVERSION='"'`cat Version`'"'
		33
		34	-CFLAGS = $(INCLUDES) $(OTHER_FLAGS) $(DEBUG) $(VERSION)
		35	+CFLAGS+= $(INCLUDES) $(OTHER_FLAGS) $(DEBUG) $(VERSION)
		36
		37	# most people won't want loader, so don't bother building it:
		38	# PROGRAMS = archbuild loader
		39	@@ -57,12 +57,12 @@
		40	ln -s FreeBSD $@
		41
		42	$(ARCHLINKS_THISARCH):
		43	- ln -s ${ARCH} $@
		44	+ ln -s ${OS} $@
		45
		46	archlinks: $(ARCHLINKS)
		47
		48	archbuild: archlinks
		49	- make archtest ttyload ARCH=$(ARCH)
		50	+ make archtest ttyload OS=$(OS)
		51
		52	ttyload.c: ttyload.h Version
		53	touch ttyload.c
		54	@@ -82,7 +82,10 @@
		55
		56	# install, gently. not much to it:
		57	install: $(PROGRAMS)
		58	- /bin/cp ttyload ${INSTALLDIR}/ttyload
		59	+ install -m 755 ttyload ${PREFIX}/bin/
		60	+
		61	+deinstall:
		62	+ rm -f ${PREFIX}/bin/ttyload
		63
		64	# because different systems' make have different behaviors on how they
65	# deal with building stuff in subdirectories, and because I don't feel