From 75010f8d88e7d8d98115fc1f15d906784d4a7edc Mon Sep 17 00:00:00 2001 From: Mark Davies Date: Thu, 21 Nov 2019 12:31:14 +1300 Subject: [PATCH] adjust dependencies to pkgsrc proper versions --- akonadi-calendar/Makefile | 2 +- akonadi-calendar/buildlink3.mk | 2 +- akonadi-contacts/Makefile | 2 +- akonadi-contacts/buildlink3.mk | 2 +- akonadi-mime/Makefile | 2 +- akonadi-mime/buildlink3.mk | 2 +- akonadi-notes/Makefile | 2 +- akonadi-notes/buildlink3.mk | 2 +- kalarmcal/Makefile | 4 ++-- kalarmcal/buildlink3.mk | 4 ++-- kmailtransport/Makefile | 2 +- kmailtransport/buildlink3.mk | 2 +- libkdepim/Makefile | 2 +- libkdepim/buildlink3.mk | 2 +- pimcommon/Makefile | 4 ++-- pimcommon/buildlink3.mk | 4 ++-- 16 files changed, 20 insertions(+), 20 deletions(-) diff --git a/akonadi-calendar/Makefile b/akonadi-calendar/Makefile index 2ace446fc0..173da9068d 100644 --- a/akonadi-calendar/Makefile +++ b/akonadi-calendar/Makefile @@ -26,7 +26,7 @@ CONF_FILES+= ${PREFIX}/share/examples/kde-xdg/akonadi-calendar.renamecategories .include "../../devel/boost-libs/buildlink3.mk" .include "../../wip/akonadi-contacts/buildlink3.mk" .include "../../wip/kmailtransport/buildlink3.mk" -.include "../../wip/kcalutils/buildlink3.mk" +.include "../../time/kcalutils/buildlink3.mk" .include "../../security/cyrus-sasl/buildlink3.mk" .include "../../x11/qt5-qtbase/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/akonadi-calendar/buildlink3.mk b/akonadi-calendar/buildlink3.mk index 1c39834b29..97656c40d8 100644 --- a/akonadi-calendar/buildlink3.mk +++ b/akonadi-calendar/buildlink3.mk @@ -10,7 +10,7 @@ BUILDLINK_PKGSRCDIR.akonadi-calendar?= ../../wip/akonadi-calendar .include "../../wip/akonadi-contacts/buildlink3.mk" .include "../../wip/kmailtransport/buildlink3.mk" -.include "../../wip/kcalutils/buildlink3.mk" +.include "../../time/kcalutils/buildlink3.mk" .include "../../x11/qt5-qtbase/buildlink3.mk" .endif # AKONADI_CALENDAR_BUILDLINK3_MK diff --git a/akonadi-contacts/Makefile b/akonadi-contacts/Makefile index 9895d28739..ae3b9cd5e9 100644 --- a/akonadi-contacts/Makefile +++ b/akonadi-contacts/Makefile @@ -23,7 +23,7 @@ SUBST_SED.fix-moc= -e 's,;${PREFIX}/include;,;,g' .include "../../devel/boost-libs/buildlink3.mk" .include "../../wip/akonadi-mime/buildlink3.mk" .include "../../misc/kcontacts/buildlink3.mk" -.include "../../wip/kmime/buildlink3.mk" +.include "../../mail/kmime/buildlink3.mk" .include "../../graphics/prison/buildlink3.mk" .include "../../x11/qt5-qtbase/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/akonadi-contacts/buildlink3.mk b/akonadi-contacts/buildlink3.mk index f2556b71a5..21bae9f323 100644 --- a/akonadi-contacts/buildlink3.mk +++ b/akonadi-contacts/buildlink3.mk @@ -10,7 +10,7 @@ BUILDLINK_PKGSRCDIR.akonadi-contacts?= ../../wip/akonadi-contacts .include "../../wip/akonadi-mime/buildlink3.mk" .include "../../misc/kcontacts/buildlink3.mk" -.include "../../wip/kmime/buildlink3.mk" +.include "../../mail/kmime/buildlink3.mk" .include "../../graphics/prison/buildlink3.mk" .include "../../x11/qt5-qtbase/buildlink3.mk" .endif # AKONADI_CONTACTS_BUILDLINK3_MK diff --git a/akonadi-mime/Makefile b/akonadi-mime/Makefile index 4e7a135565..f4e3e8a5a4 100644 --- a/akonadi-mime/Makefile +++ b/akonadi-mime/Makefile @@ -15,6 +15,6 @@ USE_TOOLS+= msgmerge .include "../../devel/boost-libs/buildlink3.mk" .include "../../wip/akonadi/buildlink3.mk" -.include "../../wip/kmime/buildlink3.mk" +.include "../../mail/kmime/buildlink3.mk" .include "../../x11/qt5-qtbase/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/akonadi-mime/buildlink3.mk b/akonadi-mime/buildlink3.mk index 99a269f435..3461369b81 100644 --- a/akonadi-mime/buildlink3.mk +++ b/akonadi-mime/buildlink3.mk @@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.akonadi-mime+= akonadi-mime>=17.12.1 BUILDLINK_PKGSRCDIR.akonadi-mime?= ../../wip/akonadi-mime .include "../../wip/akonadi/buildlink3.mk" -.include "../../wip/kmime/buildlink3.mk" +.include "../../mail/kmime/buildlink3.mk" .include "../../x11/qt5-qtbase/buildlink3.mk" .endif # AKONADI_MIME_BUILDLINK3_MK diff --git a/akonadi-notes/Makefile b/akonadi-notes/Makefile index bfc4e09e9e..fba0437365 100644 --- a/akonadi-notes/Makefile +++ b/akonadi-notes/Makefile @@ -13,6 +13,6 @@ USE_TOOLS+= msgmerge .include "../../devel/boost-libs/buildlink3.mk" .include "../../wip/akonadi/buildlink3.mk" -.include "../../wip/kmime/buildlink3.mk" +.include "../../mail/kmime/buildlink3.mk" .include "../../x11/qt5-qtbase/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/akonadi-notes/buildlink3.mk b/akonadi-notes/buildlink3.mk index ebf547008c..0b28dd7b76 100644 --- a/akonadi-notes/buildlink3.mk +++ b/akonadi-notes/buildlink3.mk @@ -8,7 +8,7 @@ AKONADI_NOTES_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.akonadi-notes+= akonadi-notes>=17.12.1 BUILDLINK_PKGSRCDIR.akonadi-notes?= ../../wip/akonadi-notes -.include "../../wip/kmime/buildlink3.mk" +.include "../../mail/kmime/buildlink3.mk" .include "../../x11/qt5-qtbase/buildlink3.mk" .endif # AKONADI_NOTES_BUILDLINK3_MK diff --git a/kalarmcal/Makefile b/kalarmcal/Makefile index 53fb3c8580..aed43e19fc 100644 --- a/kalarmcal/Makefile +++ b/kalarmcal/Makefile @@ -15,8 +15,8 @@ USE_TOOLS+= msgmerge .include "../../devel/boost-libs/buildlink3.mk" .include "../../wip/akonadi/buildlink3.mk" -.include "../../wip/kcalutils/buildlink3.mk" +.include "../../time/kcalutils/buildlink3.mk" .include "../../time/kholidays/buildlink3.mk" -.include "../../wip/kidentitymanagement/buildlink3.mk" +.include "../../misc/kidentitymanagement/buildlink3.mk" .include "../../x11/qt5-qtbase/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/kalarmcal/buildlink3.mk b/kalarmcal/buildlink3.mk index 97d5a30b29..8dcbe18f3e 100644 --- a/kalarmcal/buildlink3.mk +++ b/kalarmcal/buildlink3.mk @@ -9,9 +9,9 @@ BUILDLINK_API_DEPENDS.kalarmcal+= kalarmcal>=17.12.1 BUILDLINK_PKGSRCDIR.kalarmcal?= ../../wip/kalarmcal .include "../../wip/akonadi/buildlink3.mk" -.include "../../wip/kcalcore/buildlink3.mk" +.include "../../time/kcalcore/buildlink3.mk" .include "../../time/kholidays/buildlink3.mk" -.include "../../wip/kidentitymanagement/buildlink3.mk" +.include "../../misc/kidentitymanagement/buildlink3.mk" .include "../../x11/kdelibs4support/buildlink3.mk" .include "../../x11/qt5-qtbase/buildlink3.mk" .endif # KALARMCAL_BUILDLINK3_MK diff --git a/kmailtransport/Makefile b/kmailtransport/Makefile index 8c2c1b00da..e6beac5d27 100644 --- a/kmailtransport/Makefile +++ b/kmailtransport/Makefile @@ -35,7 +35,7 @@ SUBST_SED.fix-moc= -e 's,;${PREFIX}/include;,;,g' .include "../../devel/boost-libs/buildlink3.mk" .include "../../wip/akonadi-mime/buildlink3.mk" -.include "../../wip/ksmtp/buildlink3.mk" +.include "../../mail/ksmtp/buildlink3.mk" .include "../../devel/kcmutils/buildlink3.mk" .include "../../security/cyrus-sasl/buildlink3.mk" .include "../../x11/qt5-qtbase/buildlink3.mk" diff --git a/kmailtransport/buildlink3.mk b/kmailtransport/buildlink3.mk index 6985d45b57..4cd324d55b 100644 --- a/kmailtransport/buildlink3.mk +++ b/kmailtransport/buildlink3.mk @@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.kmailtransport+= kmailtransport>=17.12.1 BUILDLINK_PKGSRCDIR.kmailtransport?= ../../wip/kmailtransport .include "../../wip/akonadi-mime/buildlink3.mk" -.include "../../wip/ksmtp/buildlink3.mk" +.include "../../mail/ksmtp/buildlink3.mk" .include "../../devel/kcmutils/buildlink3.mk" .include "../../x11/qt5-qtbase/buildlink3.mk" .endif # KMAILTRANSPORT_BUILDLINK3_MK diff --git a/libkdepim/Makefile b/libkdepim/Makefile index d5eeb1facf..82f3c7bff1 100644 --- a/libkdepim/Makefile +++ b/libkdepim/Makefile @@ -14,6 +14,6 @@ USE_TOOLS+= msgmerge .include "../../devel/boost-libs/buildlink3.mk" .include "../../wip/akonadi-contacts/buildlink3.mk" .include "../../wip/akonadi-search/buildlink3.mk" -.include "../../wip/kldap/buildlink3.mk" +.include "../../databases/kldap/buildlink3.mk" .include "../../x11/qt5-qtbase/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/libkdepim/buildlink3.mk b/libkdepim/buildlink3.mk index 064e3e58e5..4dbeb39138 100644 --- a/libkdepim/buildlink3.mk +++ b/libkdepim/buildlink3.mk @@ -10,7 +10,7 @@ BUILDLINK_PKGSRCDIR.libkdepim?= ../../wip/libkdepim .include "../../wip/akonadi-contacts/buildlink3.mk" .include "../../wip/akonadi-search/buildlink3.mk" -.include "../../wip/kldap/buildlink3.mk" +.include "../../databases/kldap/buildlink3.mk" .include "../../x11/qt5-qtbase/buildlink3.mk" .endif # LIBKDEPIM_BUILDLINK3_MK diff --git a/pimcommon/Makefile b/pimcommon/Makefile index d35f741a9f..bf5afa8815 100644 --- a/pimcommon/Makefile +++ b/pimcommon/Makefile @@ -26,8 +26,8 @@ CONF_FILES+= ${PREFIX}/share/examples/kde-xdg/pimcommon.renamecategories \ ${PKG_SYSCONFDIR}/xdg/pimcommon.renamecategories .include "../../devel/boost-libs/buildlink3.mk" -.include "../../wip/kimap/buildlink3.mk" -.include "../../wip/kpimtextedit/buildlink3.mk" +.include "../../mail/kimap/buildlink3.mk" +.include "../../textproc/kpimtextedit/buildlink3.mk" .include "../../wip/libkdepim/buildlink3.mk" .include "../../net/knewstuff/buildlink3.mk" .include "../../x11/qt5-qtbase/buildlink3.mk" diff --git a/pimcommon/buildlink3.mk b/pimcommon/buildlink3.mk index fcb2fa6518..7ea06936d9 100644 --- a/pimcommon/buildlink3.mk +++ b/pimcommon/buildlink3.mk @@ -8,8 +8,8 @@ PIMCOMMON_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.pimcommon+= pimcommon>=17.12.1 BUILDLINK_PKGSRCDIR.pimcommon?= ../../wip/pimcommon -.include "../../wip/kimap/buildlink3.mk" -.include "../../wip/kpimtextedit/buildlink3.mk" +.include "../../mail/kimap/buildlink3.mk" +.include "../../textproc/kpimtextedit/buildlink3.mk" .include "../../wip/libkdepim/buildlink3.mk" .include "../../net/knewstuff/buildlink3.mk" .include "../../x11/qt5-qtbase/buildlink3.mk"