7 files changed, 8 insertions, 133 deletions

diff --git a/UPDATING b/UPDATING
index 8a0560cb919d..d36d559b9962 100644
--- a/UPDATING
+++ b/UPDATING
@@ -9,6 +9,13 @@ upgrades.
 
 
 20060828:
+  AFFECTS: users of devel/gpc
+  AUTHOR: mi+mx@aldan.algebra.com
+
+  devel/gpc port directory was renamed to devel/libgpc to avoid conflicting
+  with lang/gpc.
+
+20060828:
   AFFECTS: users of games/warzone2100
   AUTHOR: alepulver@FreeBSD.org
 
diff --git a/devel/Makefile b/devel/Makefile
index 720726c4a9c7..039d08a7415c 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -368,7 +368,6 @@
     SUBDIR += gonzui
     SUBDIR += google-sparsehash
     SUBDIR += gorm
-    SUBDIR += gpc
     SUBDIR += gperf
     SUBDIR += gpsim
     SUBDIR += gputils
@@ -527,6 +526,7 @@
     SUBDIR += libglademm
     SUBDIR += libglademm24
     SUBDIR += libgnugetopt
+    SUBDIR += libgpc
     SUBDIR += libgsf
     SUBDIR += libgsf-gnome
     SUBDIR += libgtop
diff --git a/devel/gpc/Makefile b/devel/gpc/Makefile
deleted file mode 100644
index 47230fae338a..000000000000
--- a/devel/gpc/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# New ports collection makefile for:	gpc
-# Date created:		22 October 2005
-# Whom:			Mikhail Teterin
-#
-# $FreeBSD$
-#
-
-PORTNAME=	libgpc
-PORTVERSION=	2.32
-CATEGORIES=	devel math graphics
-MASTER_SITES=	ftp://ftp.cs.man.ac.uk/pub/toby/gpc/
-DISTNAME=	gpc${PORTVERSION:S/.//}
-
-MAINTAINER=	mi@aldan.algebra.com
-COMMENT=	Generic Polygon Clipper
-
-USE_ZIP=	yes
-PLIST_FILES=	lib/libgpc.so.${PORTVERSION}	\
-		lib/libgpc.so	lib/libgpc.a	\
-		include/gpc.h
-INSTALLS_SHLIB=	yes
-NO_CDROM=	Can't be used for profit without permission
-
-MAKEFILE=	${FILESDIR}/BSDmakefile
-
-EXTRACT_BEFORE_ARGS=-qoa
-
-.include <bsd.port.mk>
diff --git a/devel/gpc/distinfo b/devel/gpc/distinfo
deleted file mode 100644
index ed13041722bc..000000000000
--- a/devel/gpc/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gpc232.zip) = e8ede167d810f26cf01f760a8824e2c9
-SHA256 (gpc232.zip) = a481e94f55f2ad1bb4d4764c69d273b08c42e500ba2201ab8157204354dcea60
-SIZE (gpc232.zip) = 15606
diff --git a/devel/gpc/files/BSDmakefile b/devel/gpc/files/BSDmakefile
deleted file mode 100644
index bdbe36692b60..000000000000
--- a/devel/gpc/files/BSDmakefile
+++ /dev/null
@@ -1,14 +0,0 @@
-LIB=		gpc
-NO_PROFILE=	yes
-NOPROFILE=	yes
-SHLIB_MAJOR=	2
-SHLIB_MINOR=	32
-
-SRCS=		gpc.c
-INCS=		gpc.h
-
-LIBDIR=		${PREFIX}/lib
-INCSDIR=	${PREFIX}/include
-WARNS?=		4 # level 5 trips over '-Wunused'
-
-.include <bsd.lib.mk>
diff --git a/devel/gpc/files/patch-alloca b/devel/gpc/files/patch-alloca
deleted file mode 100644
index 6b45ec7a48db..000000000000
--- a/devel/gpc/files/patch-alloca
+++ /dev/null
@@ -1,65 +0,0 @@
-Use alloca() instead of malloc()/free(), where it is easy to do.
-
-Use BSD's err() instead of fprintf()/exit() on fatal failures.
-
-When so exiting, use non-zero code to signal a failure.
-
-	-mi
-
---- gpc.c	Fri Dec 17 10:39:26 2004
-+++ gpc.c	Sat Oct 22 04:04:31 2005
-@@ -39,4 +39,5 @@ Copyright: (C) 1997-2004, Advanced Inter
- 
- #include "gpc.h"
-+#include <err.h>
- #include <stdlib.h>
- #include <float.h>
-@@ -104,6 +105,6 @@ Copyright: (C) 1997-2004, Advanced Inter
- #define MALLOC(p, b, s, t) {if ((b) > 0) { \
-                             p= (t*)malloc(b); if (!(p)) { \
--                            fprintf(stderr, "gpc malloc failure: %s\n", s); \
--                            exit(0);}} else p= NULL;}
-+                            err(1, "gpc: %s needed %zd bytes\n", s, \
-+                            (size_t)b); }} else p= NULL;}
- 
- #define FREE(p)            {if (p) {free(p); (p)= NULL;}}
-@@ -965,6 +966,5 @@ static void minimax_test(gpc_polygon *su
-   c_bbox= create_contour_bboxes(clip);
- 
--  MALLOC(o_table, subj->num_contours * clip->num_contours * sizeof(int),
--         "overlap table creation", int);
-+  o_table = alloca(subj->num_contours * clip->num_contours * sizeof(int));
- 
-   /* Check all subject contour bounding boxes against clip boxes */
-@@ -1006,5 +1006,4 @@ static void minimax_test(gpc_polygon *su
-   FREE(s_bbox);
-   FREE(c_bbox);
--  FREE(o_table);
- }
- 
-@@ -1166,5 +1165,5 @@ void gpc_polygon_clip(gpc_op op, gpc_pol
- 
-   /* Build scanbeam table from scanbeam tree */
--  MALLOC(sbt, sbt_entries * sizeof(double), "sbt creation", double);
-+  sbt = alloca(sbt_entries * sizeof(double));
-   build_sbt(&scanbeam, sbt, sbtree);
-   scanbeam= 0;
-@@ -1749,5 +1748,4 @@ void gpc_polygon_clip(gpc_op op, gpc_pol
-   FREE(c_heap);
-   FREE(s_heap);
--  FREE(sbt);
- }
- 
-@@ -1825,5 +1823,5 @@ void gpc_tristrip_clip(gpc_op op, gpc_po
- 
-   /* Build scanbeam table from scanbeam tree */
--  MALLOC(sbt, sbt_entries * sizeof(double), "sbt creation", double);
-+  sbt = alloca(sbt_entries * sizeof(double));
-   build_sbt(&scanbeam, sbt, sbtree);
-   scanbeam= 0;
-@@ -2463,5 +2461,4 @@ void gpc_tristrip_clip(gpc_op op, gpc_po
-   FREE(c_heap);
-   FREE(s_heap);
--  FREE(sbt);
- }
- 
diff --git a/devel/gpc/pkg-descr b/devel/gpc/pkg-descr
deleted file mode 100644
index 0235b8c5f08d..000000000000
--- a/devel/gpc/pkg-descr
+++ /dev/null
@@ -1,22 +0,0 @@
-An algorithm for calculating the difference, intersection,
-exclusive-or or union of arbitrary polygon sets.
-
-Author:    Alan Murta (email: gpc@cs.man.ac.uk)
-
-Copyright: (C) 1997-2004, Advanced Interfaces Group,
-	University of Manchester.
-
-	This software is free for non-commercial use. It may be copied,
-	modified, and redistributed provided that this copyright notice
-	is preserved on all copies. The intellectual property rights of
-	the algorithms used reside with the University of Manchester
-	Advanced Interfaces Group.
-
-	You may not use this software, in whole or in part, in support
-	of any commercial product without the express consent of the
-	author.
-
-WWW:	http://www.cs.man.ac.uk/~toby/alan/software/
-
-	Software documentation at
-WWW:	http://www.cs.man.ac.uk/~toby/alan/software/gpc.html