- Fix the build with contemporary GCC [1]

- Reorder Makefile slightly to pacify portlint(1)
- Convert pkg-message -> files/pkg-message.in

Reported by:	pointyhat (logs) [1]
Obtained from:	Debian [1]

4 files changed, 118 insertions, 14 deletions

diff --git a/graphics/tcm/Makefile b/graphics/tcm/Makefile
index 652ed348046a..42376a6004db 100644
--- a/graphics/tcm/Makefile
+++ b/graphics/tcm/Makefile
@@ -11,21 +11,23 @@ PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.cs.utwente.nl/pub/tcm/ \
 		ftp://ftp.cs.vu.nl/pub/tcm/
-PATCHFILES=	patch-tcm-64bit
+DISTNAME=	${PORTNAME}-${PORTVERSION}.src
+
 PATCH_SITES=	${MASTER_SITE_LOCAL}
 PATCH_SITE_SUBDIR=	lawrance
-DISTNAME=	${PORTNAME}-${PORTVERSION}.src
+PATCHFILES=	patch-tcm-64bit
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The Toolkit for Conceptual Modeling, create diagrams/tables/trees
 
 RUN_DEPENDS=	fig2dev:${PORTSDIR}/print/transfig
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-PKGMESSAGE=	${WRKSRC}/pkg-message
-USE_MOTIF=	yes
 USE_BISON=	yes
 USE_GMAKE=	yes
+USE_MOTIF=	yes
+
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+SUB_FILES+=	pkg-message
 
 MANPREFIX=	${TARGETDIR}/tcm
 MAN1=		psf.1 tatd.1 tcbd.1 tcm.1 tcmd.1 tcmdv.1 tcmt.1 tcpd.1 tcrd.1 \
@@ -38,10 +40,6 @@ post-patch:
 	@${CHMOD} 0644 ${WRKSRC}/lib/colorrgb.txt
 	@${REINPLACE_CMD} -e 's:gcc:g++:g' ${WRKSRC}/bin/makedepend.sh
 
-post-build:
-	@${CP} pkg-message ${PKGMESSAGE}
-	@${REINPLACE_CMD} -e 's:%%LOCALBASE%%:${PREFIX}:g' ${PKGMESSAGE}
-
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/graphics/tcm/files/patch-debian-gcc4 b/graphics/tcm/files/patch-debian-gcc4
new file mode 100644
index 000000000000..465412ab443e
--- /dev/null
+++ b/graphics/tcm/files/patch-debian-gcc4
@@ -0,0 +1,105 @@
+--- src/sd/dv/relationshipnode.h.orig
++++ src/sd/dv/relationshipnode.h
+@@ -26,6 +26,9 @@
+ class ERGraph;
+ 
+ /// relationship (ER) node class.
++
++int CompareComponent(string *c1, string *c2);
++
+ class RelationshipNode: public Node {
+ /*@Doc: {\large {\bf scope:} TERD} */
+ public:
+--- src/sd/bv/adsactivity.h.orig
++++ src/sd/bv/adsactivity.h
+@@ -23,7 +23,7 @@
+ 
+ #include "llist.h"
+ #include "lstring.h"
+-;
++
+ class ADSVar;
+ class OutputFile;
+ 
+--- src/sd/bv/bvinstances.h.orig
++++ src/sd/bv/bvinstances.h
+@@ -49,7 +49,7 @@
+ #include "../sd/bv/scdtransitionedge.h"
+ 
+ template class List<SCNode *>;
+-template class List <SCDTransitionEdge *>
++template class List <SCDTransitionEdge *>;
+ 
+ 
+ #ifdef MODELCHECK
+--- src/sd/bv/adshyperedge.c.orig
++++ src/sd/bv/adshyperedge.c
+@@ -33,7 +33,7 @@
+   cc=NULL;
+   edgelist.add(e);
+   sendevent=NULL;
+-};
++}
+ 
+ bool ADSHyperEdge::AddProp(Prop *p){
+   for (propl.first();!propl.done();propl.next()){
+--- src/tb/cellcolumn.h.orig
++++ src/tb/cellcolumn.h
+@@ -26,6 +26,9 @@
+ #include "tableviewer.h"
+ 
+ /// (table) column class.
++
++int Compare(CellColumn *c1, CellColumn *c2);
++
+ class CellColumn: public CellVector {	
+ /*@Doc: {\large {\bf scope:} table} */
+ public:
+--- src/tb/cellrow.h.orig
++++ src/tb/cellrow.h
+@@ -26,6 +26,9 @@
+ #include "tableviewer.h"
+ 
+ /// (table) row class.
++
++int Compare(CellRow *r1, CellRow *r2);
++
+ class CellRow: public CellVector {
+ /*@Doc: {\large {\bf scope:} table} */
+ public:
+--- src/tb/celltext.h.orig
++++ src/tb/celltext.h
+@@ -31,6 +31,10 @@
+ class OutputFile;
+ 
+ /// cell text class.
++
++class CellText;
++int Compare(CellText *r1, CellText *r2);
++
+ class CellText: public SimpleLabel {
+ /*@Doc: {\large {\bf scope:} table} */
+ public:
+--- src/tb/cellvector.h.orig
++++ src/tb/cellvector.h
+@@ -34,6 +34,10 @@
+ class OutputFile;
+ 
+ /// abstract base class of table rows and columns.
++
++class CellVector;
++int Compare(CellVector *c1, CellVector *c2);
++
+ class CellVector {
+ /*@Doc: {\large {\bf scope:} table} */
+ public:
+--- src/ui/application.h.orig
++++ src/ui/application.h
+@@ -28,6 +28,7 @@
+ class PrinterOptions;
+ class Color;
+ class Config;
++class MainWindow;
+ 
+ /// generic window-based application class. See: MWidget.
+ class Application: public MWidget {
diff --git a/graphics/tcm/files/pkg-message.in b/graphics/tcm/files/pkg-message.in
new file mode 100644
index 000000000000..79509ad5f903
--- /dev/null
+++ b/graphics/tcm/files/pkg-message.in
@@ -0,0 +1,6 @@
+==================================================================
+You need to set the environment variable TCM_HOME to
+%%PREFIX%%/tcm for tcm to be able to start.
+
+You may also want to add %%PREFIX%%/tcm/man in your manpath.config.
+==================================================================
diff --git a/graphics/tcm/pkg-message b/graphics/tcm/pkg-message
deleted file mode 100644
index b9773a0c4bdb..000000000000
--- a/graphics/tcm/pkg-message
+++ /dev/null
@@ -1,5 +0,0 @@
-==================================================================
-You need to set the environment variable TCM_HOME to 
-%%LOCALBASE%%/tcm for tcm to be able to start. You may also want to
-add %%LOCALBASE%%/tcm/man in your manpath.config.
-==================================================================