Date: Monday, October 7, 2013 @ 09:06:19 Author: tpowa Revision: 195984
db-move: moved ocaml from [staging] to [extra] (i686, x86_64) Added: ocaml/repos/extra-i686/PKGBUILD (from rev 195983, ocaml/repos/staging-i686/PKGBUILD) ocaml/repos/extra-x86_64/PKGBUILD (from rev 195983, ocaml/repos/staging-x86_64/PKGBUILD) Deleted: ocaml/repos/extra-i686/PKGBUILD ocaml/repos/extra-i686/tk8.6-build.patch ocaml/repos/extra-x86_64/PKGBUILD ocaml/repos/extra-x86_64/tk8.6-build.patch ocaml/repos/staging-i686/ ocaml/repos/staging-x86_64/ --------------------------------+ /PKGBUILD | 114 +++++++++++++++++++++++++++++++++++++++ extra-i686/PKGBUILD | 62 --------------------- extra-i686/tk8.6-build.patch | 20 ------ extra-x86_64/PKGBUILD | 62 --------------------- extra-x86_64/tk8.6-build.patch | 20 ------ 5 files changed, 114 insertions(+), 164 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2013-10-07 07:01:27 UTC (rev 195983) +++ extra-i686/PKGBUILD 2013-10-07 07:06:19 UTC (rev 195984) @@ -1,62 +0,0 @@ -# $Id$ -# Maintainer: Tobias Powalowski <tp...@archlinux.org> - -pkgbase='ocaml' -pkgname=('ocaml' 'ocaml-compiler-libs') -pkgver=4.00.1 -pkgrel=3 -pkgdesc="A functional language with OO extensions" -arch=('i686' 'x86_64') -license=('LGPL2' 'custom: QPL-1.0') -url="http://caml.inria.fr/" -depends=('gdbm') -makedepends=('tk>=8.6.0' 'ncurses>=5.6-7' 'libx11') -optdepends=('ncurses: advanced ncurses features' 'tk: advanced tk features') -source=(http://caml.inria.fr/distrib/ocaml-4.00/${pkgname}-${pkgver}.tar.gz - tk8.6-build.patch) -options=('!makeflags' '!emptydirs') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure -prefix /usr - make world.opt -} - -package_ocaml() { - cd "${srcdir}/${pkgbase}-${pkgver}" - # fix https://bugs.archlinux.org/task/33302 - patch -Np2 -i ../tk8.6-build.patch - make PREFIX="${pkgdir}/usr" MANDIR="${pkgdir}/usr/share/man" install - - # Save >10MB with this one, makepkg only strips debug symbols. - #find "${pkgdir}/usr/lib" -type f -name '*.so.*' -exec strip --strip-unneeded {} \; - - # install license - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/" -} - -package_ocaml-compiler-libs() { -pkgdesc="Several modules used internally by the OCaml compiler" -license=('custom: QPL-1.0') -depends=('ocaml') -optdepends=() - - cd "${srcdir}/${pkgbase}-${pkgver}" - - # Install compiler libraries - local compiler_libs="${pkgdir}/usr/lib/ocaml/compiler-libs" - mkdir -p "$compiler_libs"/{parsing,typing,utils} - cp parsing/*.{cmi,cmo,cmx,ml,mli,mll,o} "$compiler_libs"/parsing - cp typing/*.{cmi,cmo,cmx,ml,mli,o} "$compiler_libs"/typing - cp utils/*.{cmi,cmo,cmx,ml,mli,o} "$compiler_libs"/utils - # duplicated by installation - rm -f "$compiler_libs"/typing/outcometree.{cmi,mli} - - # install license - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/" -} -md5sums=('91124a8eb12a57f1e56c02fe3db0f9e7') -md5sums=('91124a8eb12a57f1e56c02fe3db0f9e7' - '67b0a8a8885fc1221181b171541cb1b0') Copied: ocaml/repos/extra-i686/PKGBUILD (from rev 195983, ocaml/repos/staging-i686/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2013-10-07 07:06:19 UTC (rev 195984) @@ -0,0 +1,57 @@ +# $Id$ +# Maintainer: Tobias Powalowski <tp...@archlinux.org> + +pkgbase='ocaml' +pkgname=('ocaml' 'ocaml-compiler-libs') +pkgver=4.01.0 +pkgrel=1 +pkgdesc="A functional language with OO extensions" +arch=('i686' 'x86_64') +license=('LGPL2.1' 'custom: QPL-1.0') +url="http://caml.inria.fr/" +depends=('gdbm') +makedepends=('tk>=8.6.0' 'ncurses>=5.6-7' 'libx11') +optdepends=('ncurses: advanced ncurses features' 'tk: advanced tk features') +source=(http://caml.inria.fr/distrib/ocaml-4.01/${pkgname}-${pkgver}.tar.gz) +options=('!makeflags' '!emptydirs') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure -prefix /usr -x11include /usr/include + make world.opt +} + +package_ocaml() { + cd "${srcdir}/${pkgbase}-${pkgver}" + make PREFIX="${pkgdir}/usr" MANDIR="${pkgdir}/usr/share/man" install + + # Save >10MB with this one, makepkg only strips debug symbols. + #find "${pkgdir}/usr/lib" -type f -name '*.so.*' -exec strip --strip-unneeded {} \; + + # install license + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/" +} + +package_ocaml-compiler-libs() { +pkgdesc="Several modules used internally by the OCaml compiler" +license=('custom: QPL-1.0') +depends=('ocaml') +optdepends=() + + cd "${srcdir}/${pkgbase}-${pkgver}" + + # Install compiler libraries + local compiler_libs="${pkgdir}/usr/lib/ocaml/compiler-libs" + mkdir -p "$compiler_libs"/{parsing,typing,utils} + cp parsing/*.{cmi,cmo,cmx,ml,mli,mll,o} "$compiler_libs"/parsing + cp typing/*.{cmi,cmo,cmx,ml,mli,o} "$compiler_libs"/typing + cp utils/*.{cmi,cmo,cmx,ml,mli,o} "$compiler_libs"/utils + # duplicated by installation + rm -f "$compiler_libs"/typing/outcometree.{cmi,mli} + + # install license + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/" +} +md5sums=('04dfdd7da189462a4f10ec6530359cef') Deleted: extra-i686/tk8.6-build.patch =================================================================== --- extra-i686/tk8.6-build.patch 2013-10-07 07:01:27 UTC (rev 195983) +++ extra-i686/tk8.6-build.patch 2013-10-07 07:06:19 UTC (rev 195984) @@ -1,20 +0,0 @@ ---- src/ocaml-4.00.1/configure 2012-06-26 08:33:50.000000000 -0700 -+++ p/src/ocaml-4.00.1/configure 2013-01-05 17:06:54.877900143 -0800 -@@ -804,6 +804,9 @@ - echo "ARCMD=ar" >> Makefile - - -+bytecccompopts="$bytecccompopts -DUSE_INTERP_RESULT" -+nativecccompopts="$nativecccompopts -DUSE_INTERP_RESULT" -+ - # Do #! scripts work? - - if (SHELL=/bin/sh; export SHELL; (./sharpbang || ./sharpbang2) >/dev/null); then -@@ -1450,6 +1453,7 @@ - if test -n "$tcl_version" && test "x$tcl_version" != "xnone"; then - echo "tcl.h and tk.h version $tcl_version found with \"$tk_defs\"." - case $tcl_version in -+ 8.6) tclmaj=8 tclmin=6 tkmaj=8 tkmin=6 ;; - 8.5) tclmaj=8 tclmin=5 tkmaj=8 tkmin=5 ;; - 8.4) tclmaj=8 tclmin=4 tkmaj=8 tkmin=4 ;; - 8.3) tclmaj=8 tclmin=3 tkmaj=8 tkmin=3 ;; Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2013-10-07 07:01:27 UTC (rev 195983) +++ extra-x86_64/PKGBUILD 2013-10-07 07:06:19 UTC (rev 195984) @@ -1,62 +0,0 @@ -# $Id$ -# Maintainer: Tobias Powalowski <tp...@archlinux.org> - -pkgbase='ocaml' -pkgname=('ocaml' 'ocaml-compiler-libs') -pkgver=4.00.1 -pkgrel=3 -pkgdesc="A functional language with OO extensions" -arch=('i686' 'x86_64') -license=('LGPL2' 'custom: QPL-1.0') -url="http://caml.inria.fr/" -depends=('gdbm') -makedepends=('tk>=8.6.0' 'ncurses>=5.6-7' 'libx11') -optdepends=('ncurses: advanced ncurses features' 'tk: advanced tk features') -source=(http://caml.inria.fr/distrib/ocaml-4.00/${pkgname}-${pkgver}.tar.gz - tk8.6-build.patch) -options=('!makeflags' '!emptydirs') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure -prefix /usr - make world.opt -} - -package_ocaml() { - cd "${srcdir}/${pkgbase}-${pkgver}" - # fix https://bugs.archlinux.org/task/33302 - patch -Np2 -i ../tk8.6-build.patch - make PREFIX="${pkgdir}/usr" MANDIR="${pkgdir}/usr/share/man" install - - # Save >10MB with this one, makepkg only strips debug symbols. - #find "${pkgdir}/usr/lib" -type f -name '*.so.*' -exec strip --strip-unneeded {} \; - - # install license - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/" -} - -package_ocaml-compiler-libs() { -pkgdesc="Several modules used internally by the OCaml compiler" -license=('custom: QPL-1.0') -depends=('ocaml') -optdepends=() - - cd "${srcdir}/${pkgbase}-${pkgver}" - - # Install compiler libraries - local compiler_libs="${pkgdir}/usr/lib/ocaml/compiler-libs" - mkdir -p "$compiler_libs"/{parsing,typing,utils} - cp parsing/*.{cmi,cmo,cmx,ml,mli,mll,o} "$compiler_libs"/parsing - cp typing/*.{cmi,cmo,cmx,ml,mli,o} "$compiler_libs"/typing - cp utils/*.{cmi,cmo,cmx,ml,mli,o} "$compiler_libs"/utils - # duplicated by installation - rm -f "$compiler_libs"/typing/outcometree.{cmi,mli} - - # install license - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/" -} -md5sums=('91124a8eb12a57f1e56c02fe3db0f9e7') -md5sums=('91124a8eb12a57f1e56c02fe3db0f9e7' - '67b0a8a8885fc1221181b171541cb1b0') Copied: ocaml/repos/extra-x86_64/PKGBUILD (from rev 195983, ocaml/repos/staging-x86_64/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2013-10-07 07:06:19 UTC (rev 195984) @@ -0,0 +1,57 @@ +# $Id$ +# Maintainer: Tobias Powalowski <tp...@archlinux.org> + +pkgbase='ocaml' +pkgname=('ocaml' 'ocaml-compiler-libs') +pkgver=4.01.0 +pkgrel=1 +pkgdesc="A functional language with OO extensions" +arch=('i686' 'x86_64') +license=('LGPL2.1' 'custom: QPL-1.0') +url="http://caml.inria.fr/" +depends=('gdbm') +makedepends=('tk>=8.6.0' 'ncurses>=5.6-7' 'libx11') +optdepends=('ncurses: advanced ncurses features' 'tk: advanced tk features') +source=(http://caml.inria.fr/distrib/ocaml-4.01/${pkgname}-${pkgver}.tar.gz) +options=('!makeflags' '!emptydirs') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure -prefix /usr -x11include /usr/include + make world.opt +} + +package_ocaml() { + cd "${srcdir}/${pkgbase}-${pkgver}" + make PREFIX="${pkgdir}/usr" MANDIR="${pkgdir}/usr/share/man" install + + # Save >10MB with this one, makepkg only strips debug symbols. + #find "${pkgdir}/usr/lib" -type f -name '*.so.*' -exec strip --strip-unneeded {} \; + + # install license + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/" +} + +package_ocaml-compiler-libs() { +pkgdesc="Several modules used internally by the OCaml compiler" +license=('custom: QPL-1.0') +depends=('ocaml') +optdepends=() + + cd "${srcdir}/${pkgbase}-${pkgver}" + + # Install compiler libraries + local compiler_libs="${pkgdir}/usr/lib/ocaml/compiler-libs" + mkdir -p "$compiler_libs"/{parsing,typing,utils} + cp parsing/*.{cmi,cmo,cmx,ml,mli,mll,o} "$compiler_libs"/parsing + cp typing/*.{cmi,cmo,cmx,ml,mli,o} "$compiler_libs"/typing + cp utils/*.{cmi,cmo,cmx,ml,mli,o} "$compiler_libs"/utils + # duplicated by installation + rm -f "$compiler_libs"/typing/outcometree.{cmi,mli} + + # install license + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/" +} +md5sums=('04dfdd7da189462a4f10ec6530359cef') Deleted: extra-x86_64/tk8.6-build.patch =================================================================== --- extra-x86_64/tk8.6-build.patch 2013-10-07 07:01:27 UTC (rev 195983) +++ extra-x86_64/tk8.6-build.patch 2013-10-07 07:06:19 UTC (rev 195984) @@ -1,20 +0,0 @@ ---- src/ocaml-4.00.1/configure 2012-06-26 08:33:50.000000000 -0700 -+++ p/src/ocaml-4.00.1/configure 2013-01-05 17:06:54.877900143 -0800 -@@ -804,6 +804,9 @@ - echo "ARCMD=ar" >> Makefile - - -+bytecccompopts="$bytecccompopts -DUSE_INTERP_RESULT" -+nativecccompopts="$nativecccompopts -DUSE_INTERP_RESULT" -+ - # Do #! scripts work? - - if (SHELL=/bin/sh; export SHELL; (./sharpbang || ./sharpbang2) >/dev/null); then -@@ -1450,6 +1453,7 @@ - if test -n "$tcl_version" && test "x$tcl_version" != "xnone"; then - echo "tcl.h and tk.h version $tcl_version found with \"$tk_defs\"." - case $tcl_version in -+ 8.6) tclmaj=8 tclmin=6 tkmaj=8 tkmin=6 ;; - 8.5) tclmaj=8 tclmin=5 tkmaj=8 tkmin=5 ;; - 8.4) tclmaj=8 tclmin=4 tkmaj=8 tkmin=4 ;; - 8.3) tclmaj=8 tclmin=3 tkmaj=8 tkmin=3 ;;