8 files changed, 98 insertions, 68 deletions

diff --git a/devel/terminality/Makefile b/devel/terminality/Makefile
index 1bbde2c90949..dbec2f858f8e 100644
--- a/devel/terminality/Makefile
+++ b/devel/terminality/Makefile
@@ -7,27 +7,20 @@
 #
 
 PORTNAME=	terminality
-PORTVERSION=	2.0
+PORTVERSION=	2.1
 CATEGORIES=	devel
-MASTER_SITES= 	http://members.optushome.com.au/darkmoon7/code/tn/
+MASTER_SITES= 	http://members.optushome.com.au/emikulic/code/tn/
 DISTNAME=	tn-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_REINPLACE=	yes
-USE_GMAKE=	yes
-MAKE_ENV=	CPP=${CXX} INSTALL="${INSTALL}" INSTALL_DATA="${INSTALL_DATA}"
-
-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
-
+do-install:
+	@${MKDIR} ${PREFIX}/include/tn
+	${INSTALL_DATA} ${WRKSRC}/*.h ${PREFIX}/include/tn
+	${INSTALL_DATA} ${WRKSRC}/libtn.a ${PREFIX}/lib
 .if !defined(NOPORTDOCS)
-post-install:
-	${MKDIR} ${DOCSDIR}
-	${CP} -R ${WRKSRC}/doc/ ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}/screenshot
+	${CP} -R ${WRKSRC}/doc/* ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/terminality/distinfo b/devel/terminality/distinfo
index 52fcb58f47e8..7688a6feb2cc 100644
--- a/devel/terminality/distinfo
+++ b/devel/terminality/distinfo
@@ -1 +1 @@
-MD5 (tn-2.0.tar.gz) = d4ff96bfadb4118225cb9f2da99eef82
+MD5 (tn-2.1.tar.gz) = 6fbb3e72f7dfed1550cf24913e1fc14d
diff --git a/devel/terminality/files/patch-Makefile b/devel/terminality/files/patch-Makefile
index a57aa617368c..91b0b51346d6 100644
--- a/devel/terminality/files/patch-Makefile
+++ b/devel/terminality/files/patch-Makefile
@@ -1,29 +1,34 @@
---- Makefile.orig	Sun Feb 18 13:48:12 2001
-+++ Makefile	Sun Apr 29 01:41:18 2001
-@@ -19,9 +19,7 @@
+--- 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 = -DUSE_NCURSES -g -I. -Wall
-+CFLAGS += -DUSE_NCURSES -I.
- LIBS = -lncurses
+-CFLAGS = -g -I. -Wall
++CFLAGS += -I.
++CXXFLAGS += -I.
  
  .SUFFIXES: .c .cpp .h
-@@ -83,13 +81,9 @@
- 
- # for G.Gabriele ;)
- install:
--	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
- 
- # $Log: Makefile,v $
- # Revision 1.24  2001/02/18 05:48:12  darkmoon
+ 
+@@ -23,16 +22,16 @@
+ 	ar cru libtn.a $(OBJS)
+ 
+ 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
diff --git a/devel/terminality/files/patch-demo::Makefile b/devel/terminality/files/patch-demo::Makefile
index 5c5dacbbab28..580ae732923b 100644
--- a/devel/terminality/files/patch-demo::Makefile
+++ b/devel/terminality/files/patch-demo::Makefile
@@ -1,22 +1,41 @@
---- demo/Makefile.orig	Sun Sep  9 21:00:39 2001
-+++ demo/Makefile	Sun Sep  9 21:01:09 2001
-@@ -21,9 +21,7 @@
+--- 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 -DUSE_NCURSES
-+CFLAGS += -I.. -Wall -DUSE_NCURSES
- LIBS = -lncurses ../libtn.a -lstdc++
+-CFLAGS = -g -I.. -Wall
+-LIBS = -lncurses ../libtn.a
++CFLAGS += -I..
++CXXFLAGS += -I..
++LIBS = -lm -lncurses ../libtn.a
  
  .SUFFIXES: .c .cpp .h
-@@ -34,7 +32,7 @@
- 	$(CC) -o demo $< $(CFLAGS) $(LIBS) -lstdc++
+ 
+ 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 $< precalc.o $(CFLAGS) $(LIBS) -lstdc++
-+	$(CPP) -o demo3d $< precalc.o $(CFLAGS) $(LIBS) -lstdc++
+-	$(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 $< precalc.o $(CFLAGS) $(LIBS)
+ 	$(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
diff --git a/devel/terminality/files/patch-demo::demo.cpp b/devel/terminality/files/patch-demo::demo.cpp
deleted file mode 100644
index 4f39dcf37788..000000000000
--- a/devel/terminality/files/patch-demo::demo.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- demo/demo.cpp.orig	Sun Sep  9 21:09:08 2001
-+++ demo/demo.cpp	Sun Sep  9 21:09:16 2001
-@@ -33,7 +33,6 @@
- #include <xmem.h>
- 
- #ifdef USE_NCURSES /* alias we're not under Windoze */
--#include <unistd.h>
- #endif
- 
- const char rcsid[] = "$Id: demo.cpp,v 1.17 2001/09/05 09:31:04 darkmoon Exp $";
diff --git a/devel/terminality/files/patch-dlgc::Makefile b/devel/terminality/files/patch-dlgc::Makefile
index ea45f416b8b5..2485a12bb077 100644
--- a/devel/terminality/files/patch-dlgc::Makefile
+++ b/devel/terminality/files/patch-dlgc::Makefile
@@ -1,13 +1,34 @@
---- dlgc/Makefile.orig	Sun Jan  7 17:53:21 2001
-+++ dlgc/Makefile	Sun Apr 29 00:13:09 2001
-@@ -4,9 +4,7 @@
+--- 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 -DUSE_NCURSES
-+CFLAGS += -I.. -DUSE_NCURSES
+-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
diff --git a/devel/terminality/pkg-descr b/devel/terminality/pkg-descr
index 4a274ae2bebe..3c1b9759f914 100644
--- a/devel/terminality/pkg-descr
+++ b/devel/terminality/pkg-descr
@@ -3,4 +3,4 @@ provides a set of functions which are used to manipulate a text terminal,
 functions such as clearing the screen, changing text colours, moving the
 cursor, etc.
 
-WWW: http://members.optushome.com.au/darkmoon7/code/tn/
+WWW: http://members.optushome.com.au/emikulic/code/tn/
diff --git a/devel/terminality/pkg-plist b/devel/terminality/pkg-plist
index cea30eb88c4c..1cfb93889787 100644
--- a/devel/terminality/pkg-plist
+++ b/devel/terminality/pkg-plist
@@ -8,10 +8,11 @@ include/tn/keyhndl.h
 include/tn/list.h
 include/tn/register.h
 include/tn/tn.h
-include/tn/tn_nc.h
-include/tn/tn_w32.h
+include/tn/tn_c_nc.h
+include/tn/tn_c_w32.h
+include/tn/tn_h_nc.h
+include/tn/tn_h_w32.h
 include/tn/xmem.h
-@dirrm include/tn
 %%PORTDOCS%%share/doc/terminality/curs1.c
 %%PORTDOCS%%share/doc/terminality/extra1.c
 %%PORTDOCS%%share/doc/terminality/extra2.c
@@ -30,3 +31,4 @@ include/tn/xmem.h
 %%PORTDOCS%%share/doc/terminality/tutor-tn.html
 %%PORTDOCS%%@dirrm share/doc/terminality/screenshot
 %%PORTDOCS%%@dirrm share/doc/terminality
+@dirrm include/tn