aboutsummaryrefslogtreecommitdiff
path: root/Mk
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2014-01-10 13:07:05 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2014-01-10 13:07:05 +0000
commit108b7594d842d91b56ae9a020a65179de0e660e2 (patch)
tree8d6085c29d6b92688af044bebffb49096d237fe0 /Mk
parent3d88a06b3b73181a1f2695168005f7fef9397eb3 (diff)
downloadports-108b7594d842d91b56ae9a020a65179de0e660e2.tar.gz
ports-108b7594d842d91b56ae9a020a65179de0e660e2.zip
Notes
Diffstat (limited to 'Mk')
-rw-r--r--Mk/Uses/tcl.mk1
-rw-r--r--Mk/bsd.pkgng.mk2
-rw-r--r--Mk/bsd.sites.mk9
3 files changed, 8 insertions, 4 deletions
diff --git a/Mk/Uses/tcl.mk b/Mk/Uses/tcl.mk
index 4d0a376c7e8c..95f7c70c1729 100644
--- a/Mk/Uses/tcl.mk
+++ b/Mk/Uses/tcl.mk
@@ -57,6 +57,7 @@
# Build-time / Run-time only dependencies can be specified with build or run.
#
+.if ${USES:Mtk} || ${USES:Mtk\:*}
.if !defined(_INCLUDE_USES_TCL_MK)
_INCLUDE_USES_TCL_MK= yes
diff --git a/Mk/bsd.pkgng.mk b/Mk/bsd.pkgng.mk
index 56fc935d55da..36776feb4884 100644
--- a/Mk/bsd.pkgng.mk
+++ b/Mk/bsd.pkgng.mk
@@ -41,7 +41,7 @@ create-manifest:
@${ECHO_CMD} "version: ${PKGVERSION}" >> ${MANIFESTF}
@${ECHO_CMD} "origin: ${PKGORIGIN}" >> ${MANIFESTF}
@${ECHO_CMD} "comment: |" >> ${MANIFESTF}
- @${ECHO_CMD} " "${COMMENT:Q} | ${AWK} -f ${SCRIPTSDIR}/pkgencode.awk >> ${MANIFESTF}
+ @${ECHO_CMD} " "${COMMENT:Q} >> ${MANIFESTF}
@${ECHO_CMD} "maintainer: ${MAINTAINER}" >> ${MANIFESTF}
@${ECHO_CMD} "prefix: ${PREFIX}" >> ${MANIFESTF}
#.if defined(NO_ARCH)
diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk
index 3b97e9917351..fe1a5387d131 100644
--- a/Mk/bsd.sites.mk
+++ b/Mk/bsd.sites.mk
@@ -107,9 +107,12 @@ MASTER_SITE_APACHE_XML+= \
.endif
.if !defined(IGNORE_MASTER_SITE_BERLIOS)
+.for mirror in heanet sunet iweb switch freefr garr aarnet jaist master \
+ nchc ncu internode waix hivelocity superb-dca3 ufpr tenet \
+ netcologne ignum kent kaz
MASTER_SITE_BERLIOS+= \
- http://download.berlios.de/%SUBDIR%/ \
- http://download2.berlios.de/%SUBDIR%/
+ http://${mirror}.dl.sourceforge.net/project/%SUBDIR%/
+.endfor
.endif
.if !defined(IGNORE_MASTER_SITE_CENKES)
@@ -1467,7 +1470,7 @@ MASTER_SITES_ABBREVS= CPAN:PERL_CPAN \
RF:RUBYFORGE
MASTER_SITES_SUBDIRS= \
APACHE_JAKARTA:${PORTNAME:S,-,/,}/source \
- BERLIOS:${PORTNAME:L} \
+ BERLIOS:${PORTNAME:L}.berlios \
CENKES:myports \
CHEESESHOP:source/${DISTNAME:C/(.).*/\1/}/${DISTNAME:C/(.*)-[0-9].*/\1/} \
CSME:myports \