- Update to ccscrpt3 (1.1.6)

- Remove BROKEN with GCC 4.x
- Bump PORTEPOCH

Approved by:	portmgr (linimon)

4 files changed, 37 insertions, 39 deletions

diff --git a/lang/ccscript/Makefile b/lang/ccscript/Makefile
index dac4905c7fc9..203b2a01159b 100644
--- a/lang/ccscript/Makefile
+++ b/lang/ccscript/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	ccscript
-PORTVERSION=	2.5.9
-PORTREVISION=	1
+PORTVERSION=	1.1.6
+PORTEPOCH=	1
 CATEGORIES=	lang
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	gnutelephony
+MASTER_SITES=	GNU
+DISTNAME=	${PORTNAME:S/$/3/}-${PORTVERSION}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	State-event driven class extendible C++ script interpreter
@@ -20,20 +20,10 @@ LIB_DEPENDS=	ccgnu2-1.5.0:${PORTSDIR}/devel/commoncpp
 USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnometarget
 GNU_CONFIGURE=	yes
-USE_GCC=	3.4+
-INSTALL_TARGET=	install man
 USE_LDCONFIG=	yes
 
-MAN3=		ScriptCommand.3cc ScriptImage.3cc ScriptInterp.3cc \
-		ScriptModule.3cc ScriptSymbol.3cc Script_Locks.3cc \
-		Script_Package.3cc Script_Property.3cc Script_Session.3cc
-
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 700042
-BROKEN=		Does not compile with GCC 4.2
-.endif
-
 .if ${ARCH} == "amd64"
 CFLAGS+=	-fPIC
 .endif
diff --git a/lang/ccscript/distinfo b/lang/ccscript/distinfo
index 5d8db1741226..0bccaf427215 100644
--- a/lang/ccscript/distinfo
+++ b/lang/ccscript/distinfo
@@ -1,3 +1,3 @@
-MD5 (ccscript-2.5.9.tar.gz) = 24bf6f75ddcd68e070a43399a29b3670
-SHA256 (ccscript-2.5.9.tar.gz) = 592d1a60c5adb287a6e505bcffd872d48244fead4c503d27d10f7f7cfcfd5e22
-SIZE (ccscript-2.5.9.tar.gz) = 372089
+MD5 (ccscript3-1.1.6.tar.gz) = d0e526b82bbccce5d18fc0d47456cc42
+SHA256 (ccscript3-1.1.6.tar.gz) = 90d4f1151ece2832f063f855363c563473234abc71ddc46325f5c861e85428b5
+SIZE (ccscript3-1.1.6.tar.gz) = 407755
diff --git a/lang/ccscript/files/patch-Makefile.in b/lang/ccscript/files/patch-Makefile.in
new file mode 100644
index 000000000000..639073b74bea
--- /dev/null
+++ b/lang/ccscript/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2007-11-07 11:32:03.000000000 -0500
++++ Makefile.in	2007-11-07 11:32:37.000000000 -0500
+@@ -222,7 +222,7 @@
+ 
+ SUBDIRS = src tests modules optional
+ DIST_SUBDIRS = src tests modules optional
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
+ pkgconfig_DATA = libccscript3.pc
+ all: all-recursive
+ 
diff --git a/lang/ccscript/pkg-plist b/lang/ccscript/pkg-plist
index eca1a5d3dcc8..53ebdbf03c01 100644
--- a/lang/ccscript/pkg-plist
+++ b/lang/ccscript/pkg-plist
@@ -1,22 +1,19 @@
-bin/ccscript
-include/cc++2/cc++/script.h
-lib/libccscript2.a
-lib/libccscript2.la
-lib/libccscript2.so
-lib/libccscript2-0.6.so
-lib/libccscript2-0.6.so.3
-lib/ccscript2/date.pkg
-lib/ccscript2/digits.pkg
-lib/ccscript2/file.pkg
-lib/ccscript2/manip.pkg
-lib/ccscript2/math.pkg
-lib/ccscript2/random.pkg
-lib/ccscript2/scale.pkg
-lib/ccscript2/sort.pkg
-lib/ccscript2/string.pkg
-lib/ccscript2/time.pkg
-lib/ccscript2/trig.pkg
-lib/ccscript2/url.pkg
-@dirrm include/cc++2/cc++
-@dirrm include/cc++2
-@dirrm lib/ccscript2
+include/cc++/script3.h
+lib/libccscript3-1.1.so.0
+lib/libccscript3-1.1.so
+lib/libccscript3.so
+lib/libccscript3.la
+lib/libccscript3.a
+lib/ccscript3-1.1/math.dso
+lib/ccscript3-1.1/time.dso
+lib/ccscript3-1.1/sort.dso
+lib/ccscript3-1.1/string.dso
+lib/ccscript3-1.1/check.dso
+lib/ccscript3-1.1/csv.dso
+lib/ccscript3-1.1/property.dso
+lib/ccscript3-1.1/locker.dso
+lib/ccscript3-1.1/userauth.dso
+lib/ccscript3-1.1/url.dso
+libdata/pkgconfig/libccscript3.pc
+@dirrmtry include/cc++
+@dirrm lib/ccscript3-1.1