summaryrefslogtreecommitdiff
path: root/Mk
diff options
context:
space:
mode:
authorAlan Eldridge <alane@FreeBSD.org>2002-10-11 07:35:44 +0000
committerAlan Eldridge <alane@FreeBSD.org>2002-10-11 07:35:44 +0000
commitb50ef967dc302d6849c22718ebb0ce4032edddc7 (patch)
tree7fcbc8e4db78bfed950a9c5668a8a346eb4d0db4 /Mk
parentDon't explicitly link against libc. Bump PORTREVISION. (diff)
Fixed botched setup of MASTER_SITE_KDE_kde. Damn was I stupid. I didn't
test all the cases. Sorry, folks.
Notes
Notes: svn path=/head/; revision=67802
Diffstat (limited to 'Mk')
-rw-r--r--Mk/bsd.kde.mk11
-rw-r--r--Mk/bsd.kde4.mk11
2 files changed, 20 insertions, 2 deletions
diff --git a/Mk/bsd.kde.mk b/Mk/bsd.kde.mk
index 2ff7faa4ab25..c0bec9c4a743 100644
--- a/Mk/bsd.kde.mk
+++ b/Mk/bsd.kde.mk
@@ -39,6 +39,16 @@ pre-everything::
@${ECHO} ">>> Warning: this port needs to be updated as it uses the old-style USE_QT2 variable!"
.endif
+# tagged MASTER_SITE_KDE_kde
+
+kmaster= ${MASTER_SITE_KDE:S@%/@%/:kde@g}
+.if !defined(MASTER_SITE_SUBDIR)
+MASTER_SITE_KDE_kde= ${kmaster:S@%SUBDIR%/@@g}
+.else
+ksub=${MASTER_SITE_SUBDIR}
+MASTER_SITE_KDE_kde= ${kmaster:S@%SUBDIR%/@${ksub}/@g}
+.endif
+
# USE_KDEBASE_VER section
.if defined(USE_KDEBASE_VER)
@@ -66,7 +76,6 @@ USE_KDELIBS_VER=2
LIB_DEPENDS+= kdecore:${PORTSDIR}/x11/kdelibs3
USE_QT_VER= 3
PREFIX= ${KDE_PREFIX}
-MASTER_SITE_KDE_kde= ${MASTER_SITE_KDE:S@%/@%/:kde@g}
.else
diff --git a/Mk/bsd.kde4.mk b/Mk/bsd.kde4.mk
index 2ff7faa4ab25..c0bec9c4a743 100644
--- a/Mk/bsd.kde4.mk
+++ b/Mk/bsd.kde4.mk
@@ -39,6 +39,16 @@ pre-everything::
@${ECHO} ">>> Warning: this port needs to be updated as it uses the old-style USE_QT2 variable!"
.endif
+# tagged MASTER_SITE_KDE_kde
+
+kmaster= ${MASTER_SITE_KDE:S@%/@%/:kde@g}
+.if !defined(MASTER_SITE_SUBDIR)
+MASTER_SITE_KDE_kde= ${kmaster:S@%SUBDIR%/@@g}
+.else
+ksub=${MASTER_SITE_SUBDIR}
+MASTER_SITE_KDE_kde= ${kmaster:S@%SUBDIR%/@${ksub}/@g}
+.endif
+
# USE_KDEBASE_VER section
.if defined(USE_KDEBASE_VER)
@@ -66,7 +76,6 @@ USE_KDELIBS_VER=2
LIB_DEPENDS+= kdecore:${PORTSDIR}/x11/kdelibs3
USE_QT_VER= 3
PREFIX= ${KDE_PREFIX}
-MASTER_SITE_KDE_kde= ${MASTER_SITE_KDE:S@%/@%/:kde@g}
.else