diff options
| -rw-r--r-- | Mk/bsd.sites.mk | 8 | ||||
| -rw-r--r-- | www/xpi-adblock/Makefile.xpi | 13 |
2 files changed, 12 insertions, 9 deletions
diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk index f2f899f131ab..a7989dfb953a 100644 --- a/Mk/bsd.sites.mk +++ b/Mk/bsd.sites.mk @@ -115,6 +115,13 @@ MASTER_SITE_COMP_SOURCES+= \ ftp://ftp.uu.net/usenet/comp.sources.%SUBDIR%/ .endif +.if !defined(IGNORE_MASTER_SITE_CSME) +MASTER_SITE_CSME+= \ + http://bsd1.csme.ru/%SUBDIR%/ \ + http://bsd2.csme.ru/%SUBDIR%/ \ + http://bsd3.csme.ru/%SUBDIR%/ +.endif + .if !defined(IGNORE_MASTER_SITE_DEBIAN) MASTER_SITE_DEBIAN+= \ http://www.gtlib.cc.gatech.edu/pub/debian/%SUBDIR%/ \ @@ -1224,6 +1231,7 @@ MASTER_SITES_ABBREVS= CPAN:PERL_CPAN SF:SOURCEFORGE SFE:SOURCEFORGE_EXTENDED MASTER_SITES_SUBDIRS= \ APACHE_JAKARTA:${PORTNAME:S,-,/,}/source \ BERLIOS:${PORTNAME:L} \ + CSME:myports \ DEBIAN:pool/main/${PORTNAME:C/^((lib)?.).*$/\1/}/${PORTNAME} \ GCC:releases/${DISTNAME} \ GNOME:sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} \ diff --git a/www/xpi-adblock/Makefile.xpi b/www/xpi-adblock/Makefile.xpi index 234ce3dc00f3..dde0175c477e 100644 --- a/www/xpi-adblock/Makefile.xpi +++ b/www/xpi-adblock/Makefile.xpi @@ -65,15 +65,10 @@ # xpi ports do not depend on their master applications. You can install an # extension before the app and run relink when the app is present. -.if !defined(IGNORE_MASTER_SITE_CSME) -MASTER_SITE_CSME+= \ - http://bsd1.csme.ru/myports/ \ - http://bsd2.csme.ru/myports/ \ - http://bsd3.csme.ru/myports/ -.endif - +.ifndef MASTER_SITES MASTER_SITES?= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR?= extensions/${XPI_DISTNAME} +.endif PKGNAMEPREFIX?= xpi- EXTRACT_SUFX?= .xpi DISTNAME?= ${XPI_DISTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} @@ -167,9 +162,9 @@ do-install: then ${CP} -p ${FILESDIR}/chrome.manifest ${_TD_FULL}/ ; fi @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${_TD_FULL}/ @${CHMOD} -R a+rX,go-w ${_TD_FULL}/ - @for _dir in ${XPI_LINKFARMS} ; { ${LN} -sf ${_TD_FULL} $$_dir ${_Q} ; } + @for _dir in ${XPI_LINKFARMS} ; { ${LN} -sf ${_TD_FULL} $$_dir/ ${_Q} ; } @${ECHO_CMD} '@exec ${INSTALL} -d ${XPI_SLDIRS_ALL:S,^${PREFIX},%D,}' ${_A} - @${ECHO_CMD} '@exec for _dir in ${XPI_LINKFARMS} ; { ${LN} -sf ${_TD_FULL} $$_dir ${_Q}; }' ${_A} + @${ECHO_CMD} '@exec for _dir in ${XPI_LINKFARMS} ; { ${LN} -sf ${_TD_FULL} $$_dir/ ${_Q}; }' ${_A} @${ECHO_CMD} '@unexec for _dir in ${XPI_LINKFARMS} ; { ${RM} -f $$_dir/${XPI_ID} ; }' ${_A} @${ECHO_CMD} '@unexec rmdir ${XPI_DIRS_TRY:S,^,%D/,} ${_Q}' ${_A} .endif |