Update to 1.2.0:

# 1.2.0

    * New algorithm added: Bidirectional Dijkstra's shortest path
    * A lot of bugfixes
    * Revised documentation

# 1.1.0

    * Returned to the libtool versioning style
    * New algorithms added
          o Dijkstra's shortest path
          o Bellman Ford shortest path
          o New variant of Maximal Flow
    * graph::load now creates nodes in the same order as they are in the gml file
    * graph::load now with parameter 'preserve_ids' to use the same ids as in the gml file
    * A lot of bugfixes
    * Documentation adapted to doxygen

# 1.0.0

    * First stable release
    * quick fix of bug in graph::del_node (thanks to David Auber)
    * bug fix in graph::hide_node (thanks to David Auber)
    * optimization of reallocation procedure in node_ and edge_maps (again, thanks to David)

6 files changed, 46 insertions, 135 deletions

diff --git a/devel/gtl/Makefile b/devel/gtl/Makefile
index 119133fa2e2..11f1d2fea9c 100644
--- a/devel/gtl/Makefile
+++ b/devel/gtl/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.16 2004/10/03 00:13:28 tv Exp $
+# $NetBSD: Makefile,v 1.17 2004/11/02 20:36:50 wiz Exp $
 
-DISTNAME=		GTL-0.3.3
-PKGNAME=		gtl-0.3.3
-PKGREVISION=		1
+DISTNAME=		GTL-1.2.0
+PKGNAME=		gtl-1.2.0
 CATEGORIES=		devel
-MASTER_SITES=		http://infosun.fmi.uni-passau.de/GTL/archive/
+MASTER_SITES=		http://infosun.fmi.uni-passau.de/GTL/download/
+EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.fmi.uni-passau.de/Graphlet/GTL/
@@ -14,26 +14,31 @@ USE_LIBTOOL=		# defined
 USE_BUILDLINK3=		yes
 USE_LANGUAGES=		c c++
 
-LICENSE=		no-commercial-use
+# previous version of the same
+CONFLICTS=		gtl0-[0-9]*
 
-.include "../../mk/bsd.prefs.mk"
+LICENSE=		no-commercial-use
 
 GNU_CONFIGURE=		# defined
-.if defined(CXXFLAGS)
 CONFIGURE_ENV+=		CXXFLAGS="${CXXFLAGS}"
-.endif
 
-GTL_VERS=		0:3
-MAKE_ENV+=		GTL_VERS="${GTL_VERS}"
+DOCDIR=		${PREFIX}/share/doc/GTL
 
-HTMLDOCDIR=		${PREFIX}/share/doc/html/GTL
+_FETCH_MESSAGE= \
+	${ECHO} "======================================================================"; \
+	${ECHO} ; \
+	${ECHO} " Follow the instructions at"; \
+	${ECHO} "	http://www.infosun.fmi.uni-passau.de/GTL/register.html"; \
+	${ECHO} " to download the distfile."; \
+	${ECHO} ; \
+	${ECHO} "======================================================================"
 
 post-install:
-	${INSTALL_DATA_DIR} ${HTMLDOCDIR}
-	${INSTALL_DATA_DIR} ${HTMLDOCDIR}/icons
-	cd ${WRKSRC}/doc/html; \
-		${INSTALL_DATA} *.html ${HTMLDOCDIR}
-	cd ${WRKSRC}/doc/html/icons; \
-		${INSTALL_DATA} *.gif *.jpeg ${HTMLDOCDIR}/icons
+	${INSTALL_DATA_DIR} ${DOCDIR}
+	${INSTALL_DATA_DIR} ${DOCDIR}/icons
+	cd ${WRKSRC}/doc; \
+		${INSTALL_DATA} *.html style.css ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/icons/*.jpeg ${DOCDIR}/icons
+	${INSTALL_DATA} ${WRKSRC}/doc/userguide/GTL.ps ${DOCDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gtl/PLIST b/devel/gtl/PLIST
index ef3752c3b9e..bf20dcaf991 100644
--- a/devel/gtl/PLIST
+++ b/devel/gtl/PLIST
@@ -1,11 +1,15 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:26 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/11/02 20:36:50 wiz Exp $
 include/GTL/GTL.h
 include/GTL/algorithm.h
+include/GTL/bellman_ford.h
 include/GTL/bfs.h
 include/GTL/biconnectivity.h
+include/GTL/bid_dijkstra.h
+include/GTL/bin_heap.h
 include/GTL/components.h
 include/GTL/debug.h
 include/GTL/dfs.h
+include/GTL/dijkstra.h
 include/GTL/edge.h
 include/GTL/edge_data.h
 include/GTL/edge_map.h
@@ -16,6 +20,8 @@ include/GTL/gml_scanner.h
 include/GTL/graph.h
 include/GTL/maxflow_ff.h
 include/GTL/maxflow_pp.h
+include/GTL/maxflow_sap.h
+include/GTL/min_tree.h
 include/GTL/ne_map.h
 include/GTL/node.h
 include/GTL/node_data.h
@@ -29,79 +35,15 @@ include/GTL/symlist.h
 include/GTL/topsort.h
 include/GTL/version.h
 lib/libGTL.la
-share/doc/html/GTL/GML_error.html
-share/doc/html/GTL/GTL-GTL-h.html
-share/doc/html/GTL/GTL-algorithm-h.html
-share/doc/html/GTL/GTL-bfs-h.html
-share/doc/html/GTL/GTL-biconnectivity-h.html
-share/doc/html/GTL/GTL-components-h.html
-share/doc/html/GTL/GTL-debug-h.html
-share/doc/html/GTL/GTL-dfs-h.html
-share/doc/html/GTL/GTL-edge-h.html
-share/doc/html/GTL/GTL-edge_data-h.html
-share/doc/html/GTL/GTL-edge_map-h.html
-share/doc/html/GTL/GTL-embedding-h.html
-share/doc/html/GTL/GTL-fm_partition-h.html
-share/doc/html/GTL/GTL-gml_parser-h.html
-share/doc/html/GTL/GTL-gml_scanner-h.html
-share/doc/html/GTL/GTL-graph-h.html
-share/doc/html/GTL/GTL-maxflow_ff-h.html
-share/doc/html/GTL/GTL-maxflow_pp-h.html
-share/doc/html/GTL/GTL-ne_map-h.html
-share/doc/html/GTL/GTL-node-h.html
-share/doc/html/GTL/GTL-node_data-h.html
-share/doc/html/GTL/GTL-node_map-h.html
-share/doc/html/GTL/GTL-planarity-h.html
-share/doc/html/GTL/GTL-pq_node-h.html
-share/doc/html/GTL/GTL-pq_tree-h.html
-share/doc/html/GTL/GTL-ratio_cut_partition-h.html
-share/doc/html/GTL/GTL-st_number-h.html
-share/doc/html/GTL/GTL-symlist-h.html
-share/doc/html/GTL/GTL-topsort-h.html
-share/doc/html/GTL/GTL-version-h.html
-share/doc/html/GTL/algorithm.html
-share/doc/html/GTL/bfs.html
-share/doc/html/GTL/biconnectivity.html
-share/doc/html/GTL/classes.html
-share/doc/html/GTL/components.html
-share/doc/html/GTL/dfs.html
-share/doc/html/GTL/doc000.html
-share/doc/html/GTL/doc001.html
-share/doc/html/GTL/doc002.html
-share/doc/html/GTL/doc003.html
-share/doc/html/GTL/doc004.html
-share/doc/html/GTL/doc005.html
-share/doc/html/GTL/doc006.html
-share/doc/html/GTL/doc007.html
-share/doc/html/GTL/edge.html
-share/doc/html/GTL/edge_map.html
-share/doc/html/GTL/fm_partition.html
-share/doc/html/GTL/graph.html
-share/doc/html/GTL/header-list.html
-share/doc/html/GTL/hier.html
-share/doc/html/GTL/icons/GTL-small.gif
-share/doc/html/GTL/icons/GTL.jpeg
-share/doc/html/GTL/icons/contents.gif
-share/doc/html/GTL/icons/next.gif
-share/doc/html/GTL/icons/next_gr.gif
-share/doc/html/GTL/icons/previous.gif
-share/doc/html/GTL/icons/previous_gr.gif
-share/doc/html/GTL/icons/up.gif
-share/doc/html/GTL/icons/up_gr.gif
-share/doc/html/GTL/index.html
-share/doc/html/GTL/maxflow_ff.html
-share/doc/html/GTL/maxflow_pp.html
-share/doc/html/GTL/ne_map.html
-share/doc/html/GTL/node.html
-share/doc/html/GTL/node_map.html
-share/doc/html/GTL/planar_embedding.html
-share/doc/html/GTL/planarity.html
-share/doc/html/GTL/pq_tree.html
-share/doc/html/GTL/ratio_cut_partition.html
-share/doc/html/GTL/refer.html
-share/doc/html/GTL/st_number.html
-share/doc/html/GTL/symlist.html
-share/doc/html/GTL/topsort.html
-@dirrm share/doc/html/GTL/icons
-@dirrm share/doc/html/GTL
+share/doc/GTL/GTL.ps
+share/doc/GTL/history.html
+share/doc/GTL/icons/GTL.jpeg
+share/doc/GTL/index.html
+share/doc/GTL/lists.html
+share/doc/GTL/platforms.html
+share/doc/GTL/refer.html
+share/doc/GTL/register.html
+share/doc/GTL/style.css
+@dirrm share/doc/GTL/icons
+@dirrm share/doc/GTL
 @dirrm include/GTL
diff --git a/devel/gtl/buildlink3.mk b/devel/gtl/buildlink3.mk
index 74be58c7dcb..2d64a5df0dd 100644
--- a/devel/gtl/buildlink3.mk
+++ b/devel/gtl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:28 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/11/02 20:36:50 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GTL_BUILDLINK3_MK:=	${GTL_BUILDLINK3_MK}+
@@ -11,8 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtl}
 BUILDLINK_PACKAGES+=	gtl
 
 .if !empty(GTL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtl+=	gtl>=0.3.3
-BUILDLINK_RECOMMENDED.gtl+=	gtl>=0.3.3nb1
+BUILDLINK_DEPENDS.gtl+=		gtl>=1.2.0
 BUILDLINK_PKGSRCDIR.gtl?=	../../devel/gtl
 .endif	# GTL_BUILDLINK3_MK
 
diff --git a/devel/gtl/distinfo b/devel/gtl/distinfo
index b0691838e93..d3ae7a7bf12 100644
--- a/devel/gtl/distinfo
+++ b/devel/gtl/distinfo
@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 00:44:22 wiz Exp $
+$NetBSD: distinfo,v 1.3 2004/11/02 20:36:50 wiz Exp $
 
-SHA1 (GTL-0.3.3.tar.gz) = 5cf7baab5ec299045fc9f8df455cb32be39cb736
-Size (GTL-0.3.3.tar.gz) = 469283 bytes
-SHA1 (patch-aa) = 131765fe15c7486260db302b69c8a2b5923ff6d4
-SHA1 (patch-ab) = db8612a600166c9962b3d6c219de54b9f9c16636
+SHA1 (GTL-1.2.0.tar.bz2) = 7d01a57539348e870fe5b8335475882d40b50322
+Size (GTL-1.2.0.tar.bz2) = 630054 bytes
diff --git a/devel/gtl/patches/patch-aa b/devel/gtl/patches/patch-aa
deleted file mode 100644
index 7d64e5e2fd3..00000000000
--- a/devel/gtl/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2000/07/13 15:10:35 jlam Exp $
-
---- src/Makefile.in.orig	Tue Mar  7 04:14:07 2000
-+++ src/Makefile.in	Tue May  9 11:46:57 2000
-@@ -92,7 +92,7 @@
- libGTL_la_SOURCES =          gml_scanner.cpp            gml_parser.cpp             edge.cpp                   graph.cpp                  node.cpp           	dfs.cpp 	   	biconnectivity.cpp 	bfs.cpp            	topsort.cpp        	st_number.cpp      	embedding.cpp	   	pq_node.cpp	   	pq_tree.cpp	   	planarity.cpp 	   	maxflow_ff.cpp     	maxflow_pp.cpp     	debug.cpp          	components.cpp     	fm_partition.cpp   	ratio_cut_partition.cpp 
- 
- 
--libGTL_la_LDFLAGS = -version-info $(MINOR_VERSION):$(MINI_VERSION):0
-+libGTL_la_LDFLAGS = -version-info $(GTL_VERS)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_CLEAN_FILES = 
- LTLIBRARIES =  $(lib_LTLIBRARIES)
diff --git a/devel/gtl/patches/patch-ab b/devel/gtl/patches/patch-ab
deleted file mode 100644
index ec6640b4afb..00000000000
--- a/devel/gtl/patches/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2000/07/31 04:53:56 jlam Exp $
-
---- include/GTL/GTL.h.orig	Thu Feb  3 07:50:16 2000
-+++ include/GTL/GTL.h	Mon Jul 31 00:30:39 2000
-@@ -133,6 +133,7 @@
- #include <map>
- #include <memory>
- 
-+#ifndef __STL_USE_STD_ALLOCATORS
- /**
-  * @internal
-  */
-@@ -141,6 +142,7 @@
- {
- };
- 
-+#endif
- #endif
- 
- //--------------------------------------------------------------------------