diff --git a/MOVED b/MOVED index 434e871e8224..307e34840501 100644 --- a/MOVED +++ b/MOVED @@ -3724,3 +3724,5 @@ mail/enigmail-thunderbird-esr||2012-10-10|Enigmail is now an option in the thund sysutils/binup||2012-10-14|Upstream disappeared, use freebsd-update(8) instead math/guppi||2012-10-15|Not developed anymore, consider math/gnumeric instead x11-toolkits/gal||2012-10-15|Developement ceased, and nothing in the ports tree uses it anymore +math/octave-forge-physicalconstants||2012-10-15|Incorporated upstream into math/octave-forge-miscellaneous +math/octave-forge-combinatorics||2012-10-15|Incorporated upstream into math/octave-forge-miscellaneous diff --git a/math/Makefile b/math/Makefile index 7f30aee7dc32..5d65297cdd33 100644 --- a/math/Makefile +++ b/math/Makefile @@ -270,7 +270,6 @@ SUBDIR += octave-forge-bim SUBDIR += octave-forge-bioinfo SUBDIR += octave-forge-civil-engineering - SUBDIR += octave-forge-combinatorics SUBDIR += octave-forge-communications SUBDIR += octave-forge-control SUBDIR += octave-forge-data-smoothing @@ -324,7 +323,6 @@ SUBDIR += octave-forge-outliers SUBDIR += octave-forge-parallel SUBDIR += octave-forge-pdb - SUBDIR += octave-forge-physicalconstants SUBDIR += octave-forge-plot SUBDIR += octave-forge-pt_br SUBDIR += octave-forge-quaternion diff --git a/math/octave-forge-combinatorics/Makefile b/math/octave-forge-combinatorics/Makefile deleted file mode 100644 index e9b06037f9d9..000000000000 --- a/math/octave-forge-combinatorics/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# New ports collection makefile for: octave-forge-combinatorics -# Date created: 8 September 2008 -# Whom: Stephen Montgomery-Smith -# -# $FreeBSD$ -# - -PORTNAME= octave-forge-combinatorics -PORTVERSION= 1.0.9 -PORTREVISION= 7 -CATEGORIES= math - -MAINTAINER= stephen@FreeBSD.org -COMMENT= Octave-forge package ${OCTAVE_PKGNAME} -GNU_CONFIGURE= yes - -.include -.include "${PORTSDIR}/Mk/bsd.octave.mk" -.include diff --git a/math/octave-forge-combinatorics/distinfo b/math/octave-forge-combinatorics/distinfo deleted file mode 100644 index e82577c66afc..000000000000 --- a/math/octave-forge-combinatorics/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (octave-forge/combinatorics-1.0.9.tar.gz) = 090bbe00b508dc69bf9f8035224fd5730b2282bf6bcd588b6d8ac3d85cb44991 -SIZE (octave-forge/combinatorics-1.0.9.tar.gz) = 27482 diff --git a/math/octave-forge-combinatorics/pkg-descr b/math/octave-forge-combinatorics/pkg-descr deleted file mode 100644 index f43909c7c205..000000000000 --- a/math/octave-forge-combinatorics/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -The octave-forge package is the result of The GNU Octave Repositry project, -which is intended to be a central location for custom scripts, functions and -extensions for GNU Octave. contains the source for all the functions plus -build and install scripts. - -This is combinatorics. - - Combinatorics functions, incuding partitioning. - -WWW: http://octave.sourceforge.net/ diff --git a/math/octave-forge-combinatorics/pkg-plist b/math/octave-forge-combinatorics/pkg-plist deleted file mode 100644 index a999ec86c07e..000000000000 --- a/math/octave-forge-combinatorics/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -@comment This file intentionally left empty diff --git a/math/octave-forge-miscellaneous/Makefile b/math/octave-forge-miscellaneous/Makefile index 1ef4721712e4..7df3fa5fc07c 100644 --- a/math/octave-forge-miscellaneous/Makefile +++ b/math/octave-forge-miscellaneous/Makefile @@ -1,13 +1,8 @@ -# New ports collection makefile for: octave-forge-miscellaneous -# Date created: 8 September 2008 -# Whom: Stephen Montgomery-Smith -# +# Created by: Stephen Montgomery-Smith # $FreeBSD$ -# PORTNAME= octave-forge-miscellaneous -PORTVERSION= 1.1.0 -PORTREVISION= 1 +PORTVERSION= 1.2.0 CATEGORIES= math MAINTAINER= stephen@FreeBSD.org @@ -19,6 +14,8 @@ OCTSRC= ${OCTAVE_PKGNAME} WRKSRC= ${WRKDIR}/${OCTSRC}/src +RUN_DEPENDS+= ${TARBALLS_DIR}/general.tar.gz:${PORTSDIR}/math/octave-forge-general + .include .include "${PORTSDIR}/Mk/bsd.octave.mk" diff --git a/math/octave-forge-miscellaneous/distinfo b/math/octave-forge-miscellaneous/distinfo index 8f90f077d905..e255a0a39b33 100644 --- a/math/octave-forge-miscellaneous/distinfo +++ b/math/octave-forge-miscellaneous/distinfo @@ -1,2 +1,2 @@ -SHA256 (octave-forge/miscellaneous-1.1.0.tar.gz) = a80d14d8219e1ca562c5d6c2218e98c8c4653d1e6166b40440f37fb4034b269d -SIZE (octave-forge/miscellaneous-1.1.0.tar.gz) = 49414 +SHA256 (octave-forge/miscellaneous-1.2.0.tar.gz) = 3d5cf8adad50e3c214b5e1ba7e62a71a04340592f5c2b027e313e51ef69c6cef +SIZE (octave-forge/miscellaneous-1.2.0.tar.gz) = 70494 diff --git a/math/octave-forge-physicalconstants/Makefile b/math/octave-forge-physicalconstants/Makefile deleted file mode 100644 index 41ff2c0b1fc0..000000000000 --- a/math/octave-forge-physicalconstants/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# New ports collection makefile for: octave-forge-physicalconstants -# Date created: 8 September 2008 -# Whom: Stephen Montgomery-Smith -# -# $FreeBSD$ -# - -PORTNAME= octave-forge-physicalconstants -PORTVERSION= 0.1.7 -PORTREVISION= 7 -CATEGORIES= math - -MAINTAINER= stephen@FreeBSD.org -COMMENT= Octave-forge package ${OCTAVE_PKGNAME} -GNU_CONFIGURE= yes - -.include -.include "${PORTSDIR}/Mk/bsd.octave.mk" -.include diff --git a/math/octave-forge-physicalconstants/distinfo b/math/octave-forge-physicalconstants/distinfo deleted file mode 100644 index 753cd3fc39d7..000000000000 --- a/math/octave-forge-physicalconstants/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (octave-forge/physicalconstants-0.1.7.tar.gz) = 40e784569dc4f4632311fbb589ede356cb6bc67b28586fececa19e88114d29a0 -SIZE (octave-forge/physicalconstants-0.1.7.tar.gz) = 39654 diff --git a/math/octave-forge-physicalconstants/pkg-descr b/math/octave-forge-physicalconstants/pkg-descr deleted file mode 100644 index 31d8d3a447d8..000000000000 --- a/math/octave-forge-physicalconstants/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -The octave-forge package is the result of The GNU Octave Repositry project, -which is intended to be a central location for custom scripts, functions and -extensions for GNU Octave. contains the source for all the functions plus -build and install scripts. - -This is physicalconstants. - - Physical Constants from Atomic & Molecular Physics, taken from NIST database - -WWW: http://octave.sourceforge.net/ diff --git a/math/octave-forge-physicalconstants/pkg-plist b/math/octave-forge-physicalconstants/pkg-plist deleted file mode 100644 index a999ec86c07e..000000000000 --- a/math/octave-forge-physicalconstants/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -@comment This file intentionally left empty diff --git a/math/octave-forge/Makefile b/math/octave-forge/Makefile index 1fde6f5edaa2..aa4d33340b15 100644 --- a/math/octave-forge/Makefile +++ b/math/octave-forge/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: octave-forge -# Date created: 5 May 2004 -# Whom: Nakata Maho -# +# Created by: Nakata Maho # $FreeBSD$ -# PORTNAME= octave-forge -PORTVERSION= 20120814 +PORTVERSION= 20121015 CATEGORIES= math MASTER_SITES= #none DISTFILES= #none @@ -23,7 +19,6 @@ OPTIONS= \ BIM "Install package: bim" On \ BIOINFO "Install package: bioinfo" On \ CIVIL_ENGINEERING "Install package: civil-engineering" On \ - COMBINATORICS "Install package: combinatorics" On \ COMMUNICATIONS "Install package: communications" On \ CONTROL "Install package: control" On \ DATA_SMOOTHING "Install package: data-smoothing" On \ @@ -77,7 +72,6 @@ OPTIONS= \ OUTLIERS "Install package: outliers" On \ PARALLEL "Install package: parallel" On \ PDB "Install package: pdb" On \ - PHYSICALCONSTANTS "Install package: physicalconstants" On \ PLOT "Install package: plot" On \ PT_BR "Install package: pt_br" On \ QUATERNION "Install package: quaternion" On \ @@ -126,9 +120,6 @@ RUN_DEPENDS+= ${TARBALLS_DIR}/bioinfo.tar.gz:${PORTSDIR}/math/octave-forge-bioin .if defined(WITH_CIVIL_ENGINEERING) RUN_DEPENDS+= ${TARBALLS_DIR}/civil-engineering.tar.gz:${PORTSDIR}/math/octave-forge-civil-engineering .endif -.if defined(WITH_COMBINATORICS) -RUN_DEPENDS+= ${TARBALLS_DIR}/combinatorics.tar.gz:${PORTSDIR}/math/octave-forge-combinatorics -.endif .if defined(WITH_COMMUNICATIONS) RUN_DEPENDS+= ${TARBALLS_DIR}/communications.tar.gz:${PORTSDIR}/math/octave-forge-communications .endif @@ -288,9 +279,6 @@ RUN_DEPENDS+= ${TARBALLS_DIR}/parallel.tar.gz:${PORTSDIR}/math/octave-forge-para .if defined(WITH_PDB) RUN_DEPENDS+= ${TARBALLS_DIR}/pdb.tar.gz:${PORTSDIR}/math/octave-forge-pdb .endif -.if defined(WITH_PHYSICALCONSTANTS) -RUN_DEPENDS+= ${TARBALLS_DIR}/physicalconstants.tar.gz:${PORTSDIR}/math/octave-forge-physicalconstants -.endif .if defined(WITH_PLOT) RUN_DEPENDS+= ${TARBALLS_DIR}/plot.tar.gz:${PORTSDIR}/math/octave-forge-plot .endif