diff options
author | vd <vd@FreeBSD.org> | 2006-10-23 15:16:15 +0000 |
---|---|---|
committer | vd <vd@FreeBSD.org> | 2006-10-23 15:16:15 +0000 |
commit | 27f50285a7588225baf9d296549a3302354bebc3 (patch) | |
tree | 6153b1e8afb3bbccde98e2edd3e69dd45b3815d3 | |
parent | 210c6cb0ecd4ea8b688a6767c4d2849abc1cf690 (diff) | |
download | FreeBSD-ports-27f50285a7588225baf9d296549a3302354bebc3.zip FreeBSD-ports-27f50285a7588225baf9d296549a3302354bebc3.tar.gz |
* Fix pkg-plist of math/octave-forge
* Remove quotes from BROKEN in math/octave-forge
* Use dirrmtry in math/octave for common directories with math/octave-forge
Approved by: portmgr (erwin)
-rw-r--r-- | math/octave-forge/Makefile | 5 | ||||
-rw-r--r-- | math/octave-forge/pkg-plist | 10 | ||||
-rw-r--r-- | math/octave/Makefile | 1 | ||||
-rw-r--r-- | math/octave/pkg-plist | 6 |
4 files changed, 14 insertions, 8 deletions
diff --git a/math/octave-forge/Makefile b/math/octave-forge/Makefile index 17b03bf..4769848 100644 --- a/math/octave-forge/Makefile +++ b/math/octave-forge/Makefile @@ -7,6 +7,7 @@ PORTNAME= octave-forge PORTVERSION= 2006.03.17 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= octave @@ -22,8 +23,6 @@ RUN_DEPENDS= octave:${PORTSDIR}/math/octave \ qhull:${PORTSDIR}/math/qhull \ bash:${PORTSDIR}/shells/bash -BROKEN= Incorrect pkg-plist - USE_GMAKE= yes GNU_CONFIGURE= yes ALL_TARGET= # empty @@ -33,7 +32,7 @@ CONFIGURE_ARGS= --with-cc=${CC} \ .include <bsd.port.pre.mk> .if ${OSVERSION} < 501000 -BROKEN= "texinfo problem" +BROKEN= texinfo problem .endif GNU_HOST= ${ARCH}-portbld-freebsd${OSREL} diff --git a/math/octave-forge/pkg-plist b/math/octave-forge/pkg-plist index cb62d37..6d34da7 100644 --- a/math/octave-forge/pkg-plist +++ b/math/octave-forge/pkg-plist @@ -16,8 +16,6 @@ libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%GNU_HOST%%/octave-forge/__grinit__. libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%GNU_HOST%%/octave-forge/__grishold__.oct libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%GNU_HOST%%/octave-forge/__grnewset__.oct libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%GNU_HOST%%/octave-forge/__grsetgraph__.oct -libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%GNU_HOST%%/octave-forge/__imagemagick__.oct -libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%GNU_HOST%%/octave-forge/__magick_read__.oct libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%GNU_HOST%%/octave-forge/__voronoi__.oct libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%GNU_HOST%%/octave-forge/_errcore.oct libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%GNU_HOST%%/octave-forge/_gfweight.oct @@ -931,4 +929,12 @@ share/octave/%%OCTAVE_VERSION%%/site/octave-forge-alternatives/m/graceplot/ylabe @dirrm share/octave/%%OCTAVE_VERSION%%/site/m/octave-forge/NaN @dirrm share/octave/%%OCTAVE_VERSION%%/site/m/octave-forge/FIXES @dirrm share/octave/%%OCTAVE_VERSION%%/site/m/octave-forge +@dirrmtry share/octave/%%OCTAVE_VERSION%%/site/m @dirrm libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%GNU_HOST%%/octave-forge +@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/site/exec/%%GNU_HOST%% +@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/site/exec +@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%GNU_HOST%% +@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/site/oct +@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/site +@dirrmtry libexec/octave/%%OCTAVE_VERSION%% +@dirrmtry libexec/octave diff --git a/math/octave/Makefile b/math/octave/Makefile index f146527..5c70e71 100644 --- a/math/octave/Makefile +++ b/math/octave/Makefile @@ -7,6 +7,7 @@ PORTNAME= octave PORTVERSION= 2.1.73 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= ftp://ftp.octave.org/pub/octave/bleeding-edge/ \ ftp://ftp.eos.hokudai.ac.jp/pub/GNU/misc/octave/bleeding-edge/ \ diff --git a/math/octave/pkg-plist b/math/octave/pkg-plist index bb66911..882d211 100644 --- a/math/octave/pkg-plist +++ b/math/octave/pkg-plist @@ -1308,7 +1308,7 @@ libexec/octave/ls-R @dirrm %%DATADIR%%/%%OCTAVE_VERSION%%/m/statistics @dirrm %%DATADIR%%/%%OCTAVE_VERSION%%/m/strings @dirrm %%DATADIR%%/%%OCTAVE_VERSION%%/m/time -@dirrm %%DATADIR%%/%%OCTAVE_VERSION%%/m +@dirrmtry %%DATADIR%%/%%OCTAVE_VERSION%%/m @dirrm %%DATADIR%%/%%OCTAVE_VERSION%%/imagelib @dirrm %%DATADIR%%/%%OCTAVE_VERSION%% @dirrm %%DATADIR%%/site/m/startup @@ -1341,9 +1341,9 @@ libexec/octave/ls-R @dirrmtry libexec/octave/%%OCTAVE_VERSION%%/site/oct @dirrmtry libexec/octave/%%OCTAVE_VERSION%%/site %%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm libexec/octave/%%OCTAVE_VERSION%% +@dirrmtry libexec/octave/%%OCTAVE_VERSION%% @dirrm libexec/octave/site -@dirrm libexec/octave +@dirrmtry libexec/octave @dirrm lib/octave-%%OCTAVE_VERSION%% @dirrm include/octave-%%OCTAVE_VERSION%%/octave @dirrm include/octave-%%OCTAVE_VERSION%% |