svn commit: r339348 - in head/Mk: . Uses
Baptiste Daroussin
bapt at FreeBSD.org
Fri Jan 10 13:07:06 UTC 2014
Author: bapt
Date: Fri Jan 10 13:07:05 2014
New Revision: 339348
URL: http://svnweb.freebsd.org/changeset/ports/339348
Log:
Backout encoding of comments, it is triggering a pkgng bug with one of our ports
Modified:
head/Mk/Uses/tcl.mk
head/Mk/bsd.pkgng.mk
head/Mk/bsd.sites.mk
Modified: head/Mk/Uses/tcl.mk
==============================================================================
--- head/Mk/Uses/tcl.mk Fri Jan 10 13:04:43 2014 (r339347)
+++ head/Mk/Uses/tcl.mk Fri Jan 10 13:07:05 2014 (r339348)
@@ -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
Modified: head/Mk/bsd.pkgng.mk
==============================================================================
--- head/Mk/bsd.pkgng.mk Fri Jan 10 13:04:43 2014 (r339347)
+++ head/Mk/bsd.pkgng.mk Fri Jan 10 13:07:05 2014 (r339348)
@@ -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)
Modified: head/Mk/bsd.sites.mk
==============================================================================
--- head/Mk/bsd.sites.mk Fri Jan 10 13:04:43 2014 (r339347)
+++ head/Mk/bsd.sites.mk Fri Jan 10 13:07:05 2014 (r339348)
@@ -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 \
More information about the svn-ports-all
mailing list