Attachment #24233 for bug #41500

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




#

PORTNAME=	terminality
PORTVERSION=	2.1
CATEGORIES=	devel
MASTER_SITES= 	http://members.optushome.com.au/emikulic/code/tn/
DISTNAME=	tn-${PORTVERSION}

MAINTAINER=	ports@FreeBSD.org

do-install:
	@${MKDIR} ${PREFIX}/include/tn
	${INSTALL_DATA} ${WRKSRC}/*.h ${PREFIX}/include/tn
	${INSTALL_DATA} ${WRKSRC}/libtn.a ${PREFIX}/lib
post-patch:
	@${FIND} ${WRKSRC} -name Makefile | ${XARGS} \
		${REINPLACE_CMD} -e "s, -lstdc\\+\\+,,g"
	@${REINPLACE_CMD} -e "s,make,gmake,g ; \
		s,/usr/local,${PREFIX},g" ${WRKSRC}/Makefile

.if !defined(NOPORTDOCS)
post-install:
	${MKDIR} ${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/doc/*.* ${DOCSDIR}
	${MKDIR} ${DOCSDIR}/screenshot
	${INSTALL_DATA} ${WRKSRC}/doc/screenshot/*.* ${DOCSDIR}/screenshot
.endif

.include <bsd.port.mk>

Line 1 Link Here

(-)devel/terminality/distinfo (-1 / +1 lines)
1	MD5 (tn-2.0.tar.gz) = d4ff96bfadb4118225cb9f2da99eef82	1	MD5 (tn-2.1.tar.gz) = 6fbb3e72f7dfed1550cf24913e1fc14d




--- Makefile.orig	Sat Jul 27 16:36:19 2002
+++ Makefile	Thu Aug  8 02:14:43 2002
@@ -6,9 +6,8 @@
 #
 # Makefile for the ncurses frontend of the library
 
-CC = gcc
-CPP = g++
-CFLAGS = -g -I. -Wall
+CFLAGS += -I.
+CXXFLAGS += -I.
 
 .SUFFIXES: .c .cpp .h
@@ -83,13 +81,9 @@
 
@@ -23,16 +22,16 @@
 	ar cru libtn.a $(OBJS)
-	install libtn.a -m 0644 /usr/local/lib
+	${INSTALL} libtn.a /usr/local/lib
 	install -m 0755 -d /usr/local/include/tn
-	install *.h -m 0644 /usr/local/include/tn
-	install -m 0755 -d /usr/local/doc/tn
-	install doc/tn/*.html -m 0644 /usr/local/doc/tn
-	install doc/tn/*.jpeg -m 0644 /usr/local/doc/tn
-	install doc/tn/*.css -m 0644 /usr/local/doc/tn
+	${INSTALL_DATA} *.h /usr/local/include/tn
 
 demo/demo: libtn.a demo/demo.cpp demo/myscheme.h
-	(cd demo && make)
+	(cd demo && ${MAKE})
 
 dlgc/dlgc: libtn.a dlgc/dlgc.cpp
-	(cd dlgc && make)
+	(cd dlgc && ${MAKE})
 
 .c.o:
 	$(CC) $(CFLAGS) -c $<
 
 .cpp.o:
-	$(CPP) $(CFLAGS) -c $<
+	$(CXX) $(CXXFLAGS) -c $<
 
 clean:
 	rm -f *~ *.o libtn.a core




--- demo/Makefile.orig	Fri Jul 26 20:54:10 2002
+++ demo/Makefile	Thu Aug  8 02:35:57 2002
@@ -8,23 +8,22 @@
 # Description: Terminality demos Makefile (Unix/ncurses)
 # Author: Emil Mikulic, Michal Safranek
 
-CC = gcc
-CPP = g++
-CFLAGS = -g -I.. -Wall
-LIBS = -lncurses ../libtn.a
+CFLAGS += -I..
+CXXFLAGS += -I..
+LIBS = -lm -lncurses ../libtn.a
 
 .SUFFIXES: .c .cpp .h
 
 all: demo demo3d demoansi
 
 ../libtn.a:
-	(cd .. && make libtn.a)
+	(cd .. && ${MAKE} libtn.a)
 
 demo: demo.o ../libtn.a Makefile
-	$(CC) -o demo demo.o $(CFLAGS) $(LIBS) -lstdc++
+	$(CXX) -o demo demo.o $(CXXFLAGS) $(LIBS)
 
 demo3d:	demo3d.o ../libtn.a precalc.o Makefile
-	$(CC) -o demo3d demo3d.o precalc.o $(CFLAGS) $(LIBS) -lstdc++
+	$(CC) -o demo3d demo3d.o precalc.o $(CFLAGS) $(LIBS)
 
 demoansi: demoansi.o ../libtn.a precalc.o Makefile
 	$(CC) -o demoansi demoansi.o precalc.o $(CFLAGS) $(LIBS)
@@ -34,7 +33,7 @@
 	$(CC) $(CFLAGS) -c $<
 
 .cpp.o:
-	$(CPP) $(CFLAGS) -c $<
+	$(CXX) $(CXXFLAGS) -c $<
 
 clean:
 	rm -f core *~ *.o demo demo3d demoansi precalc.dat

Lines 1-10 Link Here

(-)devel/terminality/files/patch-demo::demo.cpp (-10 lines)
1	--- demo/demo.cpp.orig Sun Sep 9 21:09:08 2001
2	+++ demo/demo.cpp Sun Sep 9 21:09:16 2001
3	@@ -33,7 +33,6 @@
4	#include <xmem.h>
5
6	#ifdef USE_NCURSES /* alias we're not under Windoze */
7	-#include <unistd.h>
8	#endif
9
10	const char rcsid[] = "$Id: demo.cpp,v 1.17 2001/09/05 09:31:04 darkmoon Exp $";




--- dlgc/Makefile.orig	Fri Jul 26 17:53:14 2002
+++ dlgc/Makefile	Thu Aug  8 02:08:37 2002
@@ -4,9 +4,8 @@
 # Description: DLGC Makefile
 # Author: Michal Safranek
 
-CC = gcc
-CPP = g++
-CFLAGS = -g -I.. -Wall
+CFLAGS += -I..
+CXXFLAGS += -I..
 LIBS = -lncurses ../libtn.a
 
 .SUFFIXES: .c .cpp .h
@@ -14,16 +13,16 @@
 all: dlgc
 
 ../libtn.a:
-	(cd .. && make libtn.a)
+	(cd .. && ${MAKE} libtn.a)
 
 dlgc: dlgc.o ../libtn.a
-	$(CC) -o dlgc dlgc.o $(CFLAGS) $(LIBS) -lstdc++
+	$(CXX) -o dlgc dlgc.o $(CXXFLAGS) $(LIBS)
 
 .c.o:
 	$(CC) $(CFLAGS) -c $<
 
 .cpp.o:
-	$(CPP) $(CFLAGS) -c $<
+	$(CXX) $(CXXFLAGS) -c $<
 
 clean:
 	rm -f core *~ *.o dlgc

Lines 3-6 Link Here

(-)devel/terminality/pkg-descr (-1 / +1 lines)
3	functions such as clearing the screen, changing text colours, moving the	3	functions such as clearing the screen, changing text colours, moving the
4	cursor, etc.	4	cursor, etc.
5		5
6	WWW: http://members.optushome.com.au/darkmoon7/code/tn/	6	WWW: http://members.optushome.com.au/emikulic/code/tn/

Lines 8-17 Link Here

(-)devel/terminality/pkg-plist (-3 / +5 lines)
8	include/tn/list.h	8	include/tn/list.h
9	include/tn/register.h	9	include/tn/register.h
10	include/tn/tn.h	10	include/tn/tn.h
11	include/tn/tn_nc.h	11	include/tn/tn_c_nc.h
12	include/tn/tn_w32.h	12	include/tn/tn_c_w32.h
		13	include/tn/tn_h_nc.h
		14	include/tn/tn_h_w32.h
13	include/tn/xmem.h	15	include/tn/xmem.h
14	@dirrm include/tn
15	%%PORTDOCS%%share/doc/terminality/curs1.c	16	%%PORTDOCS%%share/doc/terminality/curs1.c
16	%%PORTDOCS%%share/doc/terminality/extra1.c	17	%%PORTDOCS%%share/doc/terminality/extra1.c
17	%%PORTDOCS%%share/doc/terminality/extra2.c	18	%%PORTDOCS%%share/doc/terminality/extra2.c
Lines 30-32 Link Here
30	%%PORTDOCS%%share/doc/terminality/tutor-tn.html	31	%%PORTDOCS%%share/doc/terminality/tutor-tn.html
31	%%PORTDOCS%%@dirrm share/doc/terminality/screenshot	32	%%PORTDOCS%%@dirrm share/doc/terminality/screenshot
32	%%PORTDOCS%%@dirrm share/doc/terminality	33	%%PORTDOCS%%@dirrm share/doc/terminality
		34	@dirrm include/tn

Return to bug 41500

Lines 7-33 Link Here

(-)devel/terminality/Makefile (-14 / +9 lines)
7	#	7	#
8		8
9	PORTNAME= terminality	9	PORTNAME= terminality
10	PORTVERSION= 2.0	10	PORTVERSION= 2.1
11	CATEGORIES= devel	11	CATEGORIES= devel
12	MASTER_SITES= http://members.optushome.com.au/darkmoon7/code/tn/	12	MASTER_SITES= http://members.optushome.com.au/emikulic/code/tn/
13	DISTNAME= tn-${PORTVERSION}	13	DISTNAME= tn-${PORTVERSION}
14		14
15	MAINTAINER= ports@FreeBSD.org	15	MAINTAINER= ports@FreeBSD.org
16		16
17	USE_REINPLACE= yes	17	do-install:
18	USE_GMAKE= yes	18	@${MKDIR} ${PREFIX}/include/tn
19	MAKE_ENV= CPP=${CXX} INSTALL="${INSTALL}" INSTALL_DATA="${INSTALL_DATA}"	19	${INSTALL_DATA} ${WRKSRC}/*.h ${PREFIX}/include/tn
20		20	${INSTALL_DATA} ${WRKSRC}/libtn.a ${PREFIX}/lib
21	post-patch:
22	@${FIND} ${WRKSRC} -name Makefile \| ${XARGS} \
23	${REINPLACE_CMD} -e "s, -lstdc\\+\\+,,g"
24	@${REINPLACE_CMD} -e "s,make,gmake,g ; \
25	s,/usr/local,${PREFIX},g" ${WRKSRC}/Makefile
26
27	.if !defined(NOPORTDOCS)	21	.if !defined(NOPORTDOCS)
28	post-install:
29	${MKDIR} ${DOCSDIR}	22	${MKDIR} ${DOCSDIR}
30	${CP} -R ${WRKSRC}/doc/ ${DOCSDIR}	23	${INSTALL_DATA} ${WRKSRC}/doc/. ${DOCSDIR}
		24	${MKDIR} ${DOCSDIR}/screenshot
		25	${INSTALL_DATA} ${WRKSRC}/doc/screenshot/. ${DOCSDIR}/screenshot
31	.endif	26	.endif
32		27
33	.include <bsd.port.mk>	28	.include <bsd.port.mk>

Lines 1-29 Link Here

(-)devel/terminality/files/patch-Makefile (-20 / +25 lines)
1	--- Makefile.orig Sun Feb 18 13:48:12 2001	1	--- Makefile.orig Sat Jul 27 16:36:19 2002
2	+++ Makefile Sun Apr 29 01:41:18 2001	2	+++ Makefile Thu Aug 8 02:14:43 2002
3	@@ -19,9 +19,7 @@	3	@@ -6,9 +6,8 @@
4	#	4	#
5	# Makefile for the ncurses frontend of the library	5	# Makefile for the ncurses frontend of the library
6		6
7	-CC = gcc	7	-CC = gcc
8	-CPP = g++	8	-CPP = g++
9	-CFLAGS = -DUSE_NCURSES -g -I. -Wall	9	-CFLAGS = -g -I. -Wall
10	+CFLAGS += -DUSE_NCURSES -I.	10	+CFLAGS += -I.
11	LIBS = -lncurses	11	+CXXFLAGS += -I.
12		12
13	.SUFFIXES: .c .cpp .h	13	.SUFFIXES: .c .cpp .h
14	@@ -83,13 +81,9 @@
15		14
16	# for G.Gabriele ;)	15	@@ -23,16 +22,16 @@
17	install:	16	ar cru libtn.a $(OBJS)
18	- install libtn.a -m 0644 /usr/local/lib
19	+ ${INSTALL} libtn.a /usr/local/lib
20	install -m 0755 -d /usr/local/include/tn
21	- install *.h -m 0644 /usr/local/include/tn
22	- install -m 0755 -d /usr/local/doc/tn
23	- install doc/tn/*.html -m 0644 /usr/local/doc/tn
24	- install doc/tn/*.jpeg -m 0644 /usr/local/doc/tn
25	- install doc/tn/*.css -m 0644 /usr/local/doc/tn
26	+ ${INSTALL_DATA} *.h /usr/local/include/tn
27		17
28	# $Log: Makefile,v $	18	demo/demo: libtn.a demo/demo.cpp demo/myscheme.h
29	# Revision 1.24 2001/02/18 05:48:12 darkmoon	19	- (cd demo && make)
		20	+ (cd demo && ${MAKE})
		21
		22	dlgc/dlgc: libtn.a dlgc/dlgc.cpp
		23	- (cd dlgc && make)
		24	+ (cd dlgc && ${MAKE})
		25
		26	.c.o:
		27	$(CC) $(CFLAGS) -c $<
		28
		29	.cpp.o:
		30	- $(CPP) $(CFLAGS) -c $<
		31	+ $(CXX) $(CXXFLAGS) -c $<
		32
		33	clean:
		34	rm -f ~ .o libtn.a core

Lines 1-22 Link Here

(-)devel/terminality/files/patch-demo::Makefile (-11 / +30 lines)
1	--- demo/Makefile.orig Sun Sep 9 21:00:39 2001	1	--- demo/Makefile.orig Fri Jul 26 20:54:10 2002
2	+++ demo/Makefile Sun Sep 9 21:01:09 2001	2	+++ demo/Makefile Thu Aug 8 02:35:57 2002
3	@@ -21,9 +21,7 @@	3	@@ -8,23 +8,22 @@
4	# Description: Terminality demos Makefile (Unix/ncurses)	4	# Description: Terminality demos Makefile (Unix/ncurses)
5	# Author: Emil Mikulic, Michal Safranek	5	# Author: Emil Mikulic, Michal Safranek
6		6
7	-CC = gcc	7	-CC = gcc
8	-CPP = g++	8	-CPP = g++
9	-CFLAGS = -g -I.. -Wall -DUSE_NCURSES	9	-CFLAGS = -g -I.. -Wall
10	+CFLAGS += -I.. -Wall -DUSE_NCURSES	10	-LIBS = -lncurses ../libtn.a
11	LIBS = -lncurses ../libtn.a -lstdc++	11	+CFLAGS += -I..
		12	+CXXFLAGS += -I..
		13	+LIBS = -lm -lncurses ../libtn.a
12		14
13	.SUFFIXES: .c .cpp .h	15	.SUFFIXES: .c .cpp .h
14	@@ -34,7 +32,7 @@	16
15	$(CC) -o demo $< $(CFLAGS) $(LIBS) -lstdc++	17	all: demo demo3d demoansi
		18
		19	../libtn.a:
		20	- (cd .. && make libtn.a)
		21	+ (cd .. && ${MAKE} libtn.a)
		22
		23	demo: demo.o ../libtn.a Makefile
		24	- $(CC) -o demo demo.o $(CFLAGS) $(LIBS) -lstdc++
		25	+ $(CXX) -o demo demo.o $(CXXFLAGS) $(LIBS)
16		26
17	demo3d: demo3d.o ../libtn.a precalc.o Makefile	27	demo3d: demo3d.o ../libtn.a precalc.o Makefile
18	- $(CC) -o demo3d $< precalc.o $(CFLAGS) $(LIBS) -lstdc++	28	- $(CC) -o demo3d demo3d.o precalc.o $(CFLAGS) $(LIBS) -lstdc++
19	+ $(CPP) -o demo3d $< precalc.o $(CFLAGS) $(LIBS) -lstdc++	29	+ $(CC) -o demo3d demo3d.o precalc.o $(CFLAGS) $(LIBS)
20		30
21	demoansi: demoansi.o ../libtn.a precalc.o Makefile	31	demoansi: demoansi.o ../libtn.a precalc.o Makefile
22	$(CC) -o demoansi $< precalc.o $(CFLAGS) $(LIBS)	32	$(CC) -o demoansi demoansi.o precalc.o $(CFLAGS) $(LIBS)
		33	@@ -34,7 +33,7 @@
		34	$(CC) $(CFLAGS) -c $<
		35
		36	.cpp.o:
		37	- $(CPP) $(CFLAGS) -c $<
		38	+ $(CXX) $(CXXFLAGS) -c $<
		39
		40	clean:
		41	rm -f core ~ .o demo demo3d demoansi precalc.dat

Lines 1-13 Link Here

(-)devel/terminality/files/patch-dlgc::Makefile (-5 / +26 lines)
1	--- dlgc/Makefile.orig Sun Jan 7 17:53:21 2001	1	--- dlgc/Makefile.orig Fri Jul 26 17:53:14 2002
2	+++ dlgc/Makefile Sun Apr 29 00:13:09 2001	2	+++ dlgc/Makefile Thu Aug 8 02:08:37 2002
3	@@ -4,9 +4,7 @@	3	@@ -4,9 +4,8 @@
4	# Description: DLGC Makefile	4	# Description: DLGC Makefile
5	# Author: Michal Safranek	5	# Author: Michal Safranek
6		6
7	-CC = gcc	7	-CC = gcc
8	-CPP = g++	8	-CPP = g++
9	-CFLAGS = -g -I.. -Wall -DUSE_NCURSES	9	-CFLAGS = -g -I.. -Wall
10	+CFLAGS += -I.. -DUSE_NCURSES	10	+CFLAGS += -I..
		11	+CXXFLAGS += -I..
11	LIBS = -lncurses ../libtn.a	12	LIBS = -lncurses ../libtn.a
12		13
13	.SUFFIXES: .c .cpp .h	14	.SUFFIXES: .c .cpp .h
		15	@@ -14,16 +13,16 @@
		16	all: dlgc
		17
		18	../libtn.a:
		19	- (cd .. && make libtn.a)
		20	+ (cd .. && ${MAKE} libtn.a)
		21
		22	dlgc: dlgc.o ../libtn.a
		23	- $(CC) -o dlgc dlgc.o $(CFLAGS) $(LIBS) -lstdc++
		24	+ $(CXX) -o dlgc dlgc.o $(CXXFLAGS) $(LIBS)
		25
		26	.c.o:
		27	$(CC) $(CFLAGS) -c $<
		28
		29	.cpp.o:
		30	- $(CPP) $(CFLAGS) -c $<
		31	+ $(CXX) $(CXXFLAGS) -c $<
		32
		33	clean:
		34	rm -f core ~ .o dlgc