cint: Remove conflict with man-pages, install demos

diff --git a/cint/Makefile b/cint/Makefile
index 93ae0c438b3ff8533d8adda9d7c890c97fadaa67..3d89dfd7b4d1aa5c2caff887f6930c6330eaa0bd 100644 (file)
--- a/cint/Makefile
+++ b/cint/Makefile
@@ -35,10 +35,11 @@ CONFIGURE_ENV+=                     SOFLAGS_ADD=${LDFLAGS:Q}
 BUILDLINK_PASSTHRU_DIRS+=      ${PREFIX}/cint/lib
 BUILDLINK_PASSTHRU_RPATHDIRS+= ${PREFIX}/cint/lib
 
-BUILD_TARGET=                  # empty string required
+BUILD_TARGET=                  # empty string required (override "all")
 
 INSTALLATION_DIRS+=    bin cint cint/lib share/doc/cint
-INSTALLATION_DIRS+=    ${PKGMANDIR}/man1 ${PKGMANDIR}/man2 ${PKGMANDIR}/man3
+INSTALLATION_DIRS+=    ${PKGMANDIR}/man1cint ${PKGMANDIR}/man2cint
+INSTALLATION_DIRS+=    ${PKGMANDIR}/man3cint
 
 post-extract:
        ${FIND} ${WRKSRC} -depth -type d -name CVS -exec ${RM} -rf {} \;
@@ -53,7 +54,7 @@ pre-install:
        ${RM} -f ${WRKSRC}/include/make*
 
 do-install:
-.for f in cint makecint # inc/G__ci.h
+.for f in cint makecint
        ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/cint
 .endfor
        ${INSTALL_DATA} ${WRKSRC}/inc/G__ci.h ${DESTDIR}${PREFIX}/cint
@@ -62,15 +63,23 @@ do-install:
        ${RUN} cd ${DESTDIR}${PREFIX}/bin && ${LN} -sf cint makecint
        ${CHMOD} +x ${DESTDIR}${PREFIX}/bin/cint
        ${RUN} cd ${WRKSRC} && ${PAX} -rw include stl ${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 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
 .endfor
-.for f in cint.1 makecint.1 garbage.2 security.2 unique.2 array.h.3 fft.h.3 statistics.h.3
+.for f in \
+       cint.1 makecint.1 garbage.2 security.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}
+               ${DESTDIR}${PREFIX}/${PKGMANDIR}/man${f:E}cint
 .endfor
 
+
 .include "../../mk/readline.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

diff --git a/cint/PLIST b/cint/PLIST
index b56f6ac0cf5f0197c95ebd1d4c10a9e36a460c00..535ccebd892f6eccf89316ab9737dfd517f410a8 100644 (file)
--- a/cint/PLIST
+++ b/cint/PLIST
@@ -3,6 +3,304 @@ bin/cint
 bin/makecint
 cint/G__ci.h
 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
@@ -271,14 +569,14 @@ cint/stl/utility.h
 cint/stl/valarray
 cint/stl/vector
 cint/stl/vector.h
-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
+man/man1cint/cint.1
+man/man1cint/makecint.1
+man/man2cint/garbage.2
+man/man2cint/security.2
+man/man2cint/unique.2
+man/man3cint/array.h.3
+man/man3cint/fft.h.3
+man/man3cint/statistics.h.3
 share/doc/cint/bytecode.txt
 share/doc/cint/cint.txt
 share/doc/cint/cintapi.txt