fix more broken deps caught by pbulk scanner

diff --git a/R-rgdal/Makefile b/R-rgdal/Makefile
index 69e7de6eaa83fef97976fca4edb0d26645db3915..939a13c940b8db7c5c4ed3ee3fa645c42e3e11df 100644 (file)
--- a/R-rgdal/Makefile
+++ b/R-rgdal/Makefile
@@ -11,7 +11,7 @@ COMMENT=              Provides bindings to GDAL and R
 R_PKGNAME=             rgdal
 R_PKGVER=              0.2-7
 
-DEPENDS+=              gdal>=1.1.9:../../wip/gdal
+DEPENDS+=              gdal>=1.1.9:../../geography/gdal-lib
 DEPENDS+=              R-abind>=1.1.0:../../math/R-abind
 DEPENDS+=              R-pixmap>=0.4.1:../../math/R-pixmap
 

diff --git a/doxygen-depend/Makefile b/doxygen-depend/Makefile
index be82bc9feda1f158e523e9331e5663682ad3f300..c0dcfe46d614b4dc789e21feb58ac88ae14910e6 100644 (file)
--- a/doxygen-depend/Makefile
+++ b/doxygen-depend/Makefile
@@ -27,7 +27,6 @@ DEPENDS+=     nelma-[0-9]*:../../cad/nelma
 
 #EPENDS+=      gammu-[0-9]*:../../comms/gammu          # used to be BUILD_DEPENDS
 DEPENDS+=      asterisk-[0-9]*:../../comms/asterisk
-DEPENDS+=      asterisk-10.[0-9]*:../../comms/asterisk10
 DEPENDS+=      asterisk-1.8.[0-9]*:../../comms/asterisk18
 
 DEPENDS+=      openobex-[0-9]*:../../comms/openobex    # YES explicit

diff --git a/fvwm-crystal/Makefile b/fvwm-crystal/Makefile
index 69b4bf3dc25fbbae3ee750b2aaa8ae0679e80532..6a2a7960228257ae4392a2937498b0aafa951614 100644 (file)
--- a/fvwm-crystal/Makefile
+++ b/fvwm-crystal/Makefile
@@ -30,7 +30,7 @@ SUBST_MESSAGE.bash=   Fixing harcoded bash path
 
 
 DEPENDS+=      fvwm>=2.5.14:../../wm/fvwm-devel
-DEPENDS+=      trayer>=1.0:../../wip/trayer
+DEPENDS+=      trayer>=1.0:../../wm/trayer
 DEPENDS+=      ImageMagick>=6.2.9.1:../../graphics/ImageMagick
 DEPENDS+=      bash>=3.0:../../shells/bash
 .include "options.mk"

diff --git a/gnome-core/Makefile b/gnome-core/Makefile
index 919565eab35aee8272eecd301c2c30ac2613eead..0dbf74a74ab32b4f33afcf029f56cfe081170bc0 100644 (file)
--- a/gnome-core/Makefile
+++ b/gnome-core/Makefile
@@ -55,7 +55,7 @@ DEPENDS+=     gnome-desktop>=3.16.2:../../x11/gnome-desktop3
 #DEPENDS+=     gnome-font-viewer>=3.16.2:../../devel/gnome-font-viewer
 DEPENDS+=      gnome-keyring>=3.16.0:../../security/gnome-keyring
 DEPENDS+=      gnome-menus>=3.13.3:../../sysutils/gnome-menus
-DEPENDS+=      gnome-online-accounts>=3.16.2:../../nih/gnome-online-accounts
+DEPENDS+=      gnome-online-accounts>=3.16.2:../../net/gnome-online-accounts
 #DEPENDS+=     gnome-online-miners>=3.14.3:../../devel/gnome-online-miners
 DEPENDS+=      gnome-packagekit>=3.16.0:../../pkgtools/gnome-packagekit
 #DEPENDS+=     gnome-screenshot>=3.16.2:../../devel/gnome-screenshot

diff --git a/light-desktop/Makefile b/light-desktop/Makefile
index 5f66ae3143733507bd327189b5ec6c117772b215..e50e7e3c37e3e3deefb81a82b67a3baa730d4452 100644 (file)
--- a/light-desktop/Makefile
+++ b/light-desktop/Makefile
@@ -13,7 +13,7 @@ COMMENT=      Fast and lightweight desktop
 META_PACKAGE=  yes
 
 DEPENDS=       dejavu-ttf>2.28:../../fonts/dejavu-ttf
-DEPENDS+=      elementary-icon-theme>=0:../../wip/elementary-icon-theme
+DEPENDS+=      elementary-icon-theme>=0:../../x11/elementary-icon-theme
 DEPENDS+=      foomatic-filters>=4.0.9:../../print/foomatic4-filters
 DEPENDS+=      freefont-ttf>0:../../fonts/freefont-ttf
 DEPENDS+=      ghostscript-agpl>=8.71:../../print/ghostscript-agpl

diff --git a/netbsd-icon-theme/Makefile b/netbsd-icon-theme/Makefile
index ffc7cd8f92db8ae7035b46d8b577ce063608ef7f..426f4f96acd8ecc76ecdbeb48f81abc52fec3700 100644 (file)
--- a/netbsd-icon-theme/Makefile
+++ b/netbsd-icon-theme/Makefile
@@ -19,7 +19,7 @@ COMMENT=      Icon theme for NetBSD
 #        distributor-logo.svg
 
 # Note: the index.theme inherits elementary-mono-dark
-DEPENDS=       elementary-icon-theme>=0:../../wip/elementary-icon-theme
+DEPENDS=       elementary-icon-theme>=0:../../x11/elementary-icon-theme
 
 NO_CHECKSUM=   yes
 NO_BUILD=      yes

diff --git a/p5-Dancer-Plugin-Database/Makefile b/p5-Dancer-Plugin-Database/Makefile
index f12b3e23c4f39f193f67ad87caea1fa807a09314..65bddd30f722ffec2cebe5cf7f199d1dc7c5b12b 100644 (file)
--- a/p5-Dancer-Plugin-Database/Makefile
+++ b/p5-Dancer-Plugin-Database/Makefile
@@ -12,7 +12,7 @@ COMMENT=      Easy database connections for Dancer applications
 LICENSE=       ${PERL5_LICENSE}
 
 DEPENDS+=      p5-DBI>=0:../../databases/p5-DBI
-DEPENDS+=      p5-Dancer>=1.175:../../wip/p5-Dancer
+DEPENDS+=      p5-Dancer>=1.175:../../www/p5-Dancer
 
 PERL5_PACKLIST=        auto/Dancer/Plugin/Database/.packlist
 USE_LANGUAGES= # none

diff --git a/p5-Data-DPath/Makefile b/p5-Data-DPath/Makefile
index 305ceb6a743b995f330d9e4cc6700311d60b5eff..d6ecbb63cb9ab1500a99beade398aef6d6553457 100644 (file)
--- a/p5-Data-DPath/Makefile
+++ b/p5-Data-DPath/Makefile
@@ -19,7 +19,7 @@ DEPENDS+=     p5-List-MoreUtils>0:../../devel/p5-List-MoreUtils
 #DEPENDS+=     p5-Safe>0:../../wip/p5-Safe
 DEPENDS+=      p5-Class-XSAccessor>0:../../devel/p5-Class-XSAccessor
 DEPENDS+=      p5-Iterator-Util>0:../../wip/p5-Iterator-Util
-DEPENDS+=      p5-Data-Dumper>0:../../wip/p5-Data-Dumper
+DEPENDS+=      p5-Data-Dumper>0:../../devel/p5-Data-Dumper
 
 USE_LANGUAGES+=        # empty
 PERL5_PACKLIST= auto/Data/DPath/.packlist

diff --git a/p5-Net-Delicious/Makefile b/p5-Net-Delicious/Makefile
index 5555d91cea87bd3b553dc8cfa0a17db2358469d5..69a68d20ef4069492800349adf3bd5b6e07c64ed 100644 (file)
--- a/p5-Net-Delicious/Makefile
+++ b/p5-Net-Delicious/Makefile
@@ -19,7 +19,7 @@ DEPENDS+=     p5-TimeDate>=1.16:../../time/p5-TimeDate
 DEPENDS+=      p5-Time-HiRes>=1.65:../../time/p5-Time-HiRes
 DEPENDS+=      p5-IO-stringy>=2.10:../../devel/p5-IO-stringy
 DEPENDS+=      p5-YAML>=0.39:../../textproc/p5-YAML
-DEPENDS+=      p5-Config-Simple>=2:../../wip/p5-Config-Simple
+DEPENDS+=      p5-Config-Simple>=2:../../sysutils/p5-Config-Simple
 
 PERL5_PACKLIST= auto/Net/Delicious/.packlist
 

diff --git a/p5-Plucene/Makefile b/p5-Plucene/Makefile
index 10f6f937d60132eca7775c984e6869b5e30039f7..636e8072c5e4f6c2af721c400664c0d9fea336f5 100644 (file)
--- a/p5-Plucene/Makefile
+++ b/p5-Plucene/Makefile
@@ -12,7 +12,7 @@ PERL5_REQD+=  5.6.0
 
 DEPENDS+=      p5-Bit-Vector-Minimal>=1.0:../../wip/p5-Bit-Vector-Minimal
 DEPENDS+=      p5-Class-Accessor>=0.18:../../devel/p5-Class-Accessor
-DEPENDS+=      p5-Class-Virtual>=0.03:../../wip/p5-Class-Virtual
+DEPENDS+=      p5-Class-Virtual>=0.03:../../devel/p5-Class-Virtual
 DEPENDS+=      p5-PathTools>=1.1:../../devel/p5-PathTools
 DEPENDS+=      p5-IO-stringy>=2.104:../../devel/p5-IO-stringy
 DEPENDS+=      p5-Lingua-Stem>=0.81:../../wip/p5-Lingua-Stem

diff --git a/pandoc/Makefile b/pandoc/Makefile
index 5234fee7f8269a27af9ca33eb06f39cb93fc7457..da7877b07a3c13ebee322e2f6155732b285dc4f0 100644 (file)
--- a/pandoc/Makefile
+++ b/pandoc/Makefile
@@ -15,8 +15,8 @@ post-install:
        ${INSTALL_MAN} ${DESTDIR}${PREFIX}/share/man/man5/pandoc_markdown.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
        rm -rf ${DESTDIR}${PREFIX}/share/man
 
-BUILD_DEPENDS= alex:../../wip/alex
-BUILD_DEPENDS+=        happy:../../devel/happy
+BUILD_DEPENDS= alex-[0-9]*:../../devel/alex
+BUILD_DEPENDS+=        happy-[0-9]*:../../devel/happy
 
 .include "../../wip/mk/haskell.mk"
 .include "../../converters/hs-aeson/buildlink3.mk"