mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00
Code Issues Releases Activity

(1) Move "XFREE86_VERSION?=3" up to the pre-makefile section so it can

Browse Source 
be used inside Makefiles for testing.
Submitted by:	sobomax

(2) Use newly added /etc/mtree/BSD.x11-4.dist when XFREE86_VERSION=4.
Requested by:	taguchi@tohoku.iij.ad.jp

(3) Re-enable MASTER_SITE_OVERRIDE and MASTER_SITE_BACKUP
    functionalities by making MASTER_SORT ignore them (i.e., leave
    *_OVERRIDE at the beginning and *_BACKUP at the end).  As a side
    effect, there are new targets "master-sites" and "patch-sites"
    that will print out the correctly sorted versions of said lists.
Reviewed by:	the ports list

(3') Sort patch sites too, not only master sites.
Reviewed by:	the ports list

(4) New target "deinstall-depends" which will do a "make deinstall" in
    all ports this one depends on.

(4') Only run pkg_delete from the deinstall target when package
    exists, to avoid "no such package installed" errors.
This commit is contained in:
Satoshi Asami 2000-08-25 10:17:39 +00:00
parent ffad35ec71
commit 8e1e056d62
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=31959
1 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
Mk/bsd.port.mk
View File

@ -660,6 +660,9 @@ RESTRICTED= "Contains cryptography."
.include "${PORTSDIR}/Mk/bsd.emacs.mk"
.endif
# defaults to 3.3.6; will be changed to 4.0 when it is ready
XFREE86_VERSION?= 3
.endif
# End of pre-makefile section.
@ -758,9 +761,6 @@ BUILD_DEPENDS+= ${X11BASE}/lib/libXm.a:${PORTSDIR}/x11-toolkits/Motif-dummy
.endif
.endif
# defaults to 3.3.6; will be changed to 4.0 when it is ready
XFREE86_VERSION?= 3
.if ${XFREE86_VERSION} == 3
.if defined(USE_XPM)
LIB_DEPENDS+= Xpm.4:${PORTSDIR}/graphics/xpm
@ -946,8 +946,7 @@ EXTRACT_CMD?= ${GZIP_CMD}
.if ${XFREE86_VERSION} == 3
MTREE_FILE= /etc/mtree/BSD.x11.dist
.else
MTREE_FILE= /etc/mtree/BSD.x11.dist
#MTREE_FILE= /etc/mtree/BSD.x11-4.dist
MTREE_FILE= /etc/mtree/BSD.x11-4.dist
.endif
.else
MTREE_FILE= /etc/mtree/BSD.local.dist
@ -990,6 +989,7 @@ PKGMESSAGE?= ${PKGDIR}/MESSAGE
PKG_CMD?= /usr/sbin/pkg_create
PKG_DELETE?= /usr/sbin/pkg_delete
PKG_INFO?= /usr/sbin/pkg_info
.if !defined(PKG_ARGS)
PKG_ARGS= -v -c ${COMMENT} -d ${DESCR} -f ${TMPPLIST} -p ${PREFIX} -P "`${MAKE} package-depends | ${GREP} -v -E ${PKG_IGNORE_DEPENDS} | sort -u`" ${EXTRA_PKG_ARGS}
.if exists(${PKGINSTALL})
@ -1090,24 +1090,19 @@ MASTER_SITE_BACKUP:= ${MASTER_SITE_BACKUP:S^\${DIST_SUBDIR}/^^}
# If the user has MASTER_SITE_FREEBSD set, go to the FreeBSD repository
# for everything, but don't search it twice by appending it to the end.
.if !defined(MASTER_SITE_FREEBSD)
MASTER_SITES+= ${MASTER_SITE_BACKUP}
PATCH_SITES+= ${MASTER_SITE_BACKUP}
.if defined(MASTER_SITE_OVERRIDE)
MASTER_SITES:= ${MASTER_SITE_OVERRIDE} ${MASTER_SITES}
PATCH_SITES:= ${MASTER_SITE_OVERRIDE} ${PATCH_SITES}
.endif
.if defined(MASTER_SITE_FREEBSD)
_MASTER_SITE_OVERRIDE:= ${MASTER_SITE_BACKUP}
_MASTER_SITE_BACKUP:= # empty
.else
MASTER_SITES:= ${MASTER_SITE_BACKUP} ${MASTER_SITES}
PATCH_SITES:= ${MASTER_SITE_BACKUP} ${PATCH_SITES}
_MASTER_SITE_OVERRIDE= ${MASTER_SITE_OVERRIDE}
_MASTER_SITE_BACKUP= ${MASTER_SITE_BACKUP}
.endif
# Search CDROM first if mounted, symlink instead of copy if
# FETCH_SYMLINK_DISTFILES is set
CD_MOUNTPT?= /cdrom
.if exists(${CD_MOUNTPT}/ports/distfiles)
MASTER_SITES:= file:${CD_MOUNTPT}/ports/distfiles/${DIST_SUBDIR}/ ${MASTER_SITES}
PATCH_SITES:= file:${CD_MOUNTPT}/ports/distfiles/${DIST_SUBDIR}/ ${PATCH_SITES}
_MASTER_SITE_OVERRIDE:= file:${CD_MOUNTPT}/ports/distfiles/${DIST_SUBDIR}/ ${_MASTER_SITE_OVERRIDE}
.if defined(FETCH_SYMLINK_DISTFILES)
FETCH_BEFORE_ARGS+= -l
.endif
@ -1125,7 +1120,13 @@ MASTER_SORT_AWK= BEGIN { RS = " "; ORS = " "; IGNORECASE = 1 ; gl = "${MASTER_SO
MASTER_SORT_AWK+= /${srt:S^/^\\/^g}/ { good["${srt}"] = good["${srt}"] " " $$0 ; next; }
.endfor
MASTER_SORT_AWK+= { rest = rest " " $$0; } END { n=split(gl, gla); for(i=1;i<=n;i++) { print good[gla[i]]; } print rest; }
SORTED_MASTER_SITES_CMD= echo '${MASTER_SITES}' | ${AWK} '${MASTER_SORT_AWK}'
SORTED_MASTER_SITES_CMD= cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} master-sites
SORTED_PATCH_SITES_CMD= cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} patch-sites
master-sites:
@echo ${_MASTER_SITE_OVERRIDE} `echo '${MASTER_SITES}' | ${AWK} '${MASTER_SORT_AWK}'` ${_MASTER_SITE_BACKUP}
patch-sites:
@echo ${_MASTER_SITE_OVERRIDE} `echo '${PATCH_SITES}' | ${AWK} '${MASTER_SORT_AWK}'` ${_MASTER_SITE_BACKUP}
DISTFILES?= ${DISTNAME}${EXTRACT_SUFX}
ALLFILES?= ${DISTFILES} ${PATCHFILES}
@ -1621,7 +1622,7 @@ do-fetch:
exit 1; \
fi ; \
${ECHO_MSG} ">> $$file doesn't seem to exist on this system."; \
for site in ${PATCH_SITES}; do \
for site in `${SORTED_PATCH_SITES_CMD}`; do \
${ECHO_MSG} ">> Attempting to fetch from $${site}."; \
DIR=${DIST_SUBDIR}; \
CKSIZE=`${GREP} "^SIZE ($${DIR:+$$DIR/}$$file)" ${MD5_FILE} | ${AWK} '{print $$4}'`; \
@ -2108,7 +2109,11 @@ reinstall:
.if !target(deinstall)
deinstall:
@${ECHO_MSG} "===> Deinstalling for ${PKGNAME}"
@${PKG_DELETE} -f ${PKGNAME}
@if ${PKG_INFO} -e ${PKGNAME}; then \
${PKG_DELETE} -f ${PKGNAME}; \
else \
${ECHO_MSG} "===> ${PKGNAME} not installed, skipping"; \
fi
@${RM} -f ${INSTALL_COOKIE} ${PACKAGE_COOKIE}
.endif
@ -2213,7 +2218,7 @@ fetch-list:
@(cd ${_DISTDIR}; \
for file in ${PATCHFILES}; do \
if [ ! -f $$file -a ! -f `${BASENAME} $$file` ]; then \
for site in ${PATCH_SITES}; do \
for site in ${SORTED_PATCH_SITES_CMD}; do \
DIR=${DIST_SUBDIR}; \
CKSIZE=`${GREP} "^SIZE ($${DIR:+$$DIR/}$$file)" ${MD5_FILE} | ${AWK} '{print $$4}'`; \
case $${file} in \
@ -2513,6 +2518,13 @@ clean-depends:
done
.endif
.if !target(deinstall-depends)
deinstall-depends:
@for dir in $$(${CLEAN-DEPENDS-LIST}); do \
(cd $$dir; ${MAKE} NOCLEANDEPENDS=yes deinstall); \
done
.endif
# Dependency lists: build and runtime. Print out directory names.
build-depends-list: