diff options
| author | kamil <kamil@pkgsrc.org> | 2016-09-28 10:00:27 +0000 |
|---|---|---|
| committer | kamil <kamil@pkgsrc.org> | 2016-09-28 10:00:27 +0000 |
| commit | 57e9228ea0bea381bd4dae08fc8d92684d47a7a6 (patch) | |
| tree | cada1af2a61dee44a20c4264e74c1e294396cbf0 | |
| parent | 881b572964e3be62ee1927df33b278c79a92db7e (diff) | |
| download | pkgsrc-57e9228ea0bea381bd4dae08fc8d92684d47a7a6.tar.gz | |
Upgrade cint from 5.15.174 to 5.16.19
cint is no longer developed upstream and was replaced with cling in root.
Add the latest version available from https://root.cern.ch/download/
New HOMEPAGE ships an unversioned tarball as the latest release, but its
conent is unrecognized and very different from the known cint from the old
cern.ch site.
FreeBSD claims to ship with cint-5.18 and there are references to it, but
it's probably root version 5.18 with possibly extracted files for cint.
If there is a newer version somewhere it will be upgraded later accordingly.
pkgsrc changes:
- refactor configure & build & install stages
- install demo files
- add license
- update DESCR
- new HOMEPAGE
- new MASTER_SITES
- remove conflict with devel/man-pages
Upstream changelog
==================
* 5.16.2, July 14 2005
* 6.1.2, July 14 2005
* - , Convert most of the C source file from K&R C to Ansi C++
* - The files *.c were renamed v6_*.cxx. The interfaces are
* - kept backward compatible (extern "C")
*
* 5.16.3, November 11, 2005
* 6.1.3, November 11, 2005
* - , Port to windows visual C++ version 8
* - , Many bugs fixes (see CVS change log for details)
*
* 5.16.4 November 30, 2005
* 6.1.4 November 30, 2005
* - Add support for generating dictionary using the reflex API (makecint -c3)
* - See CVS Change log for other updates.
*
* 5.16.5 November 30, 2005
* 6.1.5 November 30, 2005
* - Improve support for generating dictionary using the reflex API (makecint -c3)
* - Extend ClassInfo to better support array allocation and deallocation
* - See CVS Change log for other updates.
*
* 5.16.6 January 9, 2006
* 6.1.6 January 9, 2006
* - Import and use the shadow class mechanism from ROOT. This allows the
* calculation of the data member offset even if they are protected/private.
* - See CVS Change log for other updates (http://root.cern.ch/root/ChangeLog-cint.phtml)
*
* 5.16.7 January 19, 2006
* 6.1.7 January 19, 2006
* - Many improvement to the shadow class generation.
* - See CVS Change log for other updates (http://root.cern.ch/root/ChangeLog-cint.phtml)
*
* 5.16.8 February 9, 2006
* 6.1.8 February 9, 2006
* - Update and streamline the handling operator new and delete
* - See CVS Change log for other updates (http://root.cern.ch/root/ChangeLog-cint.phtml)
*
* 5.16.9 March 3, 2006
* 6.1.9 March 3, 2006
* - Upgrade the support for operator new and delete in the dictionaries (improve usage
of user provided operator new).
* - Add a new command line option (-E) to insure exit on error.
* - Improve error message in case of missing symbols.
* - See CVS Change log for other updates (http://root.cern.ch/root/ChangeLog-cint.phtml)
*
* 5.16.10 March 30, 2006
* 6.1.10 March 30, 2006
* - Refresh of the port to icc and alpha cxx
* - Fix for comment parsing in the CPP parser.
* - See CVS Change log for other updates (http://root.cern.ch/root/ChangeLog-cint.phtml)
*
* 5.16.11 April 14, 2006
* 6.1.10 April 14, 2006
* - Improve template support
* - Port to MacOS on Intel
* - See CVS Change log for other updates (http://root.cern.ch/root/ChangeLog-cint.phtml)
*
* 5.16.12 May 16, 2006
* 6.1.12 May 16, 2006
* - Add support for variadic functions on AMD64 and EM64T.
* - See CVS Change log for other updates (http://root.cern.ch/root/ChangeLog-cint.phtml)
*
* 5.16.13 June 8, 2006
* 6.1.13 June 8, 2006
* - New build system based on the configure/make model. MAKEINFO is not longer used.
* - A few more function has been officially exported and/or added to the appropriate
* header files
* - See CVS Change log for other updates (http://root.cern.ch/root/ChangeLog-cint.phtml)
*
* 5.16.14 August 18, 2006
* 6.1.14 August 18, 2006
* - Clarification of the license (Now MIT License)
* - See CVS Change log for other updates (http://root.cern.ch/root/ChangeLog-cint.phtml)
*
* 5.16.15 September 21, 2006
* 6.1.15 September 21, 2006
* - Various bug fixes (include a couple of cint dlls cleanups)
* - See CVS Change log for other updates (http://root.cern.ch/root/ChangeLog-cint.phtml)
*
* 5.16.16 November 24, 2006
* 6.1.16 November 24, 2006
* - Some minor bug fixes: remove G__CINTVERSION from strm dict files, AMD64 vararg passing, long comments, extern "C" multiline issue
* - G__sizeof, G__getfunction now part of the API
* - respect system macros when generating dictionaries
* - Move public header files into inc/
* - Changes to achieve binary compatibility with cint7; some of these are temporary
* - Move C++ API into namespace Cint
* - added build support for linux x86_64
* - See CVS Change log for other updates (http://root.cern.ch/root/ChangeLog-cint.phtml)
*
* 5.16.17 December 12, 2006
* 6.1.17 December 12, 2006
* - Some previously publicly visibly types are now private. Please let us know if this
* causes problems for you!
* - G__MethodInfo::Get/SetUserParam() added
* - extend G__ClassInfo::AddMethod
* - the relevant platform macros are now known to CINT, except when interpreting where the
* compiler macros (e.g. __GNUC__) are hidden
* - Fix prec_stl for solarisgcc, cygwin (posix)
*
* 5.16.18 February 9, 2007
* 6.1.18 February 9, 2007
* - Fix a few bugs (fix arithmetics involving long double, "!",
* LL suffix for operators' long long args, quoting of default
* params,
* - Implement G__pop_tempobject_nodel() to "steal" temp object from CINT
* - modify algo.h's random_shuffle to use new Cint::G__long_random in new v6_random.cxx
* - make G__free_ifunc_table non-recursive
* - for ROOT, use R__HAVE_CONFIG, not HAVE_CONFIG
*
* 5.16.19 March 16, 2007
* 6.1.19 March 16, 2007
* - handle 1dim arrays properly (!= scalar)
* - more memory effient G__param and G__inherit
* - implement forward decl in dictionaries (e.g. if dict for "A* f()" is
* setup, lib containing A will not be loaded)
* - add a reference layer between API ifunc* and internal ifunc*, so
* reloading (scrupto of scripts) doesn't invalidate the external
* ptrs for dependent libs
* - update tagnums below scrupto limit if they are autoload entries
* - allow multiple shared lib init routines
* - bug fixes: fix decl locations in .so-s, distinguish "class*",
* "decl if unknown" in G__search_tagname
* - split Shadow.h off Api.h
* - remove temporary files on windows once they are unused (fixes problem
* with tmp file flooding)
*
31 files changed, 815 insertions, 465 deletions
diff --git a/lang/cint/DESCR b/lang/cint/DESCR index 6557f2bec30..0653ce0ee33 100644 --- a/lang/cint/DESCR +++ b/lang/cint/DESCR @@ -1,6 +1,6 @@ -"cint" is a C/C++ interpreter. About 95% of ANSI C and -90% of C++ features are covered. (Data abstraction, class -inheritance, virtual function, function and operator over- -loading, default parameter, template, etc...) Cint has -source code debugger which has sufficient capability to -debug complicated C++ program. +Cint is a C/C++ interpreter. About 95% of ANSI C and 90% of C++ features are +covered. (Data abstraction, class inheritance, virtual function, function and +operator overloading, default parameter, template, etc...) Cint has source +code debugger which has sufficient capability to debug complicated C++ program. + +This is officially the last release - CERN switched to cling (LLVM-based). diff --git a/lang/cint/Makefile b/lang/cint/Makefile index d1cd6f7cc8d..d7962abbe0c 100644 --- a/lang/cint/Makefile +++ b/lang/cint/Makefile @@ -1,115 +1,89 @@ -# $NetBSD: Makefile,v 1.31 2015/12/11 23:32:53 joerg Exp $ +# $NetBSD: Makefile,v 1.32 2016/09/28 10:00:27 kamil Exp $ -DISTNAME= cint5.15 -PKGNAME= cint-5.15.174 -PKGREVISION= 2 +DISTNAME= cint-5.16.19-source +PKGNAME= ${DISTNAME:S/-source//} CATEGORIES= lang -MASTER_SITES= ftp://root.cern.ch/root/ -#MASTER_SITES= ${MASTER_SITE_BACKUP} +MASTER_SITES= https://root.cern.ch/download/ MAINTAINER= drochner@NetBSD.org -HOMEPAGE= http://root.cern.ch/root/Cint.html +HOMEPAGE= http://www.hanno.jp/gotom/Cint.html COMMENT= C/C++ interpreter +LICENSE= mit -CONFLICTS= man-pages-[0-9]* - +USE_TOOLS+= bash gmake pax USE_LANGUAGES= c c++ -#same distribution file name for minor versions -DIST_SUBDIR= ${PKGNAME_NOREV} -WRKSRC= ${WRKDIR} -GCC_REQD+= 3.0 -PTHREAD_OPTS+= native -PLIST_VARS+= threads -.include "../../mk/pthread.buildlink3.mk" -.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "native" -PLIST.threads= yes -.endif - -INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man2 -INSTALLATION_DIRS+= ${PKGMANDIR}/man3 +CONFIG_SHELL= ${BASH} + +WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} + +CONFIGURE_ARGS+= --arch=netbsd +CONFIGURE_ARGS+= --readline=${PREFIX}/lib/libreadline.so + USE_LANGUAGES= c c++ -CHECK_PORTABILITY_SKIP+= INSTALLBIN + +HAS_CONFIGURE= yes +CFLAGS+= -Wno-write-strings +CXXFLAGS+= -Wno-write-strings +LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib +LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/cint/lib +CONFIGURE_ENV+= CFLAGS_ADD=${CFLAGS:Q} +CONFIGURE_ENV+= CXXFLAGS_ADD=${CXXFLAGS:Q} +CONFIGURE_ENV+= LDFLAGS_ADD=${LDFLAGS:Q} +CONFIGURE_ENV+= SOFLAGS_ADD=${LDFLAGS:Q} + +BUILDLINK_PASSTHRU_DIRS+= ${PREFIX}/cint/lib +BUILDLINK_PASSTHRU_RPATHDIRS+= ${PREFIX}/cint/lib + +BUILD_TARGET= # empty string required (override "all") + +INSTALLATION_DIRS+= bin cint cint/lib share/doc/cint +INSTALLATION_DIRS+= ${PKGMANDIR}/man1 ${PKGMANDIR}/man2 ${PKGMANDIR}/man3 post-extract: ${FIND} ${WRKSRC} -depth -type d -name CVS -exec ${RM} -rf {} \; ${FIND} ${WRKSRC} -type f -name .cvsignore -exec ${RM} -f {} \; + ${SED} "s;XXXPREFIXXXX;${PREFIX};g" <${FILESDIR}/cint.sh \ + >${WRKSRC}/cint.sh -do-build: - cd ${WRKDIR}; \ - case ${OPSYS} in \ - FreeBSD|DragonFly) \ - ${PKGSRC_SETENV} ${MAKE_ENV} ${SH} ./setup platform/freebsd_C \ - ;; \ - NetBSD|OpenBSD|Bitrig) \ - ${PKGSRC_SETENV} ${MAKE_ENV} ${SH} ./setup platform/netbsd \ - ;; \ - SunOS) \ - ${PKGSRC_SETENV} ${MAKE_ENV} ${SH} ./setup platform/solaris_gcc \ - ;; \ - *) \ - ${ECHO} 'not yet ported to ${OPSYS}'; exit 1 ;; \ - esac + +# We do not want these files to be installed +pre-install: + ${RM} -f ${WRKSRC}/include/Makeit + ${RM} -f ${WRKSRC}/include/make* do-install: - ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/cint - ${INSTALL_PROGRAM} ${WRKDIR}/cint ${DESTDIR}${PREFIX}/cint - ${INSTALL_PROGRAM} ${WRKDIR}/makecint ${DESTDIR}${PREFIX}/cint - ${SED} "s;XXXPREFIXXXX;${PREFIX};g" <${FILESDIR}/cint.sh >${DESTDIR}${PREFIX}/bin/cint +.for f in cint makecint + ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/cint +.endfor + ${INSTALL_DATA} ${WRKSRC}/inc/G__ci.h ${DESTDIR}${PREFIX}/cint + ${INSTALL_PROGRAM} ${WRKSRC}/libcint.so ${DESTDIR}${PREFIX}/cint/lib + ${INSTALL_SCRIPT} ${WRKSRC}/cint.sh ${DESTDIR}${PREFIX}/bin/cint + ${RUN} cd ${DESTDIR}${PREFIX}/bin && ${LN} -sf cint makecint ${CHMOD} +x ${DESTDIR}${PREFIX}/bin/cint - rm -f ${DESTDIR}${PREFIX}/bin/makecint - cd ${DESTDIR}${PREFIX}/bin && ${LN} cint makecint - ${INSTALL_DATA} ${WRKDIR}/MAKEINFO ${DESTDIR}${PREFIX}/cint - ${CP} -r ${WRKDIR}/include ${WRKDIR}/stl ${DESTDIR}${PREFIX}/cint - ${RM} ${DESTDIR}${PREFIX}/cint/include/Makeit \ - ${DESTDIR}${PREFIX}/cint/include/make* - ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/cint/lib - ${CP} -r ${WRKDIR}/lib/prec_stl ${DESTDIR}${PREFIX}/cint/lib - ${INSTALL_DATA} ${WRKDIR}/G__ci.h ${DESTDIR}${PREFIX}/cint - ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/cint - ${INSTALL_DATA} ${WRKSRC}/doc/bytecode.txt \ - ${DESTDIR}${PREFIX}/share/doc/cint - ${INSTALL_DATA} ${WRKSRC}/doc/cint.txt \ + ${RUN} cd ${WRKSRC} && ${PAX} -rw include stl ${DESTDIR}${PREFIX}/cint +# Install demos + ${RUN} cd ${WRKSRC} && ${PAX} -rw demo ${DESTDIR}${PREFIX}/cint + ${RUN} cd ${WRKSRC}/lib \ + && ${PAX} -rw prec_stl ${DESTDIR}${PREFIX}/cint/lib +.for f in \ + bytecode.txt cint.txt cintapi.txt extlib.txt ifdef.txt limitati.txt \ + limitnum.txt makecint.txt message.txt ref.txt + ${INSTALL_DATA} ${WRKSRC}/doc/${f} \ ${DESTDIR}${PREFIX}/share/doc/cint - ${INSTALL_DATA} ${WRKSRC}/doc/cintapi.txt \ - ${DESTDIR}${PREFIX}/share/doc/cint - ${INSTALL_DATA} ${WRKSRC}/doc/extlib.txt \ - ${DESTDIR}${PREFIX}/share/doc/cint - ${INSTALL_DATA} ${WRKSRC}/doc/ifdef.txt \ - ${DESTDIR}${PREFIX}/share/doc/cint - ${INSTALL_DATA} ${WRKSRC}/doc/limitati.txt \ - ${DESTDIR}${PREFIX}/share/doc/cint - ${INSTALL_DATA} ${WRKSRC}/doc/limitnum.txt \ - ${DESTDIR}${PREFIX}/share/doc/cint - ${INSTALL_DATA} ${WRKSRC}/doc/makecint.txt \ - ${DESTDIR}${PREFIX}/share/doc/cint - ${INSTALL_DATA} ${WRKSRC}/doc/message.txt \ - ${DESTDIR}${PREFIX}/share/doc/cint - ${INSTALL_DATA} ${WRKSRC}/doc/ref.txt \ - ${DESTDIR}${PREFIX}/share/doc/cint - ${INSTALL_MAN} ${WRKSRC}/doc/man1/cint.1 \ - ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 - ${INSTALL_MAN} ${WRKSRC}/doc/man1/makecint.1 \ - ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 - ${INSTALL_MAN} ${WRKSRC}/doc/man2/garbage.2 \ - ${DESTDIR}${PREFIX}/${PKGMANDIR}/man2 - ${INSTALL_MAN} ${WRKSRC}/doc/man2/security.2 \ - ${DESTDIR}${PREFIX}/${PKGMANDIR}/man2 - ${INSTALL_MAN} ${WRKSRC}/doc/man2/unique.2 \ - ${DESTDIR}${PREFIX}/${PKGMANDIR}/man2 - ${INSTALL_MAN} ${WRKSRC}/doc/man3/array.h.3 \ - ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3 - ${INSTALL_MAN} ${WRKSRC}/doc/man3/fft.h.3 \ - ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3 - ${INSTALL_MAN} ${WRKSRC}/doc/man3/statistics.h.3 \ - ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3 - -# The library seems to want these but the pertinent parts still don't -# build, so I'm reluctant to bother. -# -#.include "../../graphics/glu/buildlink3.mk" -#.include "../../graphics/MesaLib/buildlink3.mk" -#.include "../../x11/xproto/buildlink3.mk" -#.include "../../x11/libX11/buildlink3.mk" +.endfor +.for f in \ + cint.1 makecint.1 garbage.2 unique.2 array.h.3 fft.h.3 statistics.h.3 + ${INSTALL_MAN} ${WRKSRC}/doc/man${f:E}/${f} \ + ${DESTDIR}${PREFIX}/${PKGMANDIR}/man${f:E}/${f} +.endfor +# Resolve conflict with devel/man-pages +.for f in \ + security.2 + ${INSTALL_MAN} ${WRKSRC}/doc/man${f:E}/${f} \ + ${DESTDIR}${PREFIX}/${PKGMANDIR}/man${f:E}/cint_${f} +.endfor + +.include "../../mk/readline.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/cint/PLIST b/lang/cint/PLIST index 42b30540b1c..a7ad01a65c2 100644 --- a/lang/cint/PLIST +++ b/lang/cint/PLIST @@ -1,9 +1,306 @@ -@comment $NetBSD: PLIST,v 1.6 2009/06/14 18:03:29 joerg Exp $ +@comment $NetBSD: PLIST,v 1.7 2016/09/28 10:00:27 kamil Exp $ bin/cint bin/makecint cint/G__ci.h -cint/MAKEINFO cint/cint +cint/demo/README.txt +cint/demo/Win32App/TestApp/ReadMe.txt +cint/demo/Win32App/TestApp/StdAfx.cpp +cint/demo/Win32App/TestApp/StdAfx.h +cint/demo/Win32App/TestApp/TestApp.aps +cint/demo/Win32App/TestApp/TestApp.cpp +cint/demo/Win32App/TestApp/TestApp.dsp +cint/demo/Win32App/TestApp/TestApp.dsw +cint/demo/Win32App/TestApp/TestApp.h +cint/demo/Win32App/TestApp/TestApp.ico +cint/demo/Win32App/TestApp/TestApp.plg +cint/demo/Win32App/TestApp/TestApp.rc +cint/demo/Win32App/TestApp/resource.h +cint/demo/Win32App/TestApp/script.cxx +cint/demo/Win32App/TestApp/small.ico +cint/demo/Win32App/graph01/CompiledLib.c +cint/demo/Win32App/graph01/CompiledLib.h +cint/demo/Win32App/graph01/G__clink.c +cint/demo/Win32App/graph01/G__clink.h +cint/demo/Win32App/graph01/README.txt +cint/demo/Win32App/graph01/Resource.rc +cint/demo/Win32App/graph01/Script.c +cint/demo/Win32App/graph01/StdAfx.h +cint/demo/Win32App/graph01/WinMain.c +cint/demo/Win32App/graph01/WndProc.c +cint/demo/Win32App/graph01/WndProc.h +cint/demo/Win32App/graph01/app.ico +cint/demo/Win32App/graph01/chapter24.dsp +cint/demo/Win32App/graph01/chapter24.dsw +cint/demo/Win32App/graph01/graph01.dsp +cint/demo/Win32App/graph01/graph01.dsw +cint/demo/Win32App/graph01/resource.h +cint/demo/Win32App/graph01/small.ico +cint/demo/debug/README.txt +cint/demo/debug/debug.c +cint/demo/debug/debug2.com +cint/demo/debug/debug2.cxx +cint/demo/errpipe/README.txt +cint/demo/errpipe/errpipe.cxx +cint/demo/errpipe/errpipe.h +cint/demo/errpipe/setup +cint/demo/exception/Makefile +cint/demo/exception/README.txt +cint/demo/exception/ehdemo.cxx +cint/demo/exception/ehdemo.h +cint/demo/exception/setup +cint/demo/exception/setup.bat +cint/demo/exception/setupbc.bat +cint/demo/gl/README.txt +cint/demo/gl/display0.h +cint/demo/gl/display1.h +cint/demo/gl/display2.h +cint/demo/gl/make0 +cint/demo/gl/test0.c +cint/demo/gl/test1.c +cint/demo/gl/test2.c +cint/demo/gl/testall +cint/demo/graphs/FFT.c +cint/demo/graphs/README.txt +cint/demo/graphs/datafile +cint/demo/graphs/dft.c +cint/demo/graphs/eular.c +cint/demo/graphs/fir.c +cint/demo/graphs/fir2.c +cint/demo/graphs/jitter.c +cint/demo/graphs/modulation.c +cint/demo/graphs/sin.c +cint/demo/graphs/sin123.c +cint/demo/graphs/skineffect.c +cint/demo/graphs/stripline.c +cint/demo/graphs/testall +cint/demo/intprt_cint/CINT +cint/demo/intprt_cint/CINT.bat +cint/demo/intprt_cint/README +cint/demo/intprt_cint/cint.sh +cint/demo/intprt_cint/simple.c +cint/demo/intprt_cint/simple.cxx +cint/demo/intprt_cint/testmain.c +cint/demo/ipc/README.txt +cint/demo/ipc/common.cxx +cint/demo/ipc/keyfile +cint/demo/ipc/proc1.cxx +cint/demo/ipc/proc2.cxx +cint/demo/makecint/Array/Array.C +cint/demo/makecint/Array/Array.h +cint/demo/makecint/Array/Fundament.C +cint/demo/makecint/Array/Fundament.h +cint/demo/makecint/Array/Makefile +cint/demo/makecint/Array/README.txt +cint/demo/makecint/Array/bcdll.bat +cint/demo/makecint/Array/inherit.C +cint/demo/makecint/Array/loopcompile.c +cint/demo/makecint/Array/loopcompile0.c +cint/demo/makecint/Array/loopcompile1.c +cint/demo/makecint/Array/scdll.bat +cint/demo/makecint/Array/scsetup.bat +cint/demo/makecint/Array/setup +cint/demo/makecint/Array/setup.bat +cint/demo/makecint/Array/setupdll +cint/demo/makecint/Array/setupdll.bat +cint/demo/makecint/Array/test.C +cint/demo/makecint/Complex/Complex.C +cint/demo/makecint/Complex/Complex.h +cint/demo/makecint/Complex/Makefile +cint/demo/makecint/Complex/README.txt +cint/demo/makecint/Complex/bcdll.bat +cint/demo/makecint/Complex/scdll.bat +cint/demo/makecint/Complex/scsetup.bat +cint/demo/makecint/Complex/setup +cint/demo/makecint/Complex/setup.bat +cint/demo/makecint/Complex/setupdll +cint/demo/makecint/Complex/setupdll.bat +cint/demo/makecint/Complex/temp.C +cint/demo/makecint/Complex/test.C +cint/demo/makecint/Complex/vcdll.bat +cint/demo/makecint/Complex/vcsetup.bat +cint/demo/makecint/DArray/DArray.C +cint/demo/makecint/DArray/DArray.h +cint/demo/makecint/DArray/Makefile +cint/demo/makecint/DArray/README.txt +cint/demo/makecint/DArray/bcdll.bat +cint/demo/makecint/DArray/scdll.bat +cint/demo/makecint/DArray/scsetup.bat +cint/demo/makecint/DArray/setup +cint/demo/makecint/DArray/setup.bat +cint/demo/makecint/DArray/setupdll +cint/demo/makecint/DArray/setupdll.bat +cint/demo/makecint/DArray/test.C +cint/demo/makecint/KRcc/Complex.c +cint/demo/makecint/KRcc/Complex.h +cint/demo/makecint/KRcc/Makefile +cint/demo/makecint/KRcc/README.txt +cint/demo/makecint/KRcc/scdll.bat +cint/demo/makecint/KRcc/scsetup.bat +cint/demo/makecint/KRcc/setup +cint/demo/makecint/KRcc/setup.bat +cint/demo/makecint/KRcc/setupdll +cint/demo/makecint/KRcc/setupdll.bat +cint/demo/makecint/KRcc/stub.c +cint/demo/makecint/KRcc/stub.h +cint/demo/makecint/KRcc/test.c +cint/demo/makecint/README.txt +cint/demo/makecint/ReadFile/Common.h +cint/demo/makecint/ReadFile/Makefile +cint/demo/makecint/ReadFile/README.txt +cint/demo/makecint/ReadFile/ReadFile.C +cint/demo/makecint/ReadFile/ReadFile.h +cint/demo/makecint/ReadFile/scdll.bat +cint/demo/makecint/ReadFile/scsetup.bat +cint/demo/makecint/ReadFile/setup +cint/demo/makecint/ReadFile/setup.bat +cint/demo/makecint/ReadFile/setupdll +cint/demo/makecint/ReadFile/setupdll.bat +cint/demo/makecint/ReadFile/test.C +cint/demo/makecint/Stub/Makefile +cint/demo/makecint/Stub/README.txt +cint/demo/makecint/Stub/Src.C +cint/demo/makecint/Stub/Src.h +cint/demo/makecint/Stub/Stub.C +cint/demo/makecint/Stub/Stub.h +cint/demo/makecint/Stub/scdll.bat +cint/demo/makecint/Stub/scsetup.bat +cint/demo/makecint/Stub/setup +cint/demo/makecint/Stub/setup.bat +cint/demo/makecint/Stub/setupdll +cint/demo/makecint/Stub/setupdll.bat +cint/demo/makecint/Stub2/Make1 +cint/demo/makecint/Stub2/Make2 +cint/demo/makecint/Stub2/README.txt +cint/demo/makecint/Stub2/compiled.cxx +cint/demo/makecint/Stub2/compiled.h +cint/demo/makecint/Stub2/dmy.h +cint/demo/makecint/Stub2/main.cxx +cint/demo/makecint/Stub2/setup +cint/demo/makecint/Stub2/setup.bat +cint/demo/makecint/Stub2/setupcygwin +cint/demo/makecint/Stub2/setuphp +cint/demo/makecint/Stub2/stub.h +cint/demo/makecint/UserMain/README.txt +cint/demo/makecint/UserMain/UserMain.cxx +cint/demo/makecint/UserMain/UserMain.h +cint/demo/makecint/UserMain/script.cxx +cint/demo/makecint/UserMain/setup +cint/demo/makecint/UserMain/setup.bat +cint/demo/makecint/UserMain/setupbc.bat +cint/demo/makecint/exception/README.txt +cint/demo/makecint/exception/eh.cxx +cint/demo/makecint/exception/eh.h +cint/demo/makecint/exception/setup +cint/demo/makecint/p2f/Makefile +cint/demo/makecint/p2f/README.txt +cint/demo/makecint/p2f/p2f.C +cint/demo/makecint/p2f/p2f.h +cint/demo/makecint/p2f/scsetup.bat +cint/demo/makecint/p2f/setup +cint/demo/makecint/p2f/setup.bat +cint/demo/makecint/p2f/test.C +cint/demo/makecint/stl/Makefile +cint/demo/makecint/stl/sample.h +cint/demo/makecint/stl/setup +cint/demo/makecint/stl/setup.bat +cint/demo/makecint/stl/setupbc.bat +cint/demo/makecint/stl/test.cxx +cint/demo/makecint/testall +cint/demo/makecint/testalldll +cint/demo/mthread/README.txt +cint/demo/mthread/fork.cxx +cint/demo/mthread/mtlib.h +cint/demo/mthread/mtmain.cxx +cint/demo/mthread/ptlib.h +cint/demo/mthread/ptmain.cxx +cint/demo/mthread/testall +cint/demo/multilibcint/README.txt +cint/demo/multilibcint/main.cxx +cint/demo/multilibcint/mt.c +cint/demo/multilibcint/mt.h +cint/demo/multilibcint/setup +cint/demo/multilibcint/setup.bat +cint/demo/multilibcint/test1.cxx +cint/demo/multilibcint/test2.cxx +cint/demo/perlawk/README +cint/demo/perlawk/data +cint/demo/perlawk/parseplot.c +cint/demo/posix/readdir.cxx +cint/demo/qt/README.txt +cint/demo/qt/cannon.cpp +cint/demo/qt/cannon.h +cint/demo/qt/lcdrange.cpp +cint/demo/qt/lcdrange.h +cint/demo/qt/moc_cannon.cpp +cint/demo/qt/qcompactstyle.h +cint/demo/qt/qtstatic.cxx +cint/demo/qt/test0.cxx +cint/demo/qt/test1.cxx +cint/demo/qt/test2.cxx +cint/demo/qt/test3.cxx +cint/demo/qt/test4.cxx +cint/demo/qt/test5.cxx +cint/demo/qt/test6.cxx +cint/demo/qt/test7.bat +cint/demo/qt/test7.cxx +cint/demo/qt/test7.h +cint/demo/qt/test8.bat +cint/demo/qt/test8.cxx +cint/demo/qt/test8.h +cint/demo/qt/test9.bat +cint/demo/qt/test9.cxx +cint/demo/simple/HelloWorld.c +cint/demo/simple/HelloWorld.cxx +cint/demo/simple/NativeCalc.c +cint/demo/simple/README.txt +cint/demo/simple/access0.c +cint/demo/simple/array.c +cint/demo/simple/csum.c +cint/demo/simple/inherit1.c +cint/demo/simple/init.c +cint/demo/simple/oprovld.c +cint/demo/simple/oprovld0.c +cint/demo/simple/scope0.c +cint/demo/simple/staticmem0.c +cint/demo/simple/template0.c +cint/demo/simple/template2.c +cint/demo/simple/text2tex.c +cint/demo/simple/virtualfunc1.c +cint/demo/stl/README.txt +cint/demo/stl/array2.cxx +cint/demo/stl/array4.cxx +cint/demo/stl/deque0.cxx +cint/demo/stl/deque1.cxx +cint/demo/stl/deque1i.cxx +cint/demo/stl/list0.cxx +cint/demo/stl/list1.cxx +cint/demo/stl/list2.cxx +cint/demo/stl/list3.cxx +cint/demo/stl/list4.cxx +cint/demo/stl/map0.cxx +cint/demo/stl/stl0.cxx +cint/demo/stl/stl1.cxx +cint/demo/stl/stl2.cxx +cint/demo/stl/stl3.cxx +cint/demo/stl/stl3x.cxx +cint/demo/stl/stl4.cxx +cint/demo/stl/stl5.cxx +cint/demo/stl/string0.cxx +cint/demo/stl/testall +cint/demo/stl/vec0.cxx +cint/demo/stl/vec1.cxx +cint/demo/stl/vec1s.cxx +cint/demo/stl/vec1u.cxx +cint/demo/stl/vec2.cxx +cint/demo/stl/vec3.cxx +cint/demo/stl/vec3t.cxx +cint/demo/stl/vec4.cxx +cint/demo/tcpip/README.txt +cint/demo/tcpip/client.cxx +cint/demo/tcpip/server.cxx +cint/demo/xlib/README.txt +cint/demo/xlib/test.c cint/include/Common.h cint/include/GL/gl.h cint/include/GL/glu.h @@ -12,11 +309,9 @@ cint/include/GL/xmesa.h cint/include/README.txt cint/include/ReadF.C cint/include/ReadF.cxx -cint/include/ReadF.dll cint/include/ReadF.h cint/include/RegE.C cint/include/RegE.cxx -cint/include/RegE.dll cint/include/RegE.h cint/include/X11/Xlib.h cint/include/X11/Xutil.h @@ -31,7 +326,6 @@ cint/include/_stdexcept cint/include/_stdexcept.h cint/include/api.h cint/include/array.c -cint/include/array.dll cint/include/array.h cint/include/arrayiostream.h cint/include/assert.h @@ -39,13 +333,11 @@ cint/include/bool cint/include/bool.h cint/include/boolean.h cint/include/carray.c -cint/include/carray.dll cint/include/carray.h cint/include/cassert cint/include/cctype cint/include/cerrno cint/include/cfloat -cint/include/cintsock.dll cint/include/ciso646 cint/include/climits cint/include/clocale @@ -73,7 +365,6 @@ cint/include/exception cint/include/exception.h cint/include/fcntl.h cint/include/fft.c -cint/include/fft.dll cint/include/fft.h cint/include/float.h cint/include/fstream @@ -83,7 +374,6 @@ cint/include/iomanip cint/include/iomanip.h cint/include/iosenum.cxx cint/include/iosenum.h -cint/include/iosenum.h.bk cint/include/iosenum.win32 cint/include/iosfwd cint/include/iosfwd.h @@ -94,23 +384,20 @@ cint/include/limits cint/include/limits.h cint/include/locale cint/include/locale.h -cint/include/long.dll cint/include/lsm.c -cint/include/lsm.dll cint/include/lsm.h cint/include/math.h cint/include/matrix.cxx -cint/include/matrix.dll cint/include/matrix.h cint/include/matrixstream.h cint/include/matrixstream.hi cint/include/mkincld cint/include/mkincld.c +cint/include/mkincld.o cint/include/new cint/include/new.h cint/include/ostream cint/include/platform.h -${PLIST.threads}cint/include/pthread.dll cint/include/pthread.h cint/include/readfile.h cint/include/regex.h @@ -121,13 +408,10 @@ cint/include/socket.h cint/include/spice.h cint/include/sstream cint/include/statistics.c -cint/include/statistics.dll cint/include/statistics.h cint/include/stdarg.h -cint/include/stdcxxfunc.dll cint/include/stddef.h cint/include/stdexcept -cint/include/stdfunc.dll cint/include/stdio.h cint/include/stdiostream.h cint/include/stdlib.h @@ -139,14 +423,11 @@ cint/include/strstream cint/include/strstream.h cint/include/sys/cdefs.h cint/include/sys/file.h -cint/include/sys/ipc.dll cint/include/sys/ipc.h cint/include/sys/msg.h cint/include/sys/sem.h cint/include/sys/shm.h cint/include/sys/stat.h -cint/include/sys/types.h -cint/include/systypes.h cint/include/termios.h cint/include/time.h cint/include/timespec.h @@ -156,8 +437,8 @@ cint/include/unistd.h cint/include/windows.h cint/include/winsock.h cint/include/xgraph.c -cint/include/xgraph.dll cint/include/xygraphbuf.h +cint/lib/libcint.so cint/lib/prec_stl/README.txt cint/lib/prec_stl/algorithm cint/lib/prec_stl/bitset @@ -222,12 +503,9 @@ cint/stl/bitset cint/stl/bool cint/stl/bstring.h cint/stl/bvector.h -cint/stl/complex.dll cint/stl/defalloc.h cint/stl/deque -cint/stl/deque.dll cint/stl/deque.h -cint/stl/exception.dll cint/stl/faralloc.h cint/stl/fdeque.h cint/stl/flist.h @@ -252,7 +530,6 @@ cint/stl/lbvector.h cint/stl/ldeque.h cint/stl/limits cint/stl/list -cint/stl/list.dll cint/stl/list.h cint/stl/llist.h cint/stl/lmap.h @@ -261,16 +538,11 @@ cint/stl/lmultset.h cint/stl/lngalloc.h cint/stl/lset.h cint/stl/map -cint/stl/map.dll cint/stl/map.h -cint/stl/map2.dll cint/stl/memory cint/stl/multimap -cint/stl/multimap.dll cint/stl/multimap.h -cint/stl/multimap2.dll cint/stl/multiset -cint/stl/multiset.dll cint/stl/multiset.h cint/stl/neralloc.h cint/stl/nmap.h @@ -282,17 +554,11 @@ cint/stl/pair cint/stl/pair.h cint/stl/projectn.h cint/stl/queue -cint/stl/queue.dll -cint/stl/random.cpp cint/stl/set -cint/stl/set.dll cint/stl/set.h cint/stl/stack -cint/stl/stack.dll cint/stl/stack.h -cint/stl/stdexcept.dll cint/stl/string -cint/stl/string.dll cint/stl/tempbuf.cpp cint/stl/tempbuf.h cint/stl/teststl @@ -302,9 +568,15 @@ cint/stl/utility cint/stl/utility.h cint/stl/valarray cint/stl/vector -cint/stl/vector.dll cint/stl/vector.h -cint/stl/vectorbool.dll +man/man1/cint.1 +man/man1/makecint.1 +man/man2/cint_security.2 +man/man2/garbage.2 +man/man2/unique.2 +man/man3/array.h.3 +man/man3/fft.h.3 +man/man3/statistics.h.3 share/doc/cint/bytecode.txt share/doc/cint/cint.txt share/doc/cint/cintapi.txt @@ -315,11 +587,3 @@ share/doc/cint/limitnum.txt share/doc/cint/makecint.txt share/doc/cint/message.txt share/doc/cint/ref.txt -man/man1/cint.1 -man/man1/makecint.1 -man/man2/garbage.2 -man/man2/security.2 -man/man2/unique.2 -man/man3/array.h.3 -man/man3/fft.h.3 -man/man3/statistics.h.3 diff --git a/lang/cint/distinfo b/lang/cint/distinfo index a29c792297d..207ac9d5513 100644 --- a/lang/cint/distinfo +++ b/lang/cint/distinfo @@ -1,20 +1,23 @@ -$NetBSD: distinfo,v 1.9 2015/12/29 23:34:44 dholland Exp $ +$NetBSD: distinfo,v 1.10 2016/09/28 10:00:27 kamil Exp $ -SHA1 (cint-5.15.174/cint5.15.tar.gz) = 7061acb210dafb86413536dc91e0aa24e9ef3ee9 -RMD160 (cint-5.15.174/cint5.15.tar.gz) = 4d403e150fc290feba38785b385f282a28d15dcd -SHA512 (cint-5.15.174/cint5.15.tar.gz) = a73e7c5ba41573ad9bc04a9c7aa85c234b5f2ab4b255cc52e2ac6792cc8d1c0592748ba963829892676ab8b432c9ca09ebabfa0986e25fddb58fbb57638e67b1 -Size (cint-5.15.174/cint5.15.tar.gz) = 1983029 bytes -SHA1 (patch-aa) = 09387ab7fe839e7215ae932c4a84a6636f752de6 -SHA1 (patch-ab) = 920776d9800dd4ae7193c8f57965dfc29ee1eb8a -SHA1 (patch-ac) = 89ed3ebac70375887870e84e6643c70514acd784 -SHA1 (patch-ad) = 4d585ca0e018dd6f6a4699ae917d25be18d41b0c -SHA1 (patch-ae) = 1933b54adbef64be0ba18c3d50e76007d66a26e4 -SHA1 (patch-af) = 64d9c3632d1cc594e168909b99f65844d61442d8 -SHA1 (patch-ag) = 27bd14035b54e5fd503b03ec4a02e1c013ab8c52 -SHA1 (patch-ah) = 8a1d07741ce53b7dcf22c0812df046174ad60e97 -SHA1 (patch-ai) = 704074e9f8e030d8dc901f5292030bd50f8caf97 -SHA1 (patch-aj) = 0d6909557ee54d38ee89868c3c622cc61236aea6 -SHA1 (patch-ak) = 46511e389291847e0629284f71dd9e8b5816e187 -SHA1 (patch-al) = 8740f759d06fe7cd5e7cb4ab59a81a9a119c30f9 -SHA1 (patch-am) = e5da0ceedd9019f5acdc99233b153392003b8be2 -SHA1 (patch-an) = 8b0fed4a9f5b16ec00ced4644cb375c200b03c88 +SHA1 (cint-5.16.19-source.tar.gz) = 22307e50b4414f4e6e70d791d3ccfe2cc2163f59 +RMD160 (cint-5.16.19-source.tar.gz) = ff7deb0cdf5534fb8849eaf5febf9e57117066ff +SHA512 (cint-5.16.19-source.tar.gz) = ae96247dc62f7ab27d514b302cd836a9bed07ed24adc664224c063a70e1305a335e01031e0dd18646d3d7215593590a8d5100c4236aba08064bbcf0ece531c02 +Size (cint-5.16.19-source.tar.gz) = 1975329 bytes +SHA1 (patch-Makefile) = 2bbed612d93d5a86a0e331d40d8be029d50e93a0 +SHA1 (patch-configure) = 281dd6f18d1d9528e0c993175ef32571c49e6ea8 +SHA1 (patch-lib_posix_posix.h) = 9163821e7df73848cc05f5a3a5c172d20d46504c +SHA1 (patch-src_Method.cxx) = ee84d79c15f6951c07527e8c000c0d8eb60fdc71 +SHA1 (patch-src_Type.cxx) = ca273e0e7b7f983abfea2f68d9ec3434921eaaa3 +SHA1 (patch-src_bc__reader.h) = f768471d096a7e9401f7322f960119dd0f92769b +SHA1 (patch-src_gcc3strm.cxx) = d0003a4fbfbe85080eb1770376c2bcaec562fdb8 +SHA1 (patch-src_v6__loadfile.cxx) = 08557776074c7bea3b82bf1a6ead5a4c1863e042 +SHA1 (patch-src_v6__macro.cxx) = 932f3177a6f6704aeca95d511a2730b30f3d1293 +SHA1 (patch-src_v6__newlink.cxx) = c481f18f470246424944fad6ead167c7e8c00bef +SHA1 (patch-src_v6__parse.cxx) = c2e3f9fd599d607ea538c0fb8fe12eccf96fb936 +SHA1 (patch-src_v6__pcode.cxx) = 430706306baa0e9bb3f3631bdae81733f65d7815 +SHA1 (patch-tool_INSTALLBIN) = 76c5778cbf2f10c48a9e859837f045d2a7ac807d +SHA1 (patch-tool_ifdef_Makefile.base) = dfc90a0ea0a7fb87a49ad057b928d39c67aec410 +SHA1 (patch-tool_ifdef_get.c) = 6719537bd515260095a7d15a2e870df3ccd244eb +SHA1 (patch-tool_ifdef_ifdef.cxx) = 62770d0fb6556ac2efc16f692c15c6acc38174ab +SHA1 (patch-tool_makecint.cxx) = b81d05e92dd089ad7a4d85160266fa3d19a1dab4 diff --git a/lang/cint/patches/patch-Makefile b/lang/cint/patches/patch-Makefile new file mode 100644 index 00000000000..6e0dd60adf0 --- /dev/null +++ b/lang/cint/patches/patch-Makefile @@ -0,0 +1,20 @@ +$NetBSD: patch-Makefile,v 1.1 2016/09/28 10:00:27 kamil Exp $ + +Fix shell syntax + +--- Makefile.orig 2006-11-24 08:41:26.000000000 +0000 ++++ Makefile +@@ -38,11 +38,11 @@ include/iosenum.h : cint$(G__CFG_EXEEXT) + 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/patches/patch-aa b/lang/cint/patches/patch-aa deleted file mode 100644 index 1db764bddea..00000000000 --- a/lang/cint/patches/patch-aa +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-aa,v 1.4 2015/12/29 23:34:44 dholland Exp $ - -Configure for pkgsrc. - ---- platform/netbsd.orig 2004-05-09 04:40:32.000000000 +0200 -+++ platform/netbsd -@@ -19,8 +19,8 @@ CPPPREP = g++ -E - CCDLLOPT = -fPIC - LDDLLOPT = -shared - OPTIMIZE = -O --LDOPT = -lm -ltermcap -lbsd -ldl -rdynamic --SYSMACRO = -DG__REGEXP -DG__SHAREDLIB -DG__OSFDLL -+LDOPT = -lm -ltermcap -Wl,--export-dynamic -+SYSMACRO = -DG__REGEXP -DG__SHAREDLIB -DG__OSFDLL -DG__NEWSTDHEADER - OTHMACRO = - SYSIPATH = - -@@ -30,7 +30,7 @@ CINTLIB = $(CINTSYSDIR)/src/G__ci.a - READLINEA = $(CINTSYSDIR)/readline/libreadline.a - APIO = Api.o Class.o BaseCls.o Type.o DataMbr.o Method.o MethodAr.o CallFunc.o Typedf.o Apiif.o Token.o - RANLIB = /usr/bin/ranlib --STDLIBS = libstrm.o stdstrct.o -+STDLIBS = gcc3strm.o stdstrct.o - PLATFORM = - - # source code postfix diff --git a/lang/cint/patches/patch-ab b/lang/cint/patches/patch-ab deleted file mode 100644 index aec76f5a70e..00000000000 --- a/lang/cint/patches/patch-ab +++ /dev/null @@ -1,65 +0,0 @@ -$NetBSD: patch-ab,v 1.6 2015/12/29 23:34:44 dholland Exp $ - -Avoid energizer-bunny-makefiles; stop on error. - ---- Makefile~ 2005-05-06 04:49:09.000000000 -0400 -+++ Makefile 2008-09-04 23:42:47.000000000 -0400 -@@ -91,7 +91,7 @@ include/iosenum.h : cint include/stdio.h - then \ - touch include/iosenum.h; \ - else \ -- (cd include;rm -f stdfunc.dll;../cint -I. iosenum.cxx); \ -+ (cd include;rm -f stdfunc.dll;../cint -I. iosenum.cxx) || exit 1; \ - fi - echo > done - -@@ -110,10 +110,10 @@ makecint : tool/makecint.c - include/stdio.h : include/mkincld.c - $(CC) -I.. $(MACRO) -c -o include/mkincld.o include/mkincld.c - $(LD) $(OPTIMIZE) include/mkincld.o $(LDOPT) -o include/mkincld -- (cd include;./mkincld) -+ (cd include;./mkincld) || exit 1 - - # $(CC) -I.. $(MACRO) -o include/mkincld include/mkincld.c --# (cd include;./mkincld) -+# (cd include;./mkincld) || exit 1 - - ############################################################## - # Link cint executable -@@ -134,22 +134,22 @@ main/G__setup.o : main/G__setup.c G__ci. - # dependency file - ############################################################## - $(CINTSYSDIR)/readline/libreadline.a : readline/*.c readline/*.h -- (cd readline ; make) -+ (cd readline ; make) || exit 1 - - ############################################################## - # Compile cint interpreter core library - ############################################################## - $(CINTSYSDIR)/src/G__ci.a : G__ci.h src/*.c src/*.cxx *.h src/*.h $(READLINEA) -- (cd src ; make CINTSYSDIR=$(CINTSYSDIR) ) -+ (cd src ; make CINTSYSDIR=$(CINTSYSDIR) ) || exit 1 - - $(CINTSYSDIR)/libcint.so : G__ci.h src/*.c src/*.cxx *.h src/*.h $(READLINEA) -- (cd src ; make CINTSYSDIR=$(CINTSYSDIR) $(CINTSYSDIR)/libcint.so) -+ (cd src ; make CINTSYSDIR=$(CINTSYSDIR) $(CINTSYSDIR)/libcint.so) || exit 1 - - $(CINTSYSDIR)/libcint.sl : G__ci.h src/*.c src/*.cxx *.h src/*.h $(READLINEA) -- (cd src ; make CINTSYSDIR=$(CINTSYSDIR) $(CINTSYSDIR)/libcint.sl) -+ (cd src ; make CINTSYSDIR=$(CINTSYSDIR) $(CINTSYSDIR)/libcint.sl) || exit 1 - - $(CINTSYSDIR)/libcint.dll : G__ci.h src/*.c src/*.cxx *.h src/*.h $(READLINEA) -- (cd src ; make CINTSYSDIR=$(CINTSYSDIR) $(CINTSYSDIR)/libcint.dll) -+ (cd src ; make CINTSYSDIR=$(CINTSYSDIR) $(CINTSYSDIR)/libcint.dll) || exit 1 - - ############################################################## - # Compile cint main function. -@@ -164,7 +164,7 @@ $(CINTSYSDIR)/main/G__main.o : main/G__m - # Cleanup - ############################################################## - clean : -- $(RM) main/*.o cint done core include/mkincld include/stdio.h makecint include/iosenum.h ; (cd src; make clean) ; (cd readline; make clean) -+ $(RM) main/*.o cint done core include/mkincld include/stdio.h makecint include/iosenum.h ; (cd src; make clean) || exit 1 ; (cd readline; make clean) || exit 1 - - cleanbin : - $(RM) main/*.o src/*.o $(CINTLIB) $(CINT_V6) diff --git a/lang/cint/patches/patch-ac b/lang/cint/patches/patch-ac deleted file mode 100644 index 9311b7976cd..00000000000 --- a/lang/cint/patches/patch-ac +++ /dev/null @@ -1,44 +0,0 @@ -$NetBSD: patch-ac,v 1.2 2015/12/29 23:34:44 dholland Exp $ - -Use standard headers. -Handle BSDs like Linux. -Test the return value of rindex() properly. -XXX: adjust to use strrchr. -Fix build with recent readline. - ---- readline/readline.c.orig 2005-05-06 04:48:54.000000000 -0400 -+++ readline/readline.c 2008-09-05 00:23:42.000000000 -0400 -@@ -31,11 +31,13 @@ static char *xmalloc (), *xrealloc (); - #endif /* STATIC_MALLOC */ - - /* patched by gotom for Linux */ --#ifdef __linux__ -+#if defined(__linux__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) - #define VOID_SIGHANDLER - #endif - - #include <stdio.h> -+#include <stdlib.h> -+#include <string.h> - #include <sys/types.h> - #include <fcntl.h> - #include <sys/file.h> -@@ -2631,7 +2633,7 @@ alphabetic (c) - return (1); - - if (allow_pathname_alphabetic_chars) -- return ((int)rindex (pathname_alphabetic_chars, c)); -+ return (rindex (pathname_alphabetic_chars, c) != NULL); - else - return (0); - } -@@ -3555,7 +3557,8 @@ Function *rl_completion_entry_function = - If this function exists and returns NULL then call the value of - rl_completion_entry_function to try to match, otherwise use the - array of strings returned. */ --Function *rl_attempted_completion_function = (Function *)NULL; -+/*Function *rl_attempted_completion_function = (Function *)NULL;*/ -+char **(*rl_attempted_completion_function)() = NULL; - - /* Local variable states what happened during the last completion attempt. */ - static int completion_changed_buffer = 0; diff --git a/lang/cint/patches/patch-ad b/lang/cint/patches/patch-ad deleted file mode 100644 index 510b93bc6b7..00000000000 --- a/lang/cint/patches/patch-ad +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ad,v 1.2 2015/12/29 23:34:44 dholland Exp $ - -Use standard headers. - ---- readline/vi_mode.c~ 2005-05-06 04:48:54.000000000 -0400 -+++ readline/vi_mode.c 2008-09-04 23:48:53.000000000 -0400 -@@ -30,6 +30,7 @@ - #if defined (VI_MODE) - - #include <stdio.h> -+#include <string.h> - - #if defined (__GNUC__) - # define alloca __builtin_alloca diff --git a/lang/cint/patches/patch-ae b/lang/cint/patches/patch-ae deleted file mode 100644 index 715b1879265..00000000000 --- a/lang/cint/patches/patch-ae +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ae,v 1.2 2015/12/29 23:34:44 dholland Exp $ - -Use standard headers. - ---- readline/history.c~ 2005-05-06 04:48:54.000000000 -0400 -+++ readline/history.c 2008-09-04 23:49:20.000000000 -0400 -@@ -32,6 +32,7 @@ static char *xmalloc (), *xrealloc (); - #endif - - #include <stdio.h> -+#include <string.h> - #include <sys/types.h> - #include <sys/file.h> - #include <sys/stat.h> diff --git a/lang/cint/patches/patch-af b/lang/cint/patches/patch-af deleted file mode 100644 index 16b754054ed..00000000000 --- a/lang/cint/patches/patch-af +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-af,v 1.2 2015/12/29 23:34:44 dholland Exp $ - -Use standard headers. - ---- malloc/xmalloc.c~ 2005-05-06 04:48:51.000000000 -0400 -+++ malloc/xmalloc.c 2008-09-04 23:50:51.000000000 -0400 -@@ -20,6 +20,7 @@ - Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ - - #include <stdio.h> -+#include <stdlib.h> - - static void memory_error_and_abort (); - diff --git a/lang/cint/patches/patch-ag b/lang/cint/patches/patch-ag deleted file mode 100644 index 87d2aaac2c6..00000000000 --- a/lang/cint/patches/patch-ag +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-ag,v 1.2 2015/12/29 23:34:44 dholland Exp $ - -Use standard headers. -Fix declaration typo. -Fix build with recent readline. - ---- glob/tilde.c.orig 2005-05-06 04:48:48.000000000 -0400 -+++ glob/tilde.c 2008-09-05 00:23:17.000000000 -0400 -@@ -27,6 +27,8 @@ - # endif - #endif - -+#include <string.h> -+#include <stdlib.h> - #include <pwd.h> - - #ifndef savestring -@@ -41,7 +43,7 @@ typedef int Function (); - #if defined (TEST) - static char *xmalloc (), *xrealloc (); - #else --extern char *malloc (), *xrealloc (); -+extern char *xmalloc (), *xrealloc (); - #endif /* TEST */ - - /* The default value of tilde_additional_prefixes. This is set to -@@ -60,7 +62,8 @@ static char *default_suffixes[] = - standard meaning for expanding a tilde fails. The function is called - with the text (sans tilde, as in "foo"), and returns a malloc()'ed string - which is the expansion, or a NULL pointer if there is no expansion. */ --Function *tilde_expansion_failure_hook = (Function *)NULL; -+/*Function *tilde_expansion_failure_hook = (Function *)NULL;*/ -+char *(*tilde_expansion_failure_hook)(char *) = NULL; - - /* When non-null, this is a NULL terminated array of strings which - are duplicates for a tilde prefix. Bash uses this to expand diff --git a/lang/cint/patches/patch-ah b/lang/cint/patches/patch-ah deleted file mode 100644 index f479a5fe4c2..00000000000 --- a/lang/cint/patches/patch-ah +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ah,v 1.2 2015/12/29 23:34:44 dholland Exp $ - -Silence integer/pointer size warnings. - ---- src/bc_exec.cxx~ 2005-05-06 11:37:47.000000000 -0400 -+++ src/bc_exec.cxx 2008-09-04 23:52:56.000000000 -0400 -@@ -35,7 +35,7 @@ extern "C" int G__bc_exec_virtualbase_by - - // TODO, below is a dead copy of virtual_bytecode which may not work - -- int vtagnum = (int)funcname; // tagnum of given pointer -+ int vtagnum = (int)(intptr_t)funcname; // tagnum of given pointer - int vtblindex = hash&0xffff; // virtual function table index - int vbasetagnum = hash/0x10000; // vbasetagnum - int voffset=G__struct.virtual_offset[vtagnum]; // offset for true tagnum info -@@ -100,7 +100,7 @@ extern "C" int G__bc_exec_virtual_byteco - ,int hash // vtblindex,basetagnum - ) { - -- int vtagnum = (int)funcname; // tagnum of given pointer -+ int vtagnum = (int)(intptr_t)funcname; // tagnum of given pointer - int vtblindex = hash&0xffff; // virtual function table index - int vbasetagnum = hash/0x10000; // vbasetagnum - int voffset=G__struct.virtual_offset[vtagnum]; // offset for true tagnum info diff --git a/lang/cint/patches/patch-aj b/lang/cint/patches/patch-aj deleted file mode 100644 index 225c12a3546..00000000000 --- a/lang/cint/patches/patch-aj +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-aj,v 1.2 2015/12/29 23:34:44 dholland Exp $ - -Don't fail in clean. (Is this actually needed?) - ---- tool/ifdef/Makefile.base~ 2005-05-06 04:49:09.000000000 -0400 -+++ tool/ifdef/Makefile.base 2008-09-05 00:10:44.000000000 -0400 -@@ -18,4 +18,4 @@ get.o: get.c - - - clean: -- rm get.o ifdef.o ifdef -+ rm -f get.o ifdef.o ifdef diff --git a/lang/cint/patches/patch-ak b/lang/cint/patches/patch-ak deleted file mode 100644 index 7bb3829e58a..00000000000 --- a/lang/cint/patches/patch-ak +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-ak,v 1.2 2015/12/29 23:34:44 dholland Exp $ - -Fix build with recent readline. - ---- readline/readline.h~ 2005-05-06 04:48:54.000000000 -0400 -+++ readline/readline.h 2008-09-05 00:22:54.000000000 -0400 -@@ -138,7 +138,8 @@ extern Function *rl_ignore_some_completi - If this function exists and returns NULL then call the value of - rl_completion_entry_function to try to match, otherwise use the - array of strings returned. */ --extern Function *rl_attempted_completion_function; -+/*extern Function *rl_attempted_completion_function;*/ -+extern char **(*rl_attempted_completion_function)(); - - /* If non-zero, then this is the address of a function to call just - before readline_internal () prints the first prompt. */ -@@ -164,7 +165,8 @@ extern int rl_show_star; - standard meaning for expanding a tilde fails. The function is called - with the text (sans tilde, as in "foo"), and returns a malloc()'ed string - which is the expansion, or a NULL pointer if there is no expansion. */ --extern Function *tilde_expansion_failure_hook; -+/*extern Function *tilde_expansion_failure_hook;*/ -+extern char *(*tilde_expansion_failure_hook)(char *); - - /* When non-null, this is a NULL terminated array of strings which - are duplicates for a tilde prefix. Bash uses this to expand diff --git a/lang/cint/patches/patch-configure b/lang/cint/patches/patch-configure new file mode 100644 index 00000000000..b7c28fac890 --- /dev/null +++ b/lang/cint/patches/patch-configure @@ -0,0 +1,107 @@ +$NetBSD: patch-configure,v 1.1 2016/09/28 10:00:27 kamil Exp $ + +Don't check for running bash on SunOS. +Add NetBSD support. +Fix readlinelib parameter handling. + +--- configure.orig 2006-11-24 08:30:23.000000000 +0000 ++++ configure +@@ -6,21 +6,9 @@ + # + ############################################################## + # +-# This is a bash script, which works with any reasonable sh. +-# Solaris sh is not, so we have to start bash, and call ourselves again. +- +-[ "x$1" != "x__have_the_proper_shell@" ] && ( \ +-uname -a | grep -i sunos > /dev/null \ +- && (bash $0 __have_the_proper_shell@ "$*") \ +- || (sh $0 __have_the_proper_shell@ "$*") \ +-) +- +-[ "x$1" != "x__have_the_proper_shell@" ] && exit +-shift +- + # 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 netbsd hpux aix msvc7 msvc8 solaris solarisgcc) + + ############################################################# + ### +@@ -102,6 +90,27 @@ function config_linux { + config_GCC_defaults + } + ++function config_netbsdx8664gcc { ++ config_GCC_defaults ++ ++ EXTRA_LIB_DIR=/usr/lib64 ++ CPP="gcc -E -C -m64" ++ CXXFLAGS="-m64 -fPIC ${CXXFLAGS}" ++ CFLAGS="-m64 -fPIC ${CFLAGS}" ++ LDFLAGS="-m64 ${LDFLAGS}" ++ DEFAULTLIBS="-lm -lterminfo" ++} ++ ++function config_netbsd { ++ config_GCC_defaults ++ ++ CPP="gcc -E -C" ++ CXXFLAGS="-fPIC ${CXXFLAGS}" ++ CFLAGS="-fPIC ${CFLAGS}" ++ LDFLAGS="${LDFLAGS}" ++ DEFAULTLIBS="-lm -lterminfo" ++} ++ + function config_linuxx8664gcc { + config_GCC_defaults + +@@ -327,6 +336,7 @@ function guess_arch { + # freebsd*:*:5*) arch=freebsd5 ;; + # freebsd*:*:4*) arch=freebsd4 ;; + # freebsd*:*:*) arch=freebsd ;; ++ netbsd:x86_64:*) arch=netbsdx8664gcc ;; + # hp-ux:ia64:*) arch=hpuxia64acc ;; + # hp-ux:*:*) arch=hpuxacc ;; + # hurd*:*:*) arch=hurddeb ;; +@@ -412,7 +422,7 @@ function processflag_cintex_libdir { + CINTEXLIBDIR=$1 + } + +-function processflag_readlinelib { ++function processflag_readline { + READLINELIB=$1 + BUILDREADLINE= + } +@@ -461,17 +471,22 @@ if [ "$ARCH" = "" ]; then + fi + + if [ "$DEBUG" = "1" ]; then +- LDFLAGS="$LDDBGFLAGS $LDFLAGS" +- SOFLAGS="$SODBGFLAGS $SOFLAGS" +- CFLAGS="$CDBGFLAGS $CFLAGS" +- CXXFLAGS="$CXXDBGFLAGS $CXXFLAGS" ++ LDFLAGS="$LDDBGFLAGS $LDFLAGS $LDFLAGS_ADD" ++ SOFLAGS="$SODBGFLAGS $SOFLAGS $SOFLAGS_ADD" ++ CFLAGS="$CDBGFLAGS $CFLAGS $CFLAGS_ADD" ++ CXXFLAGS="$CXXDBGFLAGS $CXXFLAGS $CXXFLAGS_ADD" + else +- LDFLAGS="$LDOPTFLAGS $LDFLAGS" +- SOFLAGS="$SOOPTFLAGS $SOFLAGS" +- CFLAGS="$COPTFLAGS $CFLAGS" +- CXXFLAGS="$CXXOPTFLAGS $CXXFLAGS" ++ LDFLAGS="$LDOPTFLAGS $LDFLAGS $LDFLAGS_ADD" ++ SOFLAGS="$SOOPTFLAGS $SOFLAGS $SOFLAGS_ADD" ++ CFLAGS="$COPTFLAGS $CFLAGS $CFLAGS_ADD" ++ CXXFLAGS="$CXXOPTFLAGS $CXXFLAGS $CXXFLAGS_ADD" + fi + ++echo LDFLAGS=$LDFLAGS ++echo SOFLAGS=$SOFLAGS ++echo CFLAGS=$CFLAGS ++echo CXXFLAGS=$CXXFLAGS ++ + CMACROS="$CMACROS -DG__HAVE_CONFIG -DG__NOMAKEINFO" + CXXMACROS="$CXXMACROS -DG__HAVE_CONFIG -DG__NOMAKEINFO" + diff --git a/lang/cint/patches/patch-ai b/lang/cint/patches/patch-lib_posix_posix.h index d8081bd0475..41e3de8e397 100644 --- a/lang/cint/patches/patch-ai +++ b/lang/cint/patches/patch-lib_posix_posix.h @@ -1,11 +1,11 @@ -$NetBSD: patch-ai,v 1.2 2015/12/29 23:34:44 dholland Exp $ +$NetBSD: patch-lib_posix_posix.h,v 1.1 2016/09/28 10:00:27 kamil Exp $ -Add NetBSD to list of cases. +Add support for NetBSD ---- lib/posix/posix.h~ 2005-05-06 04:48:49.000000000 -0400 -+++ lib/posix/posix.h 2008-09-05 00:02:39.000000000 -0400 -@@ -272,7 +272,7 @@ extern char *getwd(char *buf); - extern int setpgrp(pid_t _pid,pid_t _pgrp); +--- lib/posix/posix.h.orig 2006-11-28 15:08:01.000000000 +0000 ++++ lib/posix/posix.h +@@ -283,7 +283,7 @@ extern int setpgrp(pid_t _pid,pid_t _pgr + #endif #elif defined(G__SUN) || defined(__sun) extern long setpgrp(void); -#elif defined(G__FBSD)||defined(__FreeBSD__)||defined(G__OBSD)||defined(__OpenBSD__)||((defined(G__alpha)||defined(__alpha))&&defined(G__GNUC))||((defined(G__alpha)||defined(__alpha))&&defined(G__GNUC)) diff --git a/lang/cint/patches/patch-src_Method.cxx b/lang/cint/patches/patch-src_Method.cxx new file mode 100644 index 00000000000..faa49f96f8e --- /dev/null +++ b/lang/cint/patches/patch-src_Method.cxx @@ -0,0 +1,15 @@ +$NetBSD: patch-src_Method.cxx,v 1.1 2016/09/28 10:00:27 kamil Exp $ + +Add NetBSD support. + +--- src/Method.cxx.orig 2007-03-15 17:59:30.000000000 +0000 ++++ src/Method.cxx +@@ -515,6 +515,8 @@ long Cint::G__MethodInfo::FilePosition() + return((long)ifunc->pentry[index]->pos.__pos); + #elif defined(G__NONSCALARFPOS_QNX) + return((long)ifunc->pentry[index]->pos._Off); ++#elif defined(__NetBSD__) ++ return((long)ifunc->pentry[index]->pos._pos); + #else + return((long)ifunc->pentry[index]->pos); + #endif diff --git a/lang/cint/patches/patch-src_Type.cxx b/lang/cint/patches/patch-src_Type.cxx new file mode 100644 index 00000000000..49d027066c8 --- /dev/null +++ b/lang/cint/patches/patch-src_Type.cxx @@ -0,0 +1,29 @@ +$NetBSD: patch-src_Type.cxx,v 1.1 2016/09/28 10:00:27 kamil Exp $ + +Fix syntax. + +--- src/Type.cxx.orig 2006-11-29 01:59:05.000000000 +0000 ++++ src/Type.cxx +@@ -125,7 +125,7 @@ const char* Cint::G__TypeInfo::TrueName( + strcpy(G__buf, + G__type2string((int)type,(int)tagnum,-1,(int)reftype,(int)isconst)); + return(G__buf); +-#elif !defind(G__OLDIMPLEMENTATION401) ++#elif !defined(G__OLDIMPLEMENTATION401) + return(G__type2string((int)type,(int)tagnum,-1,(int)reftype,(int)isconst)); + #else + return(G__type2string((int)type,(int)tagnum,-1,(int)reftype)); +@@ -138,7 +138,7 @@ const char* Cint::G__TypeInfo::Name() + strcpy(G__buf,G__type2string((int)type,(int)tagnum,(int)typenum,(int)reftype + ,(int)isconst)); + return(G__buf); +-#elif !defind(G__OLDIMPLEMENTATION401) ++#elif !defined(G__OLDIMPLEMENTATION401) + return(G__type2string((int)type,(int)tagnum,(int)typenum,(int)reftype + ,(int)isconst)); + #else +@@ -238,4 +238,3 @@ int Cint::G__TypeInfo::Next() + { + return 0; + } +- diff --git a/lang/cint/patches/patch-src_bc__reader.h b/lang/cint/patches/patch-src_bc__reader.h new file mode 100644 index 00000000000..2a053137f0e --- /dev/null +++ b/lang/cint/patches/patch-src_bc__reader.h @@ -0,0 +1,15 @@ +$NetBSD: patch-src_bc__reader.h,v 1.1 2016/09/28 10:00:27 kamil Exp $ + +Add NetBSD support. + +--- src/bc_reader.h.orig 2007-03-15 17:59:30.000000000 +0000 ++++ src/bc_reader.h +@@ -66,6 +66,8 @@ class G__fstream { + #else + m_pos.__pos = pos; // this is for rest linux distribution + #endif ++#elif defined(__NetBSD__) ++ m_pos._pos = pos; + #else + m_pos = pos; + #endif diff --git a/lang/cint/patches/patch-src_gcc3strm.cxx b/lang/cint/patches/patch-src_gcc3strm.cxx new file mode 100644 index 00000000000..8c8bca9591b --- /dev/null +++ b/lang/cint/patches/patch-src_gcc3strm.cxx @@ -0,0 +1,22 @@ +$NetBSD: patch-src_gcc3strm.cxx,v 1.1 2016/09/28 10:00:27 kamil Exp $ + +Fix build with recent (>3.3) GCC. + +--- src/gcc3strm.cxx.orig 2006-09-28 09:01:54.000000000 +0000 ++++ src/gcc3strm.cxx +@@ -308,13 +308,13 @@ static int G__G__stream_7_6_0(G__value* + + 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)); ++ G__letint(result7, 103, (long) (*(fpos<mbstate_t>*) G__getstructoffset())==(*(fpos<mbstate_t>*) libp->para[0].ref)); + return(1 || funcname || hash || result7 || libp) ; + } + + static int G__G__stream_7_8_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)); ++ G__letint(result7, 103, (long) (*(fpos<mbstate_t>*) G__getstructoffset())!=(*(fpos<mbstate_t>*) libp->para[0].ref)); + return(1 || funcname || hash || result7 || libp) ; + } + diff --git a/lang/cint/patches/patch-al b/lang/cint/patches/patch-src_v6__loadfile.cxx index 72bd0630666..36766201e08 100644 --- a/lang/cint/patches/patch-al +++ b/lang/cint/patches/patch-src_v6__loadfile.cxx @@ -1,15 +1,15 @@ -$NetBSD: patch-al,v 1.2 2015/12/29 23:34:44 dholland Exp $ +$NetBSD: patch-src_v6__loadfile.cxx,v 1.1 2016/09/28 10:00:27 kamil Exp $ -Handle BSDs like Linux. +Handle BSDs. ---- src/loadfile.c~ 2005-05-06 11:32:18.000000000 -0400 -+++ src/loadfile.c 2008-09-05 00:26:18.000000000 -0400 -@@ -2440,7 +2440,7 @@ char *name; - if(strlen(name)<G__MAXFILENAME-6) strcat(name,appendix); +--- src/v6_loadfile.cxx.orig 2007-03-15 17:59:30.000000000 +0000 ++++ src/v6_loadfile.cxx +@@ -2494,7 +2494,7 @@ char* G__tmpnam(char *name) + G__tmpfiles.Add(name); return(name); -#elif /*defined(G__NEVER) && */ ((__GNUC__>=3)||((__GNUC__>=2)&&(__GNUC_MINOR__>=96)))&&(defined(__linux)||defined(__linux__)) +#elif /*defined(G__NEVER) && */ ((__GNUC__>=3)||((__GNUC__>=2)&&(__GNUC_MINOR__>=96)))&&(defined(__linux)||defined(__linux__)||defined(__NetBSD__)||defined(__FreeBSD__)||defined(__OpenBSD__)||defined(__DragonFly__)) /* After all, mkstemp creates more problem than a solution. */ + static char tempname[G__MAXFILENAME]; const char *appendix="_cint"; - strcpy(name,"/tmp/XXXXXX"); diff --git a/lang/cint/patches/patch-src_v6__macro.cxx b/lang/cint/patches/patch-src_v6__macro.cxx new file mode 100644 index 00000000000..485e946119e --- /dev/null +++ b/lang/cint/patches/patch-src_v6__macro.cxx @@ -0,0 +1,26 @@ +$NetBSD: patch-src_v6__macro.cxx,v 1.1 2016/09/28 10:00:27 kamil Exp $ + +Add NetBSD support. + +--- src/v6_macro.cxx.orig 2006-11-23 13:34:01.000000000 +0000 ++++ src/v6_macro.cxx +@@ -465,6 +465,9 @@ G__value G__execfuncmacro(char *item,int + #elif defined(G__NONSCALARFPOS_QNX) + if(call_pos._Off == callfuncmacro->call_pos._Off && + G__ifile.filenum == callfuncmacro->call_filenum) { ++#elif defined(__NetBSD__) ++ if(call_pos._pos == callfuncmacro->call_pos._pos && ++ G__ifile.filenum == callfuncmacro->call_filenum) { + #else + if(call_pos == callfuncmacro->call_pos && + G__ifile.filenum == callfuncmacro->call_filenum) { +@@ -782,6 +785,9 @@ int G__execfuncmacro_noexec (char* macro + #elif defined(G__NONSCALARFPOS_QNX) + if(call_pos._Off == callfuncmacro->call_pos._Off && + G__ifile.filenum == callfuncmacro->call_filenum) ++#elif defined(__NetBSD__) ++ if(call_pos._pos == callfuncmacro->call_pos._pos && ++ G__ifile.filenum == callfuncmacro->call_filenum) + #else + if(call_pos == callfuncmacro->call_pos && + G__ifile.filenum == callfuncmacro->call_filenum) diff --git a/lang/cint/patches/patch-src_v6__newlink.cxx b/lang/cint/patches/patch-src_v6__newlink.cxx new file mode 100644 index 00000000000..26c240a23e0 --- /dev/null +++ b/lang/cint/patches/patch-src_v6__newlink.cxx @@ -0,0 +1,42 @@ +$NetBSD: patch-src_v6__newlink.cxx,v 1.1 2016/09/28 10:00:27 kamil Exp $ + +Fix C++ syntax: strlen(3), atoi(3), strcpy(3) aren't in the std:: namespace. + +--- src/v6_newlink.cxx.orig 2007-03-15 17:59:30.000000000 +0000 ++++ src/v6_newlink.cxx +@@ -7014,7 +7014,7 @@ int G__parse_parameter_link(char* paras) + } + else { + if (type_name[0] == '\'') { +- type_name[std::strlen(type_name)-1] = '\0'; ++ type_name[strlen(type_name)-1] = '\0'; + typenum = G__defined_typename(type_name + 1); + } + else { +@@ -7022,7 +7022,7 @@ int G__parse_parameter_link(char* paras) + } + } + ch = G__separate_parameter(paras, &os, c_reftype_const); +- reftype_const = std::atoi(c_reftype_const); ++ reftype_const = atoi(c_reftype_const); + #ifndef G__OLDIMPLEMENTATION1861 + if (typenum != -1) { + reftype_const += G__newtype.isconst[typenum] * 10; +@@ -7037,14 +7037,14 @@ int G__parse_parameter_link(char* paras) + para_default = (G__value*) -1; + // The parameter default text will be quoted if it + // contains spaces, we must remove the quotes. +- int len = std::strlen(c_default); ++ int len = strlen(c_default); + //assert(len > 2); + if (len > 1 && (c_default[0] == '\'' || c_default[0] == '\"')) { + c_default[len-1] = '\0'; + // The source and destination overlap, do it carefully. + char buf[G__MAXNAME*2]; +- std::strcpy(buf, ((char*) c_default) + 1); +- std::strcpy(c_default, buf); ++ strcpy(buf, ((char*) c_default) + 1); ++ strcpy(c_default, buf); + } + } + ch = G__separate_parameter(paras, &os, c_paraname); diff --git a/lang/cint/patches/patch-src_v6__parse.cxx b/lang/cint/patches/patch-src_v6__parse.cxx new file mode 100644 index 00000000000..ce055196abb --- /dev/null +++ b/lang/cint/patches/patch-src_v6__parse.cxx @@ -0,0 +1,15 @@ +$NetBSD: patch-src_v6__parse.cxx,v 1.1 2016/09/28 10:00:27 kamil Exp $ + +Add NetBSD support. + +--- src/v6_parse.cxx.orig 2007-03-15 17:59:30.000000000 +0000 ++++ src/v6_parse.cxx +@@ -297,6 +297,8 @@ int G__ignore_catch() + G__asm_inst[G__asm_cp+3]=(long)fpos1.__pos; + #elif defined(G__NONSCALARFPOS_QNX) + G__asm_inst[G__asm_cp+3]=(long)fpos1._Off; ++#elif defined(__NetBSD__) ++ G__asm_inst[G__asm_cp+3]=(long)fpos1._pos; + #else + G__asm_inst[G__asm_cp+3]=(long)fpos1; + #endif diff --git a/lang/cint/patches/patch-src_v6__pcode.cxx b/lang/cint/patches/patch-src_v6__pcode.cxx new file mode 100644 index 00000000000..58932ebfa4d --- /dev/null +++ b/lang/cint/patches/patch-src_v6__pcode.cxx @@ -0,0 +1,16 @@ +$NetBSD: patch-src_v6__pcode.cxx,v 1.1 2016/09/28 10:00:27 kamil Exp $ + +Add NetBSD support. + +--- src/v6_pcode.cxx.orig 2007-02-16 23:46:45.000000000 +0000 ++++ src/v6_pcode.cxx +@@ -9204,6 +9204,9 @@ int G__dasm(FILE *fout,int isthrow) + #elif defined(G__NONSCALARFPOS_QNX) + fpos_t pos; + pos._Off = (off_t)G__asm_inst[pc+3]; ++#elif defined(__NetBSD__) ++ fpos_t pos; ++ pos._pos = (off_t)G__asm_inst[pc+3]; + #else + fpos_t pos = (fpos_t)G__asm_inst[pc+3]; + #endif diff --git a/lang/cint/patches/patch-tool_INSTALLBIN b/lang/cint/patches/patch-tool_INSTALLBIN new file mode 100644 index 00000000000..ba5ea241ecc --- /dev/null +++ b/lang/cint/patches/patch-tool_INSTALLBIN @@ -0,0 +1,39 @@ +$NetBSD: patch-tool_INSTALLBIN,v 1.1 2016/09/28 10:00:27 kamil Exp $ + +Fix shell portability. + +--- tool/INSTALLBIN.orig 2006-06-17 08:10:02.000000000 +0000 ++++ tool/INSTALLBIN +@@ -69,12 +69,12 @@ fi + echo "Where do the files go to? Summary:" + echo "Installing binary files to: $BINDIR" + echo " Cint system files to: $LIBDIR" +-if ! test "${MANDIR}x" == "x"; then ++if ! test "${MANDIR}x" = "x"; then + echo " manual pages to: $MANDIR" + else + echo " manual pages are not installed" + fi +-if ! test "${DOCDIR}x" == "x"; then ++if ! test "${DOCDIR}x" = "x"; then + echo " additional documentation to: $DOCDIR" + else + echo " additional documentation is not installed" +@@ -127,7 +127,7 @@ echo -e "\n ... successfully installed + ##################################################################### + # Optionally copy man files + ##################################################################### +-if ! test "${MANDIR}x" == "x"; then ++if ! test "${MANDIR}x" = "x"; then + mkdir -p $MANDIR/man1 + + # Copy manpages in section 1 +@@ -143,7 +143,7 @@ fi + ##################################################################### + # Optionally copy additional text documentation + ##################################################################### +-if ! test "${DOCDIR}x" == "x"; then ++if ! test "${DOCDIR}x" = "x"; then + mkdir -p $DOCDIR + + # Copy text files in doc/ diff --git a/lang/cint/patches/patch-tool_ifdef_Makefile.base b/lang/cint/patches/patch-tool_ifdef_Makefile.base new file mode 100644 index 00000000000..fb92612a19f --- /dev/null +++ b/lang/cint/patches/patch-tool_ifdef_Makefile.base @@ -0,0 +1,12 @@ +$NetBSD: patch-tool_ifdef_Makefile.base,v 1.1 2016/09/28 10:00:27 kamil Exp $ + +Don't fail for clean. + +--- tool/ifdef/Makefile.base.orig 2005-05-04 10:25:33.000000000 +0000 ++++ tool/ifdef/Makefile.base +@@ -18,4 +18,4 @@ get.o: get.c + + + clean: +- rm get.o ifdef.o ifdef ++ rm -f get.o ifdef.o ifdef diff --git a/lang/cint/patches/patch-an b/lang/cint/patches/patch-tool_ifdef_get.c index eb7bccfcaa9..66158308713 100644 --- a/lang/cint/patches/patch-an +++ b/lang/cint/patches/patch-tool_ifdef_get.c @@ -1,10 +1,10 @@ -$NetBSD: patch-an,v 1.2 2015/12/29 23:34:44 dholland Exp $ +$NetBSD: patch-tool_ifdef_get.c,v 1.1 2016/09/28 10:00:27 kamil Exp $ LP64 fixes. ---- tool/ifdef/get.c~ 2005-05-06 04:49:09.000000000 -0400 -+++ tool/ifdef/get.c 2008-09-05 00:43:19.000000000 -0400 -@@ -2575,7 +2575,7 @@ struct G__param *libp; +--- tool/ifdef/get.c.orig 2006-07-26 13:00:37.000000000 +0000 ++++ tool/ifdef/get.c +@@ -2582,7 +2582,7 @@ struct G__param *libp; { char temp[ONELINE],temp1[ONELINE]; FILE *fopen(); @@ -13,7 +13,7 @@ LP64 fixes. if(strcmp(funcname,"printf")==0) { /* para[0]:description, para[1~paran-1]: */ -@@ -2596,18 +2596,18 @@ struct G__param *libp; +@@ -2603,18 +2603,18 @@ struct G__param *libp; if(strcmp(funcname,"fclose")==0) { /* para[0]:filepointer */ @@ -35,7 +35,7 @@ LP64 fixes. G__letvariable(libp->parameter[1],temp,&G__global,G__local); return(1); } -@@ -2615,7 +2615,7 @@ struct G__param *libp; +@@ -2622,7 +2622,7 @@ struct G__param *libp; if(strcmp(funcname,"fprintf")==0) { /* parameter[0]:pointer ,parameter[1]:description, para[2~paran-1]: */ G__charformatter(result7,1,libp); @@ -44,3 +44,9 @@ LP64 fixes. strcpy(result7,""); return(1); } +@@ -3553,5 +3553,3 @@ FILE *fp; + + return( c ) ; + } +- +- diff --git a/lang/cint/patches/patch-am b/lang/cint/patches/patch-tool_ifdef_ifdef.cxx index b84911bea38..54a4058baba 100644 --- a/lang/cint/patches/patch-am +++ b/lang/cint/patches/patch-tool_ifdef_ifdef.cxx @@ -1,11 +1,10 @@ -$NetBSD: patch-am,v 1.3 2015/12/29 23:34:44 dholland Exp $ +$NetBSD: patch-tool_ifdef_ifdef.cxx,v 1.1 2016/09/28 10:00:27 kamil Exp $ -Use standard headers. -Don't redeclare getopt on a bunch more systems. +Reuse getopt(3) prototype on BSDs from standard header. ---- tool/ifdef/ifdef.cxx.orig 2005-05-06 08:49:09.000000000 +0000 +--- tool/ifdef/ifdef.cxx.orig 2006-07-26 13:00:37.000000000 +0000 +++ tool/ifdef/ifdef.cxx -@@ -13,6 +13,7 @@ +@@ -20,6 +20,7 @@ #include <stdlib.h> #include <string.h> #include <ctype.h> @@ -13,7 +12,7 @@ Don't redeclare getopt on a bunch more systems. #include <string> #include <map> #ifndef __hpux -@@ -62,7 +63,7 @@ extern "C" { +@@ -69,7 +70,7 @@ extern "C" { char *G__calc(char*); char *G__getexpr(char*); char *G__getandor(char*); @@ -22,3 +21,8 @@ Don't redeclare getopt on a bunch more systems. char getopt(int argc,char **argv,char *optlist); #endif extern int optind; +@@ -946,4 +947,3 @@ int G__splitawk(char* string,int* argc,c + } + return(n_eof); + } +- diff --git a/lang/cint/patches/patch-tool_makecint.cxx b/lang/cint/patches/patch-tool_makecint.cxx new file mode 100644 index 00000000000..958e690c706 --- /dev/null +++ b/lang/cint/patches/patch-tool_makecint.cxx @@ -0,0 +1,16 @@ +$NetBSD: patch-tool_makecint.cxx,v 1.1 2016/09/28 10:00:27 kamil Exp $ + +Include missing headers. + +--- tool/makecint.cxx.orig 2007-03-16 11:32:07.000000000 +0000 ++++ tool/makecint.cxx +@@ -30,7 +30,9 @@ + #define EXIT_SUCCESS 0 + #endif + ++#include <cstdlib> + #include <string> ++#include <cstring> + #include <iostream> + #include <fstream> + #include <list> |