8 files changed, 93 insertions, 145 deletions

diff --git a/lang/cint/Makefile b/lang/cint/Makefile
index 851480271212..ea716c43acbc 100644
--- a/lang/cint/Makefile
+++ b/lang/cint/Makefile
@@ -2,35 +2,35 @@
 # $FreeBSD$
 
 PORTNAME=	cint
-PORTVERSION=	5.16.19
-DISTVERSIONSUFFIX=	-source
+PORTVERSION=	5.18.00
 PORTREVISION=	1
 CATEGORIES=	lang
-MASTER_SITES=	ftp://root.cern.ch/root/
+MASTER_SITES=	http://root.cern.ch/drupal/sites/default/files/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	C/C++ interpreter
 
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+EXTRACT_SUFX=	.tgz
 HAS_CONFIGURE=	yes
+CONFIGURE_ENV=	CC="${CC}" CXX="${CXX}" LDFLAGS="${LDFLAGS}"
+USE_GCC=	yes
 USES=		gmake
 USE_LDCONFIG=	${PREFIX}/lib/cint
 ALL_TARGET=
-MAN1=		cint.1 makecint.1
 
-INSTALL_ARGS=	--bindir=${PREFIX}/bin  \
-		--libdir=${PREFIX}/lib/cint \
-		--mandir=${PREFIX}/man
+INSTALL_ARGS=	--bindir=${STAGEDIR}${PREFIX}/bin\
+		--libdir=${STAGEDIR}${PREFIX}/lib/cint\
+		--mandir=${STAGEDIR}${PREFIX}/man\
+		--docdir=${STAGEDIR}${DOCSDIR}
 
-.if !defined(NOPORTDOCS)
-INSTALL_ARGS+=	--docdir=${DOCSDIR}
-.endif
+post-patch:
+	${REINPLACE_CMD} 's,#!/bin/bash,#!${LOCALBASE}/bin/bash,' ${WRKSRC}/cint/lib/dll_stl/setup
+	${REINPLACE_CMD} 's,make ,${GMAKE} ,' ${WRKSRC}/cint/lib/*/setup
 
-NO_STAGE=	yes
 do-configure:
-	cd ${WRKSRC} && ${LOCALBASE}/bin/bash configure __have_the_proper_shell@
+	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${LOCALBASE}/bin/bash configure __have_the_proper_shell@
 
 do-install:
 	cd ${WRKSRC} && ${LOCALBASE}/bin/bash tool/INSTALLBIN ${INSTALL_ARGS}
diff --git a/lang/cint/distinfo b/lang/cint/distinfo
index 8e635f4392eb..b49a0d1480d8 100644
--- a/lang/cint/distinfo
+++ b/lang/cint/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cint-5.16.19-source.tar.gz) = 93a9daa39d83b2fee641edda49ac1a4a0687baed249fae534916dfac2e752ee6
-SIZE (cint-5.16.19-source.tar.gz) = 1975329
+SHA256 (cint-5.18.00.tgz) = 683d70e6277a981575156ca67c69fd716166af4ed1c48b761708349380a28374
+SIZE (cint-5.18.00.tgz) = 2139623
diff --git a/lang/cint/files/patch-Makefile b/lang/cint/files/patch-Makefile
deleted file mode 100644
index ae2fbf7b8a4a..000000000000
--- a/lang/cint/files/patch-Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
---- Makefile.orig	Fri Nov 24 14:41:26 2006
-+++ Makefile	Tue Aug 21 14:57:42 2007
-@@ -38,11 +38,11 @@
- 		touch include/iosenum.h; \
- 	else \
- 		(echo Generating iosenum.h. This might take a while...; \
--		cd include;$(G__CFG_RM) stdfunc$(G__CFG_SOEXT); cd ..\
-+		cd include;$(G__CFG_RM) stdfunc$(G__CFG_SOEXT); cd ..;\
- 		unset VS_UNICODE_OUTPUT; \
- 		LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:. \
- 		DYLD_LIBRARY_PATH=$$DYLD_LIBRARY_PATH:. \
--		./cint$(G__CFG_EXEEXT) $(G__CFG_INCP)inc iosenum.cxx); \
-+		./cint$(G__CFG_EXEEXT) $(G__CFG_INCP)inc include/iosenum.cxx); \
- 	fi)
- 	@echo > done
- 
diff --git a/lang/cint/files/patch-configure b/lang/cint/files/patch-configure
deleted file mode 100644
index 4731490254ea..000000000000
--- a/lang/cint/files/patch-configure
+++ /dev/null
@@ -1,43 +0,0 @@
---- configure.orig	2006-11-24 08:30:23.000000000 +0000
-+++ configure	2007-08-23 05:06:38.042002000 +0000
-@@ -20,7 +20,7 @@
- 
- # configure settings to build CINT
- 
--ARCHS=(linux linuxicc macgcc djgpp cygwin mingw mwerks hpux aix msvc7 msvc8 solaris solarisgcc)
-+ARCHS=(linux linuxicc macgcc djgpp cygwin mingw mwerks hpux aix msvc7 msvc8 solaris solarisgcc freebsd)
- 
- #############################################################
- ###
-@@ -102,6 +102,13 @@
-     config_GCC_defaults
- }
- 
-+function config_freebsd {
-+    config_GCC_defaults
-+    CFLAGS="${CFLAGS} -fPIC"
-+    CXXFLAGS="${CXXFLAGS} -fPIC"
-+    DEFAULTLIBS="`echo $DEFAULTLIBS | sed 's/-ldl//'`"
-+}
-+
- function config_linuxx8664gcc {
-     config_GCC_defaults
- 
-@@ -326,7 +333,7 @@
- #        freebsd*:*:6*)         arch=freebsd5        ;;
- #        freebsd*:*:5*)         arch=freebsd5        ;;
- #        freebsd*:*:4*)         arch=freebsd4        ;;
--#        freebsd*:*:*)          arch=freebsd         ;;
-+        freebsd*:*:*)          arch=freebsd         ;;
- #        hp-ux:ia64:*)          arch=hpuxia64acc     ;;
- #        hp-ux:*:*)             arch=hpuxacc         ;;
- #        hurd*:*:*)             arch=hurddeb         ;;
-@@ -357,6 +364,8 @@
-     esac
-     if [ "x`uname -a|grep -i linux`" != "x" ]; then
-         GUESSEDARCH=$arch
-+    elif [ "x`uname -a|grep -i freebsd`" != "x" ]; then
-+        GUESSEDARCH=$arch
-     elif cl.exe >/dev/null 2>&1; then
-         if [ "x`cl 2>&1|grep 'Version 14'`" != "x" ]; then
-             GUESSEDARCH=msvc8
diff --git a/lang/cint/files/patch-src-gcc3strm.cxx b/lang/cint/files/patch-src-gcc3strm.cxx
deleted file mode 100644
index e47249a0f2c6..000000000000
--- a/lang/cint/files/patch-src-gcc3strm.cxx
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/gcc3strm.cxx.orig	2007-08-23 05:01:30.049002000 +0000
-+++ src/gcc3strm.cxx	2007-08-23 05:02:36.423000000 +0000
-@@ -306,6 +306,7 @@
-    return(1 || funcname || hash || result7 || libp) ;
- }
- 
-+#if 0
- static int G__G__stream_7_7_0(G__value* result7, G__CONST char* funcname, struct G__param* libp, int hash)
- {
-       G__letint(result7, 103, (long) ((fpos<mbstate_t>*) G__getstructoffset())->operator==(*(fpos<mbstate_t>*) libp->para[0].ref));
-@@ -317,6 +318,7 @@
-       G__letint(result7, 103, (long) ((fpos<mbstate_t>*) G__getstructoffset())->operator!=(*(fpos<mbstate_t>*) libp->para[0].ref));
-    return(1 || funcname || hash || result7 || libp) ;
- }
-+#endif
- 
- // automatic destructor
- typedef fpos<mbstate_t> G__TfposlEmbstate_tgR;
-@@ -3961,8 +3963,10 @@
-    G__memfunc_setup("operator streamoff",1875,G__G__stream_7_4_0, 110, -1, G__defined_typename("streamoff"), 0, 0, 1, 1, 8, "", (char*)NULL, (void*) NULL, 0);
-    G__memfunc_setup("operator+",919,G__G__stream_7_5_0, 117, G__get_linked_tagnum(&G__G__streamLN_fposlEmbstate_tgR), -1, 0, 1, 1, 1, 0, "n - 'streamoff' 0 - a", (char*)NULL, (void*) NULL, 0);
-    G__memfunc_setup("operator-",921,G__G__stream_7_6_0, 117, G__get_linked_tagnum(&G__G__streamLN_fposlEmbstate_tgR), -1, 0, 1, 1, 1, 0, "n - 'streamoff' 0 - a", (char*)NULL, (void*) NULL, 0);
-+#if 0
-    G__memfunc_setup("operator==",998,G__G__stream_7_7_0, 103, -1, -1, 0, 1, 1, 1, 0, "u 'fpos<mbstate_t>' - 11 - a", (char*)NULL, (void*) NULL, 0);
-    G__memfunc_setup("operator!=",970,G__G__stream_7_8_0, 103, -1, -1, 0, 1, 1, 1, 0, "u 'fpos<mbstate_t>' - 11 - a", (char*)NULL, (void*) NULL, 0);
-+#endif
-    // automatic destructor
-    G__memfunc_setup("~fpos<mbstate_t>", 1651, G__G__stream_7_9_0, (int) ('y'), -1, -1, 0, 0, 1, 1, 0, "", (char*) NULL, (void*) NULL, 0);
-    // automatic assignment operator
diff --git a/lang/cint/files/patch-tool-INSTALLBIN b/lang/cint/files/patch-tool-INSTALLBIN
index 7ac7e51b3e6e..5f99f0b79a8c 100644
--- a/lang/cint/files/patch-tool-INSTALLBIN
+++ b/lang/cint/files/patch-tool-INSTALLBIN
@@ -1,31 +1,38 @@
---- tool/INSTALLBIN.orig	Tue Aug 21 15:08:47 2007
-+++ tool/INSTALLBIN	Tue Aug 21 15:14:16 2007
-@@ -96,17 +96,17 @@
+--- tool/INSTALLBIN.orig	2008-03-19 16:20:10.000000000 +0600
++++ tool/INSTALLBIN	2014-09-01 13:55:37.000000000 +0700
+@@ -89,13 +89,14 @@
+ for i in cint makecint;
+ do
+   echo -n "$i ";
+-  cp $i $BINDIR/$i
++  cp bin/$i $BINDIR/$i
+ done
+ echo -e "\n  ... successfully installed in $BINDIR\n"
+ 
  #####################################################################
  # Copy lib files
  #####################################################################
--mkdir -p $LIBDIR/src
++pushd cint
  for i in include/*; do
    if test -d $i; then mkdir -p $LIBDIR/$i; fi
  done
- mkdir -p $LIBDIR/lib/prec_stl
- mkdir -p $LIBDIR/lib/longlong
- mkdir -p $LIBDIR/stl
-+mkdir -p $LIBDIR/inc
- mkdir -p $LIBDIR/main
- 
+@@ -108,8 +109,9 @@
  # Copy lib files
--FILELIST="MAKEINFO include/* include/*/* stl/* lib/prec_stl/* lib/longlong/longlong.h G__ci.h main/*"
-+FILELIST="include/* include/*/* stl/* lib/prec_stl/* lib/longlong/longlong.h inc/* main/*"
+ FILELIST="include/* include/*/* stl/* lib/prec_stl/* lib/longlong/longlong.h inc/* main/*"
  # Add either shared or static library to $FILELIST
- if test -f libcint.so; then
-   FILELIST="$FILELIST libcint.so"
-@@ -115,7 +115,7 @@
+-if test -f libcint.so; then
+-  FILELIST="$FILELIST libcint.so"
++if test -f ../lib/libCint.so; then
++  cp ../lib/libCint.so .
++  FILELIST="$FILELIST libCint.so"
+ else
+   FILELIST="$FILELIST src/G__ci.a";
  fi
- for i in $FILELIST; do
-   case $i in
--  include/make*|include/Make*|*/setup*)
-+  include/make*|include/Make*|*/setup*|*/CVS|*/CVS/*)
-     ;;
-   *)
-     if ! test -d $i; then echo -n "$i "; cp $i $LIBDIR/$i; fi
+@@ -123,6 +125,7 @@
+   esac
+ done
+ echo -e "\n  ... successfully installed in $LIBDIR\n"
++popd
+ 
+ #####################################################################
+ # Optionally copy man files
diff --git a/lang/cint/pkg-descr b/lang/cint/pkg-descr
index 2fe7909ea99f..70f7359b039c 100644
--- a/lang/cint/pkg-descr
+++ b/lang/cint/pkg-descr
@@ -9,4 +9,4 @@ and shared objects can be dynamically loaded/unloaded without stopping
 the CINT process. CINT offers a gdb like debugging environment for
 interpreted programs.
 
-WWW:	http://root.cern.ch/twiki/bin/view/ROOT/CINT
+WWW:	http://root.cern.ch/drupal/content/cint
diff --git a/lang/cint/pkg-plist b/lang/cint/pkg-plist
index 73628d084069..5aa2724309f6 100644
--- a/lang/cint/pkg-plist
+++ b/lang/cint/pkg-plist
@@ -5,7 +5,9 @@ lib/cint/inc/BaseCls.h
 lib/cint/inc/CallFunc.h
 lib/cint/inc/Class.h
 lib/cint/inc/DataMbr.h
+lib/cint/inc/FastAllocString.h
 lib/cint/inc/G__ci.h
+lib/cint/inc/G__ci_fproto.h
 lib/cint/inc/Method.h
 lib/cint/inc/MethodAr.h
 lib/cint/inc/Property.h
@@ -13,6 +15,7 @@ lib/cint/inc/Shadow.h
 lib/cint/inc/Token.h
 lib/cint/inc/Type.h
 lib/cint/inc/Typedf.h
+lib/cint/inc/cintdictversion.h
 lib/cint/inc/configcint.h
 lib/cint/include/Common.h
 lib/cint/include/GL/gl.h
@@ -71,7 +74,6 @@ lib/cint/include/cwchar
 lib/cint/include/cwctype
 lib/cint/include/darray.cxx
 lib/cint/include/darray.h
-lib/cint/include/done
 lib/cint/include/errno.h
 lib/cint/include/ertti.h
 lib/cint/include/exception
@@ -87,7 +89,6 @@ lib/cint/include/iomanip
 lib/cint/include/iomanip.h
 lib/cint/include/iosenum.cxx
 lib/cint/include/iosenum.h
-lib/cint/include/iosenum.win32
 lib/cint/include/iosfwd
 lib/cint/include/iosfwd.h
 lib/cint/include/iostream
@@ -97,6 +98,7 @@ lib/cint/include/limits
 lib/cint/include/limits.h
 lib/cint/include/locale
 lib/cint/include/locale.h
+lib/cint/include/long.dll
 lib/cint/include/lsm.c
 lib/cint/include/lsm.h
 lib/cint/include/math.h
@@ -106,11 +108,11 @@ lib/cint/include/matrixstream.h
 lib/cint/include/matrixstream.hi
 lib/cint/include/mkincld
 lib/cint/include/mkincld.c
-lib/cint/include/mkincld.o
 lib/cint/include/new
 lib/cint/include/new.h
 lib/cint/include/ostream
 lib/cint/include/platform.h
+lib/cint/include/posix.dll
 lib/cint/include/pthread.h
 lib/cint/include/readfile.h
 lib/cint/include/regex.h
@@ -123,8 +125,10 @@ lib/cint/include/sstream
 lib/cint/include/statistics.c
 lib/cint/include/statistics.h
 lib/cint/include/stdarg.h
+lib/cint/include/stdcxxfunc.dll
 lib/cint/include/stddef.h
 lib/cint/include/stdexcept
+lib/cint/include/stdfunc.dll
 lib/cint/include/stdio.h
 lib/cint/include/stdiostream.h
 lib/cint/include/stdlib.h
@@ -136,11 +140,14 @@ lib/cint/include/strstream
 lib/cint/include/strstream.h
 lib/cint/include/sys/cdefs.h
 lib/cint/include/sys/file.h
+lib/cint/include/sys/ipc.dll
 lib/cint/include/sys/ipc.h
 lib/cint/include/sys/msg.h
 lib/cint/include/sys/sem.h
 lib/cint/include/sys/shm.h
 lib/cint/include/sys/stat.h
+lib/cint/include/sys/types.h
+lib/cint/include/systypes.h
 lib/cint/include/termios.h
 lib/cint/include/time.h
 lib/cint/include/timespec.h
@@ -176,12 +183,14 @@ lib/cint/lib/prec_stl/string
 lib/cint/lib/prec_stl/utility
 lib/cint/lib/prec_stl/valarray
 lib/cint/lib/prec_stl/vector
-lib/cint/libcint.so
-lib/cint/main/G__cppmain.o
+lib/cint/libCint.so
 lib/cint/main/G__main.c
 lib/cint/main/G__setup.c
+lib/cint/main/G__setup.d
 lib/cint/main/G__setup.o
 lib/cint/main/cppmain.cxx
+lib/cint/main/cppmain.d
+lib/cint/main/cppmain.o
 lib/cint/stl/G__postprocess.h
 lib/cint/stl/README.txt
 lib/cint/stl/_algorithm
@@ -221,9 +230,13 @@ lib/cint/stl/bitset
 lib/cint/stl/bool
 lib/cint/stl/bstring.h
 lib/cint/stl/bvector.h
+lib/cint/stl/climits.dll
+lib/cint/stl/complex.dll
 lib/cint/stl/defalloc.h
 lib/cint/stl/deque
+lib/cint/stl/deque.dll
 lib/cint/stl/deque.h
+lib/cint/stl/exception.dll
 lib/cint/stl/faralloc.h
 lib/cint/stl/fdeque.h
 lib/cint/stl/flist.h
@@ -248,6 +261,7 @@ lib/cint/stl/lbvector.h
 lib/cint/stl/ldeque.h
 lib/cint/stl/limits
 lib/cint/stl/list
+lib/cint/stl/list.dll
 lib/cint/stl/list.h
 lib/cint/stl/llist.h
 lib/cint/stl/lmap.h
@@ -256,11 +270,16 @@ lib/cint/stl/lmultset.h
 lib/cint/stl/lngalloc.h
 lib/cint/stl/lset.h
 lib/cint/stl/map
+lib/cint/stl/map.dll
 lib/cint/stl/map.h
+lib/cint/stl/map2.dll
 lib/cint/stl/memory
 lib/cint/stl/multimap
+lib/cint/stl/multimap.dll
 lib/cint/stl/multimap.h
+lib/cint/stl/multimap2.dll
 lib/cint/stl/multiset
+lib/cint/stl/multiset.dll
 lib/cint/stl/multiset.h
 lib/cint/stl/neralloc.h
 lib/cint/stl/nmap.h
@@ -272,11 +291,17 @@ lib/cint/stl/pair
 lib/cint/stl/pair.h
 lib/cint/stl/projectn.h
 lib/cint/stl/queue
+lib/cint/stl/queue.dll
+lib/cint/stl/random.cpp
 lib/cint/stl/set
+lib/cint/stl/set.dll
 lib/cint/stl/set.h
 lib/cint/stl/stack
+lib/cint/stl/stack.dll
 lib/cint/stl/stack.h
+lib/cint/stl/stdexcept.dll
 lib/cint/stl/string
+lib/cint/stl/string.dll
 lib/cint/stl/tempbuf.cpp
 lib/cint/stl/tempbuf.h
 lib/cint/stl/teststl
@@ -285,8 +310,13 @@ lib/cint/stl/tree.h
 lib/cint/stl/utility
 lib/cint/stl/utility.h
 lib/cint/stl/valarray
+lib/cint/stl/valarray.dll
 lib/cint/stl/vector
+lib/cint/stl/vector.dll
 lib/cint/stl/vector.h
+lib/cint/stl/vectorbool.dll
+man/man1/cint.1.gz
+man/man1/makecint.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/bytecode.txt
 %%PORTDOCS%%%%DOCSDIR%%/cint.txt
 %%PORTDOCS%%%%DOCSDIR%%/cintapi.txt
@@ -297,16 +327,15 @@ lib/cint/stl/vector.h
 %%PORTDOCS%%%%DOCSDIR%%/makecint.txt
 %%PORTDOCS%%%%DOCSDIR%%/message.txt
 %%PORTDOCS%%%%DOCSDIR%%/ref.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm lib/cint/stl
-@dirrm lib/cint/main
-@dirrm lib/cint/lib/prec_stl
-@dirrm lib/cint/lib/longlong
-@dirrm lib/cint/lib
-@dirrm lib/cint/include/sys
-@dirrm lib/cint/include/X11
-@dirrm lib/cint/include/GL
-@dirrm lib/cint/include/CVS
-@dirrm lib/cint/include
-@dirrm lib/cint/inc
-@dirrm lib/cint
+@dirrmtry lib/cint/inc
+@dirrmtry lib/cint/include/GL
+@dirrmtry lib/cint/include/X11
+@dirrmtry lib/cint/include/sys
+@dirrmtry lib/cint/include
+@dirrmtry lib/cint/lib/longlong
+@dirrmtry lib/cint/lib/prec_stl
+@dirrmtry lib/cint/lib
+@dirrmtry lib/cint/main
+@dirrmtry lib/cint/stl
+@dirrmtry lib/cint
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%