diff options
| author | Koop Mast <koop@beyonit.nl> | 2019-09-25 01:10:20 +0800 |
|---|---|---|
| committer | Koop Mast <koop@beyonit.nl> | 2019-09-25 01:10:20 +0800 |
| commit | c5d4cd5d5cbcd9f16aa5bd8e5fcfdc96e17a81f6 (patch) | |
| tree | 4b5a3cd1d243ff0c74465ea743ec310199c5edb5 /ports-mgmt/pkg-devel/Makefile | |
| parent | fe87ebd172e9d689d85015844fb5a85fb32b3e50 (diff) | |
| parent | 54294ad9726b349cbad4ebbbe9711550f8b1e53d (diff) | |
| download | freebsd-ports-gnome-c5d4cd5d5cbcd9f16aa5bd8e5fcfdc96e17a81f6.tar.gz freebsd-ports-gnome-c5d4cd5d5cbcd9f16aa5bd8e5fcfdc96e17a81f6.tar.zst freebsd-ports-gnome-c5d4cd5d5cbcd9f16aa5bd8e5fcfdc96e17a81f6.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'ports-mgmt/pkg-devel/Makefile')
| -rw-r--r-- | ports-mgmt/pkg-devel/Makefile | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/ports-mgmt/pkg-devel/Makefile b/ports-mgmt/pkg-devel/Makefile index a6d0debf6540..c998f0f46df6 100644 --- a/ports-mgmt/pkg-devel/Makefile +++ b/ports-mgmt/pkg-devel/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= pkg -DISTVERSION= 1.11.99.3 +DISTVERSION= 1.12.99.0 _PKG_VERSION= ${DISTVERSION} CATEGORIES= ports-mgmt PKGNAMESUFFIX= -devel @@ -13,7 +13,7 @@ LICENSE= BSD2CLAUSE USE_GITHUB= yes GH_ACCOUNT= freebsd -GH_TAGNAME= 45b5d943 +GH_TAGNAME= 8004f584 WITH_DEBUG= yes CFLAGS+= -O0 -g -Wno-error @@ -46,29 +46,6 @@ PKGNAMESUFFIX= #define PKG_DEPENDS to nothing to avoid infinite loop looking for pkg :) PKG_DEPENDS= .endif -.if exists(${LOCALBASE}/sbin/pkg_info) || exists(/usr/sbin/pkg_info) -NB_OLDPKGS!= pkg_info 2>/dev/null | wc -l -.if exists(${PKG_BIN}) -NB_NEWPKGS!= ${PKG_INFO} -aq | wc -l -.else -NB_NEWPKGS= 0 -.endif -# Only show the pre-everything notice if they have not already -# converted any packages -.if ${NB_OLDPKGS} > 0 && ${NB_NEWPKGS} == 0 - -pre-everything:: - @${ECHO_CMD} "You are about to convert your system to pkg while you have ports/packages"; \ - ${ECHO_CMD} "installed with the old pkg_install tools."; \ - ${ECHO_CMD} ""; \ - ${ECHO_CMD} "To switch to pkg:"; \ - ${ECHO_CMD} " 1) Install ports-mgmt/pkg"; \ - ${ECHO_CMD} " 2) Convert your package database by running pkg2ng"; \ - ${ECHO_CMD} ""; \ - exit 1 - -.endif -.endif .endif .undef INSTALLS_DEPENDS |