Date: Thu, 17 Feb 2005 19:44:39 +0100 (CET) From: Johan van Selst <johans@stack.nl> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/77650: lang/ccscript: update to 2.5.7 and unbreak Message-ID: <20050217184439.F27B9171E4@mud.stack.nl> Resent-Message-ID: <200502171850.j1HIoMGo080687@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 77650
>Category: ports
>Synopsis: lang/ccscript: update to 2.5.7 and unbreak
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Feb 17 18:50:21 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Johan van Selst
>Release: FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD mud.stack.nl 5.3-STABLE FreeBSD 5.3-STABLE #0: Mon Jan 31 22:31:14 CET 2005 root@mud.stack.nl:/usr/obj/usr/src/sys/mud i386
>Description:
Update to new stable version
Fix MASTER_SITES
Fix compilation error on gcc 3.4
Quoting Google:
"ANSI spec 11.5 is quite brain dead about pointers of protected
members: In order to access them using the base class name,
they can't be protected. apparently, only gcc 3.4 knows that;
other compilers take protected as protected."
>How-To-Repeat:
>Fix:
Note: please remove obsolete files/patch-config:ltmain.sh
and files/patch-src:script.cpp
diff -uNr ccscript/Makefile ccscript/Makefile
--- ccscript/Makefile Thu Feb 17 18:23:13 2005
+++ ccscript/Makefile Thu Feb 17 19:15:51 2005
@@ -6,12 +6,11 @@
#
PORTNAME= ccscript
-PORTVERSION= 2.5.6
-PORTREVISION= 1
+PORTVERSION= 2.5.7
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_GNU:S/$/:gnu/} \
${MASTER_SITE_SOURCEFORGE:S/$/:sf/}
-MASTER_SITE_SUBDIR= ccaudio/:gnu \
+MASTER_SITE_SUBDIR= ccscript/:gnu \
bayonne/:sf
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:gnu \
${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:sf
@@ -25,14 +24,10 @@
GNU_CONFIGURE= yes
INSTALL_TARGET= install man
INSTALLS_SHLIB= yes
+USE_LIBTOOL_VER= 15
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} >= 503001
-BROKEN= "Does not compile on FreeBSD >= 5.x"
-.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -uNr ccscript/distinfo ccscript/distinfo
--- ccscript/distinfo Fri Feb 20 10:57:19 2004
+++ ccscript/distinfo Thu Feb 17 19:05:08 2005
@@ -1,2 +1,2 @@
-MD5 (ccscript-2.5.6.tar.gz) = c0e664ab13e054b37e0f7da40a7b488e
-SIZE (ccscript-2.5.6.tar.gz) = 375473
+MD5 (ccscript-2.5.7.tar.gz) = ef0f87184828bdc5e52ce58ab9ba3d3a
+SIZE (ccscript-2.5.7.tar.gz) = 247988
diff -uNr ccscript/files/patch-config:ltmain.sh ccscript/files/patch-config:ltmain.sh
--- ccscript/files/patch-config:ltmain.sh Fri Feb 20 10:57:20 2004
+++ ccscript/files/patch-config:ltmain.sh Thu Jan 1 01:00:00 1970
@@ -1,15 +0,0 @@
---- config/ltmain.sh.orig Fri Feb 20 17:50:28 2004
-+++ config/ltmain.sh Fri Feb 20 17:50:39 2004
-@@ -5428,10 +5428,12 @@
- fi
-
- # Install the pseudo-library for information purposes.
-+ if /usr/bin/false ; then
- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- instname="$dir/$name"i
- $show "$install_prog $instname $destdir/$name"
- $run eval "$install_prog $instname $destdir/$name" || exit $?
-+ fi
-
- # Maybe install the static library, too.
- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff -uNr ccscript/files/patch-src:script.cpp ccscript/files/patch-src:script.cpp
--- ccscript/files/patch-src:script.cpp Fri Feb 20 10:57:20 2004
+++ ccscript/files/patch-src:script.cpp Thu Jan 1 01:00:00 1970
@@ -1,11 +0,0 @@
---- src/script.cpp.orig Fri Feb 20 17:51:13 2004
-+++ src/script.cpp Fri Feb 20 17:52:01 2004
-@@ -1209,7 +1209,7 @@
- #endif
- for(;;)
- {
-- scrname = dir.getName();
-+ scrname = (char*)dir.getName();
- if(!scrname)
- break;
- ext = strchr(scrname, '.');
diff -uNr ccscript/files/patch-src_script.h ccscript/files/patch-src_script.h
--- ccscript/files/patch-src_script.h Thu Jan 1 01:00:00 1970
+++ ccscript/files/patch-src_script.h Thu Feb 17 19:01:14 2005
@@ -0,0 +1,51 @@
+--- src/script.h.orig Thu Feb 17 19:01:10 2005
++++ src/script.h Thu Feb 17 19:00:29 2005
+@@ -550,11 +550,6 @@ protected:
+ virtual unsigned long getTrapMask(const char *trapname);
+
+ /**
+- * Default compiler syntax to accept any syntax.
+- */
+- char *chkIgnore(Line *line, ScriptImage *img);
+-
+- /**
+ * Module based script checker.
+ */
+ char *chkModule(Line *line, ScriptImage *img);
+@@ -598,15 +593,6 @@ protected:
+ char *chkNoArgs(Line *line, ScriptImage *img);
+
+ /**
+- * Script compiler syntax check for commands that require
+- * one or more arguments to be present.
+- *
+- * @return syntax error message string or NULL.
+- * @param line statement.
+- */
+- char *chkHasArgs(Line *line, ScriptImage *img);
+-
+- /**
+ * Load a set of keywords into the system keyword table. This
+ * provides a convenient method of initializing and adding to
+ * the keyword indexes.
+@@ -658,6 +644,20 @@ public:
+
+ virtual int mapnicmp(const char *s1, const char *s2, size_t n)
+ {return strnicmp(s1, s2, n);};
++
++ /**
++ * Script compiler syntax check for commands that require
++ * one or more arguments to be present.
++ *
++ * @return syntax error message string or NULL.
++ * @param line statement.
++ */
++ char *chkHasArgs(Line *line, ScriptImage *img);
++
++ /**
++ * Default compiler syntax to accept any syntax.
++ */
++ char *chkIgnore(Line *line, ScriptImage *img);
+ };
+
+ /**
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050217184439.F27B9171E4>