diff options
author | alane <alane@FreeBSD.org> | 2002-10-11 15:35:44 +0800 |
---|---|---|
committer | alane <alane@FreeBSD.org> | 2002-10-11 15:35:44 +0800 |
commit | 9e862f39478bb9c0b234a0cc4500a6726631a1e1 (patch) | |
tree | f54114e7f9402afa9e41f8b29d81c599db50b879 /Mk | |
parent | 66b449e5dc1aecf4e7dce49642396e8ab734e77b (diff) | |
download | freebsd-ports-gnome-9e862f39478bb9c0b234a0cc4500a6726631a1e1.tar.gz freebsd-ports-gnome-9e862f39478bb9c0b234a0cc4500a6726631a1e1.tar.zst freebsd-ports-gnome-9e862f39478bb9c0b234a0cc4500a6726631a1e1.zip |
Fixed botched setup of MASTER_SITE_KDE_kde. Damn was I stupid. I didn't
test all the cases. Sorry, folks.
Diffstat (limited to 'Mk')
-rw-r--r-- | Mk/bsd.kde.mk | 11 | ||||
-rw-r--r-- | Mk/bsd.kde4.mk | 11 |
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 |