pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
fixup assorted dangling .includes
Module Name: pkgsrc-wip
Committed By: Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By: tnn
Date: Wed Sep 23 00:14:10 2015 +0200
Changeset: 81b54ee32536611fdd6e24510e9c05cdf55ce325
Modified Files:
calligra/Makefile
emokit/Makefile
gambas2/Makefile
gr-osmosdr-git/Makefile
gtk2hs-buildtools/Makefile
hoogle/Makefile
hs-HsHyperEstraier/Makefile
hs-HsHyperEstraier/buildlink3.mk
hs-Lucu/Makefile
hs-Lucu/buildlink3.mk
hs-collections-api/Makefile
hs-collections-api/buildlink3.mk
hs-containers-unicode-symbols/Makefile
hs-containers-unicode-symbols/buildlink3.mk
hs-convertible-ascii/Makefile
hs-convertible-ascii/buildlink3.mk
hs-event-list/Makefile
hs-event-list/buildlink3.mk
hs-explicit-iomodes/Makefile
hs-explicit-iomodes/buildlink3.mk
hs-midi/Makefile
hs-midi/buildlink3.mk
hs-non-negative/Makefile
hs-non-negative/buildlink3.mk
hs-pathtype/Makefile
hs-pathtype/buildlink3.mk
hs-quickcheck-instances/Makefile
hs-quickcheck-instances/buildlink3.mk
hs-regional-pointers/Makefile
hs-regional-pointers/buildlink3.mk
hs-regions/Makefile
hs-regions/buildlink3.mk
hs-safer-file-handles/Makefile
hs-safer-file-handles/buildlink3.mk
hs-storablevector/Makefile
hs-storablevector/buildlink3.mk
hs-test-framework-quickcheck2/Makefile
hs-test-framework-quickcheck2/buildlink3.mk
ldapuseradd/Makefile
libmirisdr-git/buildlink3.mk
manatee/Makefile
nanomsg/buildlink3.mk
nanomsgxx/Makefile
nanomsgxx/buildlink3.mk
owl/Makefile
pam-pop3/Makefile
py-cubicweb/Makefile
py-rdflib-django/Makefile
py-yams/Makefile
resid-builder/Makefile
rsyslog6/Makefile
rsyslog7/Makefile
stardict-tools/Makefile
syslog-ng2/Makefile
vreng/Makefile
xbmc/Makefile
xiphos/Makefile
yi/Makefile
yi/buildlink3.mk
Added Files:
rtl-sdr-git/buildlink3.mk
Log Message:
fixup assorted dangling .includes
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=81b54ee32536611fdd6e24510e9c05cdf55ce325
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
calligra/Makefile | 2 +-
emokit/Makefile | 2 +-
gambas2/Makefile | 2 +-
gr-osmosdr-git/Makefile | 8 ++++----
gtk2hs-buildtools/Makefile | 2 +-
hoogle/Makefile | 2 +-
hs-HsHyperEstraier/Makefile | 2 +-
hs-HsHyperEstraier/buildlink3.mk | 2 +-
hs-Lucu/Makefile | 2 +-
hs-Lucu/buildlink3.mk | 2 +-
hs-collections-api/Makefile | 2 +-
hs-collections-api/buildlink3.mk | 2 +-
hs-containers-unicode-symbols/Makefile | 2 +-
hs-containers-unicode-symbols/buildlink3.mk | 2 +-
hs-convertible-ascii/Makefile | 2 +-
hs-convertible-ascii/buildlink3.mk | 2 +-
hs-event-list/Makefile | 2 +-
hs-event-list/buildlink3.mk | 2 +-
hs-explicit-iomodes/Makefile | 2 +-
hs-explicit-iomodes/buildlink3.mk | 2 +-
hs-midi/Makefile | 2 +-
hs-midi/buildlink3.mk | 2 +-
hs-non-negative/Makefile | 2 +-
hs-non-negative/buildlink3.mk | 2 +-
hs-pathtype/Makefile | 2 +-
hs-pathtype/buildlink3.mk | 2 +-
hs-quickcheck-instances/Makefile | 2 +-
hs-quickcheck-instances/buildlink3.mk | 2 +-
hs-regional-pointers/Makefile | 2 +-
hs-regional-pointers/buildlink3.mk | 2 +-
hs-regions/Makefile | 2 +-
hs-regions/buildlink3.mk | 2 +-
hs-safer-file-handles/Makefile | 2 +-
hs-safer-file-handles/buildlink3.mk | 2 +-
hs-storablevector/Makefile | 2 +-
hs-storablevector/buildlink3.mk | 2 +-
hs-test-framework-quickcheck2/Makefile | 2 +-
hs-test-framework-quickcheck2/buildlink3.mk | 2 +-
ldapuseradd/Makefile | 2 +-
libmirisdr-git/buildlink3.mk | 2 +-
manatee/Makefile | 2 +-
nanomsg/buildlink3.mk | 2 +-
nanomsgxx/Makefile | 2 +-
nanomsgxx/buildlink3.mk | 2 +-
owl/Makefile | 2 +-
pam-pop3/Makefile | 2 +-
py-cubicweb/Makefile | 2 +-
py-rdflib-django/Makefile | 2 +-
py-yams/Makefile | 3 ++-
resid-builder/Makefile | 2 +-
rsyslog6/Makefile | 2 +-
rsyslog7/Makefile | 2 +-
rtl-sdr-git/buildlink3.mk | 13 +++++++++++++
stardict-tools/Makefile | 2 +-
syslog-ng2/Makefile | 2 +-
vreng/Makefile | 2 +-
xbmc/Makefile | 2 +-
xiphos/Makefile | 4 ++--
yi/Makefile | 4 ++--
yi/buildlink3.mk | 2 +-
60 files changed, 78 insertions(+), 64 deletions(-)
diffs:
diff --git a/calligra/Makefile b/calligra/Makefile
index 5babd1f..783d7d9 100644
--- a/calligra/Makefile
+++ b/calligra/Makefile
@@ -72,7 +72,7 @@ pre-configure:
.include "../../misc/attica/buildlink3.mk"
.include "../../misc/kdepimlibs4/buildlink3.mk"
.include "../../misc/marble/buildlink3.mk"
-.include "../../misc/nepomuk-core/buildlink3.mk"
+#nonexistent .include "../../misc/nepomuk-core/buildlink3.mk"
.include "../../print/okular/buildlink3.mk"
.include "../../print/poppler-includes/buildlink3.mk"
.include "../../print/poppler-qt4/buildlink3.mk"
diff --git a/emokit/Makefile b/emokit/Makefile
index 0e074aa..b90e0c2 100644
--- a/emokit/Makefile
+++ b/emokit/Makefile
@@ -16,7 +16,7 @@ USE_CMAKE= yes
post-install:
${INSTALL} ${WRKSRC}/include/emokit/* ${DESTDIR}${PREFIX}/include/emokit
-.include "../../wip/libhidapi/buildlink3.mk"
+.include "../../comms/libhidapi/buildlink3.mk"
.include "../../devel/libusb1/buildlink3.mk"
.include "../../security/libmcrypt/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/gambas2/Makefile b/gambas2/Makefile
index b366551..d7b9e50 100644
--- a/gambas2/Makefile
+++ b/gambas2/Makefile
@@ -29,7 +29,7 @@ BUILDLINK_TRANSFORM+= rm:-ldl
.include "../../audio/SDL_mixer/buildlink3.mk"
.include "../../devel/SDL_gfx/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
-.include "../../databases/mysql5-client/buildlink3.mk"
+.include "../../databases/mysql56-client/buildlink3.mk"
.include "../../databases/sqlite3/buildlink3.mk"
.include "../../devel/pcre/buildlink3.mk"
.include "../../devel/SDL_ttf/buildlink3.mk"
diff --git a/gr-osmosdr-git/Makefile b/gr-osmosdr-git/Makefile
index afbdd4a..99edbc0 100644
--- a/gr-osmosdr-git/Makefile
+++ b/gr-osmosdr-git/Makefile
@@ -40,10 +40,10 @@ _GIT_FLAGS= # set empty, --depth 1 seems harmfull
.include "../../ham/uhd/buildlink3.mk"
.include "../../lang/python/application.mk"
.include "../../lang/python/extension.mk"
-.include "../../wip/rtl-sdr/buildlink3.mk"
-.include "../../wip/libmirisdr/buildlink3.mk"
-.include "../../wip/osmo-sdr/buildlink3.mk"
-.include "../../wip/gr-fcdproplus/buildlink3.mk"
+.include "../../wip/rtl-sdr-git/buildlink3.mk"
+.include "../../wip/libmirisdr-git/buildlink3.mk"
+.include "../../wip/osmo-sdr-git/buildlink3.mk"
+.include "../../wip/gr-fcdproplus-git/buildlink3.mk"
.if 1
# gnuradio/io_signature.h: No such file or directory
diff --git a/gtk2hs-buildtools/Makefile b/gtk2hs-buildtools/Makefile
index 0f31c6b..6ac93e6 100644
--- a/gtk2hs-buildtools/Makefile
+++ b/gtk2hs-buildtools/Makefile
@@ -10,7 +10,7 @@ COMMENT= Tools to build the Gtk2Hs suite of User Interface libraries
LICENSE= gnu-gpl-v2
.include "../../wip/mk/haskell.mk"
-.include "../../wip/alex/buildlink3.mk"
+.include "../../devel/alex/buildlink3.mk"
.include "../../devel/happy/buildlink3.mk"
.include "../../devel/hs-random/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/hoogle/Makefile b/hoogle/Makefile
index e897270..bd1c331 100644
--- a/hoogle/Makefile
+++ b/hoogle/Makefile
@@ -9,7 +9,7 @@ COMMENT= Haskell API Search
LICENSE= modified-bsd
.include "../../wip/mk/haskell.mk"
-.include "../../wip/hs-QuickCheck/buildlink3.mk"
+.include "../../devel/hs-QuickCheck/buildlink3.mk"
.include "../../converters/hs-aeson/buildlink3.mk"
.include "../../devel/hs-blaze-builder/buildlink3.mk"
.include "../../textproc/hs-case-insensitive/buildlink3.mk"
diff --git a/hs-HsHyperEstraier/Makefile b/hs-HsHyperEstraier/Makefile
index 98266d8..7aade60 100644
--- a/hs-HsHyperEstraier/Makefile
+++ b/hs-HsHyperEstraier/Makefile
@@ -12,7 +12,7 @@ LICENSE= public-domain
CONFIGURE_ARGS=
.include "../../wip/mk/haskell.mk"
-.include "../../wip/hs-base-unicode-symbols/buildlink3.mk"
+.include "../../devel/hs-base-unicode-symbols/buildlink3.mk"
.include "../../net/hs-network/buildlink3.mk"
.include "../../devel/hs-text/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/hs-HsHyperEstraier/buildlink3.mk b/hs-HsHyperEstraier/buildlink3.mk
index 2e35528..a79237f 100644
--- a/hs-HsHyperEstraier/buildlink3.mk
+++ b/hs-HsHyperEstraier/buildlink3.mk
@@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.hs-HsHyperEstraier+= hs-HsHyperEstraier>=0.4
BUILDLINK_PKGSRCDIR.hs-HsHyperEstraier?= ../../wip/hs-HsHyperEstraier
.include "../../textproc/hyperestraier/buildlink3.mk"
-.include "../../wip/hs-base-unicode-symbols/buildlink3.mk"
+.include "../../devel/hs-base-unicode-symbols/buildlink3.mk"
.include "../../net/hs-network/buildlink3.mk"
.include "../../devel/hs-text/buildlink3.mk"
.endif # HS_HSHYPERESTRAIER_BUILDLINK3_MK
diff --git a/hs-Lucu/Makefile b/hs-Lucu/Makefile
index 5d0b47d..ffc1bf9 100644
--- a/hs-Lucu/Makefile
+++ b/hs-Lucu/Makefile
@@ -11,7 +11,7 @@ LICENSE= public-domain
.include "../../wip/mk/haskell.mk"
.include "../../wip/hs-HsOpenSSL/buildlink3.mk"
-.include "../../wip/hs-base-unicode-symbols/buildlink3.mk"
+.include "../../devel/hs-base-unicode-symbols/buildlink3.mk"
.include "../../converters/hs-base64-bytestring/buildlink3.mk"
.include "../../wip/hs-haskell-src/buildlink3.mk"
.include "../../wip/hs-hxt/buildlink3.mk"
diff --git a/hs-Lucu/buildlink3.mk b/hs-Lucu/buildlink3.mk
index 8a5ce0e..9cd6186 100644
--- a/hs-Lucu/buildlink3.mk
+++ b/hs-Lucu/buildlink3.mk
@@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.hs-Lucu+= hs-Lucu>=0.7.0.3nb2
BUILDLINK_PKGSRCDIR.hs-Lucu?= ../../wip/hs-Lucu
.include "../../wip/hs-HsOpenSSL/buildlink3.mk"
-.include "../../wip/hs-base-unicode-symbols/buildlink3.mk"
+.include "../../devel/hs-base-unicode-symbols/buildlink3.mk"
.include "../../converters/hs-base64-bytestring/buildlink3.mk"
.include "../../wip/hs-haskell-src/buildlink3.mk"
.include "../../wip/hs-hxt/buildlink3.mk"
diff --git a/hs-collections-api/Makefile b/hs-collections-api/Makefile
index 3470a08..62404b7 100644
--- a/hs-collections-api/Makefile
+++ b/hs-collections-api/Makefile
@@ -9,5 +9,5 @@ COMMENT= API for collection data structures
LICENSE= modified-bsd
.include "../../wip/mk/haskell.mk"
-.include "../../wip/hs-QuickCheck/buildlink3.mk"
+.include "../../devel/hs-QuickCheck/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/hs-collections-api/buildlink3.mk b/hs-collections-api/buildlink3.mk
index 4e44c88..28d9f2f 100644
--- a/hs-collections-api/buildlink3.mk
+++ b/hs-collections-api/buildlink3.mk
@@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.hs-collections-api+= hs-collections-api>=1.0.0
BUILDLINK_ABI_DEPENDS.hs-collections-api+= hs-collections-api>=1.0.0.0
BUILDLINK_PKGSRCDIR.hs-collections-api?= ../../wip/hs-collections-api
-.include "../../wip/hs-QuickCheck/buildlink3.mk"
+.include "../../devel/hs-QuickCheck/buildlink3.mk"
.endif # HS_COLLECTIONS_API_BUILDLINK3_MK
BUILDLINK_TREE+= -hs-collections-api
diff --git a/hs-containers-unicode-symbols/Makefile b/hs-containers-unicode-symbols/Makefile
index bc89e8d..04131ff 100644
--- a/hs-containers-unicode-symbols/Makefile
+++ b/hs-containers-unicode-symbols/Makefile
@@ -9,5 +9,5 @@ COMMENT= Unicode alternatives for common functions and operators
LICENSE= modified-bsd
.include "../../wip/mk/haskell.mk"
-.include "../../wip/hs-base-unicode-symbols/buildlink3.mk"
+.include "../../devel/hs-base-unicode-symbols/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/hs-containers-unicode-symbols/buildlink3.mk b/hs-containers-unicode-symbols/buildlink3.mk
index 94fdeee..425cf66 100644
--- a/hs-containers-unicode-symbols/buildlink3.mk
+++ b/hs-containers-unicode-symbols/buildlink3.mk
@@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.hs-containers-unicode-symbols+= hs-containers-unicode-symb
BUILDLINK_ABI_DEPENDS.hs-containers-unicode-symbols+= hs-containers-unicode-symbols>=0.3.0.2
BUILDLINK_PKGSRCDIR.hs-containers-unicode-symbols?= ../../wip/hs-containers-unicode-symbols
-.include "../../wip/hs-base-unicode-symbols/buildlink3.mk"
+.include "../../devel/hs-base-unicode-symbols/buildlink3.mk"
.endif # HS_CONTAINERS_UNICODE_SYMBOLS_BUILDLINK3_MK
BUILDLINK_TREE+= -hs-containers-unicode-symbols
diff --git a/hs-convertible-ascii/Makefile b/hs-convertible-ascii/Makefile
index f2d9bb5..f3b5898 100644
--- a/hs-convertible-ascii/Makefile
+++ b/hs-convertible-ascii/Makefile
@@ -10,7 +10,7 @@ LICENSE= modified-bsd
.include "../../wip/mk/haskell.mk"
.include "../../wip/hs-ascii/buildlink3.mk"
-.include "../../wip/hs-base-unicode-symbols/buildlink3.mk"
+.include "../../devel/hs-base-unicode-symbols/buildlink3.mk"
.include "../../devel/hs-blaze-builder/buildlink3.mk"
.include "../../wip/hs-convertible-text/buildlink3.mk"
.include "../../wip/hs-failure/buildlink3.mk"
diff --git a/hs-convertible-ascii/buildlink3.mk b/hs-convertible-ascii/buildlink3.mk
index 6a4aef5..9eb690e 100644
--- a/hs-convertible-ascii/buildlink3.mk
+++ b/hs-convertible-ascii/buildlink3.mk
@@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.hs-convertible-ascii+= hs-convertible-ascii>=0.1.0.1
BUILDLINK_PKGSRCDIR.hs-convertible-ascii?= ../../wip/hs-convertible-ascii
.include "../../wip/hs-ascii/buildlink3.mk"
-.include "../../wip/hs-base-unicode-symbols/buildlink3.mk"
+.include "../../devel/hs-base-unicode-symbols/buildlink3.mk"
.include "../../devel/hs-blaze-builder/buildlink3.mk"
.include "../../wip/hs-convertible-text/buildlink3.mk"
.include "../../wip/hs-failure/buildlink3.mk"
diff --git a/hs-event-list/Makefile b/hs-event-list/Makefile
index 337f5b6..59b29fe 100644
--- a/hs-event-list/Makefile
+++ b/hs-event-list/Makefile
@@ -9,7 +9,7 @@ COMMENT= Event lists with relative or absolute time stamps
LICENSE= gnu-gpl-v3
.include "../../wip/mk/haskell.mk"
-.include "../../wip/hs-QuickCheck/buildlink3.mk"
+.include "../../devel/hs-QuickCheck/buildlink3.mk"
.include "../../wip/hs-non-negative/buildlink3.mk"
.include "../../devel/hs-transformers/buildlink3.mk"
.include "../../wip/hs-utility-ht/buildlink3.mk"
diff --git a/hs-event-list/buildlink3.mk b/hs-event-list/buildlink3.mk
index 88c15f9..9aa1d05 100644
--- a/hs-event-list/buildlink3.mk
+++ b/hs-event-list/buildlink3.mk
@@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.hs-event-list+= hs-event-list>=0.1
BUILDLINK_ABI_DEPENDS.hs-event-list+= hs-event-list>=0.1
BUILDLINK_PKGSRCDIR.hs-event-list?= ../../wip/hs-event-list
-.include "../../wip/hs-QuickCheck/buildlink3.mk"
+.include "../../devel/hs-QuickCheck/buildlink3.mk"
.include "../../wip/hs-non-negative/buildlink3.mk"
.include "../../devel/hs-transformers/buildlink3.mk"
.include "../../wip/hs-utility-ht/buildlink3.mk"
diff --git a/hs-explicit-iomodes/Makefile b/hs-explicit-iomodes/Makefile
index 791ab7d..c9ea051 100644
--- a/hs-explicit-iomodes/Makefile
+++ b/hs-explicit-iomodes/Makefile
@@ -9,6 +9,6 @@ COMMENT= File handles with explicit IOModes
LICENSE= modified-bsd
.include "../../wip/mk/haskell.mk"
-.include "../../wip/hs-base-unicode-symbols/buildlink3.mk"
+.include "../../devel/hs-base-unicode-symbols/buildlink3.mk"
.include "../../devel/hs-tagged/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/hs-explicit-iomodes/buildlink3.mk b/hs-explicit-iomodes/buildlink3.mk
index ef7af0b..5a64a02 100644
--- a/hs-explicit-iomodes/buildlink3.mk
+++ b/hs-explicit-iomodes/buildlink3.mk
@@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.hs-explicit-iomodes+= hs-explicit-iomodes>=0.6.0
BUILDLINK_ABI_DEPENDS.hs-explicit-iomodes+= hs-explicit-iomodes>=0.6.0.5
BUILDLINK_PKGSRCDIR.hs-explicit-iomodes?= ../../wip/hs-explicit-iomodes
-.include "../../wip/hs-base-unicode-symbols/buildlink3.mk"
+.include "../../devel/hs-base-unicode-symbols/buildlink3.mk"
.include "../../devel/hs-tagged/buildlink3.mk"
.endif # HS_EXPLICIT_IOMODES_BUILDLINK3_MK
diff --git a/hs-midi/Makefile b/hs-midi/Makefile
index a20a1ab..68759ed 100644
--- a/hs-midi/Makefile
+++ b/hs-midi/Makefile
@@ -13,7 +13,7 @@ LICENSE= gnu-gpl-v3
.include "../../wip/hs-explicit-exception/buildlink3.mk"
.include "../../wip/hs-monoid-transformer/buildlink3.mk"
.include "../../wip/hs-non-negative/buildlink3.mk"
-.include "../../wip/hs-QuickCheck/buildlink3.mk"
+.include "../../devel/hs-QuickCheck/buildlink3.mk"
.include "../../devel/hs-random/buildlink3.mk"
.include "../../devel/hs-transformers/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/hs-midi/buildlink3.mk b/hs-midi/buildlink3.mk
index 6412d82..afa931f 100644
--- a/hs-midi/buildlink3.mk
+++ b/hs-midi/buildlink3.mk
@@ -13,7 +13,7 @@ BUILDLINK_PKGSRCDIR.hs-midi?= ../../wip/hs-midi
.include "../../wip/hs-explicit-exception/buildlink3.mk"
.include "../../wip/hs-monoid-transformer/buildlink3.mk"
.include "../../wip/hs-non-negative/buildlink3.mk"
-.include "../../wip/hs-QuickCheck/buildlink3.mk"
+.include "../../devel/hs-QuickCheck/buildlink3.mk"
.include "../../devel/hs-random/buildlink3.mk"
.include "../../devel/hs-transformers/buildlink3.mk"
.endif # HS_MIDI_BUILDLINK3_MK
diff --git a/hs-non-negative/Makefile b/hs-non-negative/Makefile
index 5a5ef2f..619b96d 100644
--- a/hs-non-negative/Makefile
+++ b/hs-non-negative/Makefile
@@ -9,6 +9,6 @@ COMMENT= Non-negative numbers
LICENSE= gnu-gpl-v3
.include "../../wip/mk/haskell.mk"
-.include "../../wip/hs-QuickCheck/buildlink3.mk"
+.include "../../devel/hs-QuickCheck/buildlink3.mk"
.include "../../wip/hs-utility-ht/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/hs-non-negative/buildlink3.mk b/hs-non-negative/buildlink3.mk
index d7af5a2..5bb7ecb 100644
--- a/hs-non-negative/buildlink3.mk
+++ b/hs-non-negative/buildlink3.mk
@@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.hs-non-negative+= hs-non-negative>=0.1
BUILDLINK_ABI_DEPENDS.hs-non-negative+= hs-non-negative>=0.1
BUILDLINK_PKGSRCDIR.hs-non-negative?= ../../wip/hs-non-negative
-.include "../../wip/hs-QuickCheck/buildlink3.mk"
+.include "../../devel/hs-QuickCheck/buildlink3.mk"
.include "../../wip/hs-utility-ht/buildlink3.mk"
.endif # HS_NON_NEGATIVE_BUILDLINK3_MK
diff --git a/hs-pathtype/Makefile b/hs-pathtype/Makefile
index b493d7a..bf46790 100644
--- a/hs-pathtype/Makefile
+++ b/hs-pathtype/Makefile
@@ -9,5 +9,5 @@ COMMENT= Type-safe replacement for System.FilePath etc
LICENSE= modified-bsd
.include "../../wip/mk/haskell.mk"
-.include "../../wip/hs-QuickCheck/buildlink3.mk"
+.include "../../devel/hs-QuickCheck/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/hs-pathtype/buildlink3.mk b/hs-pathtype/buildlink3.mk
index 2c8bea5..f1816f2 100644
--- a/hs-pathtype/buildlink3.mk
+++ b/hs-pathtype/buildlink3.mk
@@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.hs-pathtype+= hs-pathtype>=0.5.2
BUILDLINK_ABI_DEPENDS.hs-pathtype+= hs-pathtype>=0.5.2
BUILDLINK_PKGSRCDIR.hs-pathtype?= ../../wip/hs-pathtype
-.include "../../wip/hs-QuickCheck/buildlink3.mk"
+.include "../../devel/hs-QuickCheck/buildlink3.mk"
.endif # HS_PATHTYPE_BUILDLINK3_MK
BUILDLINK_TREE+= -hs-pathtype
diff --git a/hs-quickcheck-instances/Makefile b/hs-quickcheck-instances/Makefile
index 32bd46a..0c29189 100644
--- a/hs-quickcheck-instances/Makefile
+++ b/hs-quickcheck-instances/Makefile
@@ -9,6 +9,6 @@ COMMENT= Common quickcheck instances
LICENSE= modified-bsd
.include "../../wip/mk/haskell.mk"
-.include "../../wip/hs-QuickCheck/buildlink3.mk"
+.include "../../devel/hs-QuickCheck/buildlink3.mk"
.include "../../devel/hs-text/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/hs-quickcheck-instances/buildlink3.mk b/hs-quickcheck-instances/buildlink3.mk
index 38bd62c..484c51d 100644
--- a/hs-quickcheck-instances/buildlink3.mk
+++ b/hs-quickcheck-instances/buildlink3.mk
@@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.hs-quickcheck-instances+= hs-quickcheck-instances>=0.3.2
BUILDLINK_ABI_DEPENDS.hs-quickcheck-instances+= hs-quickcheck-instances>=0.3.2
BUILDLINK_PKGSRCDIR.hs-quickcheck-instances?= ../../wip/hs-quickcheck-instances
-.include "../../wip/hs-QuickCheck/buildlink3.mk"
+.include "../../devel/hs-QuickCheck/buildlink3.mk"
.include "../../devel/hs-text/buildlink3.mk"
.endif # HS_QUICKCHECK_INSTANCES_BUILDLINK3_MK
diff --git a/hs-regional-pointers/Makefile b/hs-regional-pointers/Makefile
index e9eecd1..c47e69e 100644
--- a/hs-regional-pointers/Makefile
+++ b/hs-regional-pointers/Makefile
@@ -9,7 +9,7 @@ COMMENT= Regional memory pointers
LICENSE= modified-bsd
.include "../../wip/mk/haskell.mk"
-.include "../../wip/hs-base-unicode-symbols/buildlink3.mk"
+.include "../../devel/hs-base-unicode-symbols/buildlink3.mk"
.include "../../devel/hs-monad-control/buildlink3.mk"
.include "../../wip/hs-regions/buildlink3.mk"
.include "../../devel/hs-transformers/buildlink3.mk"
diff --git a/hs-regional-pointers/buildlink3.mk b/hs-regional-pointers/buildlink3.mk
index 872a1cc..739cbad 100644
--- a/hs-regional-pointers/buildlink3.mk
+++ b/hs-regional-pointers/buildlink3.mk
@@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.hs-regional-pointers+= hs-regional-pointers>=0.6
BUILDLINK_ABI_DEPENDS.hs-regional-pointers+= hs-regional-pointers>=0.6
BUILDLINK_PKGSRCDIR.hs-regional-pointers?= ../../wip/hs-regional-pointers
-.include "../../wip/hs-base-unicode-symbols/buildlink3.mk"
+.include "../../devel/hs-base-unicode-symbols/buildlink3.mk"
.include "../../devel/hs-monad-control/buildlink3.mk"
.include "../../wip/hs-regions/buildlink3.mk"
.include "../../devel/hs-transformers/buildlink3.mk"
diff --git a/hs-regions/Makefile b/hs-regions/Makefile
index b7932a7..3c7e1d0 100644
--- a/hs-regions/Makefile
+++ b/hs-regions/Makefile
@@ -9,7 +9,7 @@ COMMENT= Region monad for safely opening and working with scarce resources
LICENSE= modified-bsd
.include "../../wip/mk/haskell.mk"
-.include "../../wip/hs-base-unicode-symbols/buildlink3.mk"
+.include "../../devel/hs-base-unicode-symbols/buildlink3.mk"
.include "../../devel/hs-monad-control/buildlink3.mk"
.include "../../devel/hs-transformers/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/hs-regions/buildlink3.mk b/hs-regions/buildlink3.mk
index 6805c8e..503934c 100644
--- a/hs-regions/buildlink3.mk
+++ b/hs-regions/buildlink3.mk
@@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.hs-regions+= hs-regions>=0.9
BUILDLINK_ABI_DEPENDS.hs-regions+= hs-regions>=0.9
BUILDLINK_PKGSRCDIR.hs-regions?= ../../wip/hs-regions
-.include "../../wip/hs-base-unicode-symbols/buildlink3.mk"
+.include "../../devel/hs-base-unicode-symbols/buildlink3.mk"
.include "../../devel/hs-monad-control/buildlink3.mk"
.include "../../devel/hs-transformers/buildlink3.mk"
.endif # HS_REGIONS_BUILDLINK3_MK
diff --git a/hs-safer-file-handles/Makefile b/hs-safer-file-handles/Makefile
index 30a8e57..e69ef19 100644
--- a/hs-safer-file-handles/Makefile
+++ b/hs-safer-file-handles/Makefile
@@ -9,7 +9,7 @@ COMMENT= Type-safe file handling
LICENSE= modified-bsd
.include "../../wip/mk/haskell.mk"
-.include "../../wip/hs-base-unicode-symbols/buildlink3.mk"
+.include "../../devel/hs-base-unicode-symbols/buildlink3.mk"
.include "../../wip/hs-explicit-iomodes/buildlink3.mk"
.include "../../devel/hs-monad-control/buildlink3.mk"
.include "../../wip/hs-pathtype/buildlink3.mk"
diff --git a/hs-safer-file-handles/buildlink3.mk b/hs-safer-file-handles/buildlink3.mk
index 90860d4..0bd5cc2 100644
--- a/hs-safer-file-handles/buildlink3.mk
+++ b/hs-safer-file-handles/buildlink3.mk
@@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.hs-safer-file-handles+= hs-safer-file-handles>=0.10
BUILDLINK_ABI_DEPENDS.hs-safer-file-handles+= hs-safer-file-handles>=0.10
BUILDLINK_PKGSRCDIR.hs-safer-file-handles?= ../../wip/hs-safer-file-handles
-.include "../../wip/hs-base-unicode-symbols/buildlink3.mk"
+.include "../../devel/hs-base-unicode-symbols/buildlink3.mk"
.include "../../wip/hs-explicit-iomodes/buildlink3.mk"
.include "../../devel/hs-monad-control/buildlink3.mk"
.include "../../wip/hs-pathtype/buildlink3.mk"
diff --git a/hs-storablevector/Makefile b/hs-storablevector/Makefile
index a0fb65b..d13bfc2 100644
--- a/hs-storablevector/Makefile
+++ b/hs-storablevector/Makefile
@@ -9,7 +9,7 @@ COMMENT= Fast, packed, strict storable arrays
LICENSE= modified-bsd
.include "../../wip/mk/haskell.mk"
-.include "../../wip/hs-QuickCheck/buildlink3.mk"
+.include "../../devel/hs-QuickCheck/buildlink3.mk"
.include "../../wip/hs-non-negative/buildlink3.mk"
.include "../../devel/hs-syb/buildlink3.mk"
.include "../../devel/hs-transformers/buildlink3.mk"
diff --git a/hs-storablevector/buildlink3.mk b/hs-storablevector/buildlink3.mk
index 745a533..ba322ab 100644
--- a/hs-storablevector/buildlink3.mk
+++ b/hs-storablevector/buildlink3.mk
@@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.hs-storablevector+= hs-storablevector>=0.2.7
BUILDLINK_ABI_DEPENDS.hs-storablevector+= hs-storablevector>=0.2.7.2
BUILDLINK_PKGSRCDIR.hs-storablevector?= ../../wip/hs-storablevector
-.include "../../wip/hs-QuickCheck/buildlink3.mk"
+.include "../../devel/hs-QuickCheck/buildlink3.mk"
.include "../../wip/hs-non-negative/buildlink3.mk"
.include "../../devel/hs-syb/buildlink3.mk"
.include "../../devel/hs-transformers/buildlink3.mk"
diff --git a/hs-test-framework-quickcheck2/Makefile b/hs-test-framework-quickcheck2/Makefile
index f6f8036..d260b76 100644
--- a/hs-test-framework-quickcheck2/Makefile
+++ b/hs-test-framework-quickcheck2/Makefile
@@ -9,7 +9,7 @@ COMMENT= QuickCheck2 support for the test-framework package
LICENSE= modified-bsd
.include "../../wip/mk/haskell.mk"
-.include "../../wip/hs-QuickCheck/buildlink3.mk"
+.include "../../devel/hs-QuickCheck/buildlink3.mk"
.include "../../devel/hs-extensible-exceptions/buildlink3.mk"
.include "../../wip/hs-test-framework/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/hs-test-framework-quickcheck2/buildlink3.mk b/hs-test-framework-quickcheck2/buildlink3.mk
index 3a2507e..25f388c 100644
--- a/hs-test-framework-quickcheck2/buildlink3.mk
+++ b/hs-test-framework-quickcheck2/buildlink3.mk
@@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.hs-test-framework-quickcheck2+= hs-test-framework-quickche
BUILDLINK_ABI_DEPENDS.hs-test-framework-quickcheck2+= hs-test-framework-quickcheck2>=0.3.0.1
BUILDLINK_PKGSRCDIR.hs-test-framework-quickcheck2?= ../../wip/hs-test-framework-quickcheck2
-.include "../../wip/hs-QuickCheck/buildlink3.mk"
+.include "../../devel/hs-QuickCheck/buildlink3.mk"
.include "../../devel/hs-extensible-exceptions/buildlink3.mk"
.include "../../wip/hs-test-framework/buildlink3.mk"
.endif # HS_TEST_FRAMEWORK_QUICKCHECK2_BUILDLINK3_MK
diff --git a/ldapuseradd/Makefile b/ldapuseradd/Makefile
index 1958932..c0bc55e 100644
--- a/ldapuseradd/Makefile
+++ b/ldapuseradd/Makefile
@@ -23,5 +23,5 @@ INSTALLATION_DIRS= sbin lib/ldapuseradd ${PKGMANDIR}/man5 ${PKGMANDIR}/man8
.include "../../mk/compiler.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../databases/mysql5-client/buildlink3.mk"
+.include "../../databases/mysql56-client/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/libmirisdr-git/buildlink3.mk b/libmirisdr-git/buildlink3.mk
index 92b4654..8ee04eb 100644
--- a/libmirisdr-git/buildlink3.mk
+++ b/libmirisdr-git/buildlink3.mk
@@ -7,7 +7,7 @@ LIBMIRISDR_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libmirisdr+= libmirisdr>=0.1
BUILDLINK_ABI_DEPENDS.libmirisdr+= libmirisdr>=0.1
-BUILDLINK_PKGSRCDIR.libmirisdr?= ../../wip/libmirisdr
+BUILDLINK_PKGSRCDIR.libmirisdr?= ../../wip/libmirisdr-git
.endif # LIBMIRISDR_BUILDLINK3_MK
diff --git a/manatee/Makefile b/manatee/Makefile
index 8cb088c..2fb0f74 100644
--- a/manatee/Makefile
+++ b/manatee/Makefile
@@ -38,7 +38,7 @@ pre-configure:
.include "../../databases/p5-DBI/buildlink3.mk"
.include "../../textproc/expat/buildlink3.mk"
.include "../../graphics/gd/buildlink3.mk"
-.include "../../www/apache/buildlink3.mk"
+.include "../../www/apache24/buildlink3.mk"
.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/mysql.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/nanomsg/buildlink3.mk b/nanomsg/buildlink3.mk
index cf60b9b..c98159c 100644
--- a/nanomsg/buildlink3.mk
+++ b/nanomsg/buildlink3.mk
@@ -16,7 +16,7 @@ BUILDLINK_TREE+= nanomsg
NANOMSG_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.nanomsg+= nanomsg>=0.4beta
-BUILDLINK_PKGSRCDIR.nanomsg?= ../../devel/nanomsg
+BUILDLINK_PKGSRCDIR.nanomsg?= ../../wip/nanomsg
.endif # NANOMSG_BUILDLINK3_MK
BUILDLINK_TREE+= -nanomsg
diff --git a/nanomsgxx/Makefile b/nanomsgxx/Makefile
index f97482c..0fab1c6 100644
--- a/nanomsgxx/Makefile
+++ b/nanomsgxx/Makefile
@@ -35,5 +35,5 @@ do-install:
cd ${WRKSRC} && env DESTDIR=${DESTDIR} ${MAKE_ENV} ./waf install
.include "../../lang/python/application.mk"
-.include "../../devel/nanomsg/buildlink3.mk"
+.include "../../wip/nanomsg/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/nanomsgxx/buildlink3.mk b/nanomsgxx/buildlink3.mk
index 07228cc..ce20621 100644
--- a/nanomsgxx/buildlink3.mk
+++ b/nanomsgxx/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= nanomsgxx
NANOMSGXX_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.nanomsgxx+= nanomsgxx>=0.1
-BUILDLINK_PKGSRCDIR.nanomsgxx?= ../../devel/nanomsgxx
+BUILDLINK_PKGSRCDIR.nanomsgxx?= ../../wip/nanomsgxx
.endif # NANOMSGXX_BUILDLINK3_MK
BUILDLINK_TREE+= -nanomsgxx
diff --git a/owl/Makefile b/owl/Makefile
index f681a0f..18dba07 100644
--- a/owl/Makefile
+++ b/owl/Makefile
@@ -20,5 +20,5 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/doc/intro.txt ${PREFIX}/share/doc/owl/
.include "../../lang/perl5/buildlink3.mk"
-.include "../../chat/zephyr/buildlink3.mk"
+# gone from pkgsrc .include "../../chat/zephyr/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/pam-pop3/Makefile b/pam-pop3/Makefile
index 3f3c3bd..50a2c51 100644
--- a/pam-pop3/Makefile
+++ b/pam-pop3/Makefile
@@ -23,5 +23,5 @@ do-install:
${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/pam-pop3
${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/pam-pop3
-.include "../../security/PAM/buildlink3.mk"
+# gone from pkgsrc .include "../../security/PAM/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-cubicweb/Makefile b/py-cubicweb/Makefile
index 0e16c90..1965619 100644
--- a/py-cubicweb/Makefile
+++ b/py-cubicweb/Makefile
@@ -14,9 +14,9 @@ LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2
DEPENDS+= ${PYPKGPREFIX}-passlib>=1.6.2../../security/py-passlib
DEPENDS+= ${PYPKGPREFIX}-lxml>=3.3.5:../../textproc/py-lxml
DEPENDS+= ${PYPKGPREFIX}-rql>=0.33.0:../../wip/py-rql
+DEPENDS+= ${PYPKGPREFIX}-logilab-common-[0-9]*:../devel/py-logilab-common
USE_LANGUAGES= # none
-.include "../../devel/py-logilab-common/buildlink3.mk"
.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-rdflib-django/Makefile b/py-rdflib-django/Makefile
index 60a1f86..eccd9d4 100644
--- a/py-rdflib-django/Makefile
+++ b/py-rdflib-django/Makefile
@@ -13,11 +13,11 @@ COMMENT= Store implementation for RDFlib using Django models as its backend
LICENSE= mit
DEPENDS+= ${PYPKGPREFIX}-django-[0-9]*:../../www/py-django
+DEPENDS+= ${PYPKGPREFIX}-rdflib-[0-9]*:../../textproc/py-rdflib
PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # not yet ported as of 0.2.dev-201210061248
USE_LANGUAGES= # none
.include "../../lang/python/egg.mk"
-.include "../../wip/py-rdflib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-yams/Makefile b/py-yams/Makefile
index b75f685..dd0e877 100644
--- a/py-yams/Makefile
+++ b/py-yams/Makefile
@@ -12,6 +12,7 @@ COMMENT= Entity / relation schema
USE_LANGUAGES= # none
-.include "../../devel/py-logilab-common/buildlink3.mk"
+DEPENDS+= ${PYPKGPREFIX}-logilab-common-[0-9]*:../devel/py-logilab-common
+
.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/resid-builder/Makefile b/resid-builder/Makefile
index 32edd7c..42406f8 100644
--- a/resid-builder/Makefile
+++ b/resid-builder/Makefile
@@ -29,5 +29,5 @@ pre-extract:
pre-configure:
cd ${WRKDIR}/${RESID} && ./configure && make
-.include "../../wip/libsidplay2/buildlink3.mk"
+.include "../../audio/libsidplay2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/rsyslog6/Makefile b/rsyslog6/Makefile
index f75fba4..a0ddf89 100644
--- a/rsyslog6/Makefile
+++ b/rsyslog6/Makefile
@@ -57,7 +57,7 @@ post-install:
.include "../../wip/libee/buildlink3.mk"
.include "../../wip/libestr/buildlink3.mk"
-.include "../../wip/liblognorm/buildlink3.mk"
+.include "../../sysutils/liblognorm/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/rsyslog7/Makefile b/rsyslog7/Makefile
index 788969a..335cc12 100644
--- a/rsyslog7/Makefile
+++ b/rsyslog7/Makefile
@@ -52,7 +52,7 @@ post-install:
BUILDLINK_ABI_DEPENDS.libestr+= libestr>=0.1.9
.include "../../wip/libestr/buildlink3.mk"
.include "../../wip/liblogging/buildlink3.mk"
-.include "../../wip/liblognorm/buildlink3.mk"
+.include "../../devel/liblognorm/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../textproc/json-c/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
diff --git a/rtl-sdr-git/buildlink3.mk b/rtl-sdr-git/buildlink3.mk
new file mode 100644
index 0000000..b868725
--- /dev/null
+++ b/rtl-sdr-git/buildlink3.mk
@@ -0,0 +1,13 @@
+# $NetBSD$
+
+BUILDLINK_TREE+= rtl-sdr
+
+.if !defined(RTL_SDR_BUILDLINK3_MK)
+RTL_SDR_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.rtl-sdr+= rtl-sdr>=0.5nb20150922
+BUILDLINK_PKGSRCDIR.rtl-sdr?= ../../wip/rtl-sdr-git
+
+.endif # RTL_SDR_BUILDLINK3_MK
+
+BUILDLINK_TREE+= -rtl-sdr
diff --git a/stardict-tools/Makefile b/stardict-tools/Makefile
index 9bacab0..f02024d 100644
--- a/stardict-tools/Makefile
+++ b/stardict-tools/Makefile
@@ -45,6 +45,6 @@ post-install:
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/pcre/buildlink3.mk"
-.include "../../databases/mysql5-client/buildlink3.mk"
+.include "../../databases/mysql56-client/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/syslog-ng2/Makefile b/syslog-ng2/Makefile
index ce5b75d..5e69a31 100644
--- a/syslog-ng2/Makefile
+++ b/syslog-ng2/Makefile
@@ -57,6 +57,6 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/doc/reference/syslog-ng.html/*.html ${DOCDIR}
-.include "../../wip/eventlog/buildlink3.mk"
+.include "../../sysutils/eventlog/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/vreng/Makefile b/vreng/Makefile
index 997fc16..9dd05b3 100644
--- a/vreng/Makefile
+++ b/vreng/Makefile
@@ -31,7 +31,7 @@ CONFIGURE_ENV+= PERLPATH=${LOCALBASE}/bin/perl
#mpeg
#java
-.include "../../databases/mysql5-client/buildlink3.mk"
+.include "../../databases/mysql56-client/buildlink3.mk"
#BUILDLINK_LDFLAGS.mysql-client?= -Wl,-R${LOCALBASE}/lib/mysql
LDFLAGS.SunOS+= -R${LOCALBASE}/lib/mysql
LIBS.SunOS+= -R${LOCALBASE}/lib/mysql
diff --git a/xbmc/Makefile b/xbmc/Makefile
index 8ae9b83..9f343bb 100644
--- a/xbmc/Makefile
+++ b/xbmc/Makefile
@@ -81,7 +81,7 @@ pre-configure:
.include "../../mk/mysql.buildlink3.mk"
.include "../../audio/libmodplug/buildlink3.mk"
.include "../../audio/faad2/buildlink3.mk"
-.include "../../net/samba35/buildlink3.mk"
+.include "../../net/samba/buildlink3.mk"
.include "../../audio/SDL_mixer/buildlink3.mk"
.include "../../graphics/jasper/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
diff --git a/xiphos/Makefile b/xiphos/Makefile
index c245a22..10ac480 100644
--- a/xiphos/Makefile
+++ b/xiphos/Makefile
@@ -18,13 +18,13 @@ USE_LANGUAGES= c c++
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgsf/buildlink3.mk"
-.include "../../devel/xulrunner/buildlink3.mk"
+.include "../../devel/xulrunner31/buildlink3.mk"
.include "../../sysutils/dbus-glib/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../textproc/gnome-doc-utils/buildlink3.mk"
.include "../../textproc/icu/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../wip/sword/buildlink3.mk"
+.include "../../misc/sword/buildlink3.mk"
.include "../../www/gtkhtml314/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/yi/Makefile b/yi/Makefile
index b880fea..22d2426 100644
--- a/yi/Makefile
+++ b/yi/Makefile
@@ -19,14 +19,14 @@ CONFIGURE_ARGS+= \
.include "options.mk"
.include "../../wip/mk/haskell.mk"
-.include "../../wip/alex/buildlink3.mk"
+.include "../../devel/alex/buildlink3.mk"
.include "../../wip/hs-Diff/buildlink3.mk"
.include "../../wip/hs-cautious-file/buildlink3.mk"
.include "../../wip/hs-data-accessor/buildlink3.mk"
.include "../../wip/hs-data-accessor-monads-fd/buildlink3.mk"
.include "../../wip/hs-data-accessor-template/buildlink3.mk"
.include "../../wip/hs-derive/buildlink3.mk"
-.include "../../wip/hs-dlist/buildlink3.mk"
+.include "../../devel/hs-dlist/buildlink3.mk"
.include "../../wip/hs-dyre/buildlink3.mk"
.include "../../wip/hs-fingertree/buildlink3.mk"
.include "../../devel/hs-ghc-paths/buildlink3.mk"
diff --git a/yi/buildlink3.mk b/yi/buildlink3.mk
index dedf50f..464b8df 100644
--- a/yi/buildlink3.mk
+++ b/yi/buildlink3.mk
@@ -15,7 +15,7 @@ BUILDLINK_PKGSRCDIR.yi?= ../../wip/yi
.include "../../wip/hs-data-accessor-monads-fd/buildlink3.mk"
.include "../../wip/hs-data-accessor-template/buildlink3.mk"
.include "../../wip/hs-derive/buildlink3.mk"
-.include "../../wip/hs-dlist/buildlink3.mk"
+.include "../../devel/hs-dlist/buildlink3.mk"
.include "../../wip/hs-dyre/buildlink3.mk"
.include "../../wip/hs-fingertree/buildlink3.mk"
.include "../../devel/hs-ghc-paths/buildlink3.mk"
Home |
Main Index |
Thread Index |
Old Index