Page MenuHomeFreeBSD
Files F154262618

D51142.id.diff
No OneTemporary
Actions

D51142.id.diff
View Options

diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1203,14 +1203,6 @@
. if !defined(_PKG_VERSION)
_PKG_VERSION!= ${PKG_BIN} -v
. endif
-# XXX hack for smooth transition towards pkg 1.17
-_PKG_BEFORE_PKGEXT!= ${PKG_BIN} version -t ${_PKG_VERSION:C/-.*//g} 1.17.0
-. if ${_PKG_BEFORE_PKGEXT} == "<"
-_PKG_TRANSITIONING_TO_NEW_EXT= yes
-_EXPORTED_VARS+= _PKG_TRANSITIONING_TO_NEW_EXT
-WARNING+= "It is strongly recommended to upgrade to a newer version of pkg first"
-. endif
-# XXX End of hack
_PKG_STATUS!= ${PKG_VERSION} -t ${_PKG_VERSION:C/-.*//g} ${MINIMAL_PKG_VERSION}
. if ${_PKG_STATUS} == "<"
IGNORE= pkg(8) must be version ${MINIMAL_PKG_VERSION} or greater, but you have ${_PKG_VERSION}. You must upgrade the ${PKG_ORIGIN} port first
@@ -2208,20 +2200,11 @@
_PLIST?= ${WRKDIR}/.PLIST
# backward compatibility for users
-. if defined(_PKG_TRANSITIONING_TO_NEW_EXT)
-. if defined(PKG_NOCOMPRESS)
-PKG_SUFX?= .tar
-. else
-PKG_SUFX?= .txz
-. endif
-PKG_COMPRESSION_FORMAT?= ${PKG_SUFX:S/.//}
-. else
-. if defined(PKG_SUFX)
+. if defined(PKG_SUFX)
PKG_COMPRESSION_FORMAT?= ${PKG_SUFX:S/.//}
WARNING+= "PKG_SUFX is defined, it should be replaced with PKG_COMPRESSION_FORMAT"
-. endif
-PKG_SUFX= .pkg
. endif
+PKG_SUFX= .pkg
. if defined(PKG_NOCOMPRESS)
PKG_COMPRESSION_FORMAT?= tar
. else
@@ -3456,18 +3439,6 @@
${PKGLATESTFILE}: ${PKGFILE} ${PKGLATESTREPOSITORY}
${INSTALL} -l rs ${PKGFILE} ${PKGLATESTFILE}
-. if !defined(_PKG_TRANSITIONING_TO_NEW_EXT) && ${PKG_COMPRESSION_FORMAT} == txz
-_EXTRA_PACKAGE_TARGET_DEP+= ${PKGOLDLATESTFILE} ${PKGOLDSIGFILE}
-
-${PKGOLDLATESTFILE}: ${PKGFILE} ${PKGLATESTREPOSITORY}
- ${INSTALL} -l rs ${PKGFILE} ${PKGOLDLATESTFILE}
-
-# Temporary workaround to be deleted once every supported version of FreeBSD
-# have a bootstrap which handles the pkg extension.
-
-${PKGOLDSIGFILE}: ${PKGLATESTREPOSITORY}
- ${INSTALL} -l rs pkg.pkg.sig ${PKGOLDSIGFILE}
-. endif
. endif
. endif

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 28, 11:33 AM (4 h, 43 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32228486
Default Alt Text
D51142.id.diff (2 KB)

Event Timeline