diff options
| author | matthew <matthew@FreeBSD.org> | 2012-06-23 23:18:29 +0800 |
|---|---|---|
| committer | matthew <matthew@FreeBSD.org> | 2012-06-23 23:18:29 +0800 |
| commit | c89b29d354230f2e9c6545415d270523a68b9343 (patch) | |
| tree | a5b4af4f2c14017a6ce210b07112ea97845ac585 /ports-mgmt | |
| parent | 893853d4d8e3ebe09f12da7f01a4cb03558bb8b5 (diff) | |
| download | freebsd-ports-gnome-c89b29d354230f2e9c6545415d270523a68b9343.tar.gz freebsd-ports-gnome-c89b29d354230f2e9c6545415d270523a68b9343.tar.zst freebsd-ports-gnome-c89b29d354230f2e9c6545415d270523a68b9343.zip | |
- Make wanted-ports compatible with pkgng by dropping dependency
on old pkg tools.
Approved by: shaun (mentor)
Submitted by: Bryan Drewery
PR: ports/169301
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/wanted-ports/Makefile | 2 | ||||
| -rw-r--r-- | ports-mgmt/wanted-ports/files/wanted-ports.in | 10 |
2 files changed, 3 insertions, 9 deletions
diff --git a/ports-mgmt/wanted-ports/Makefile b/ports-mgmt/wanted-ports/Makefile index 453a376edd15..c97e4ffd6f92 100644 --- a/ports-mgmt/wanted-ports/Makefile +++ b/ports-mgmt/wanted-ports/Makefile @@ -7,7 +7,7 @@ # port is self-contained in the files directory. PORTNAME= wanted-ports -PORTVERSION= 0.1 +PORTVERSION= 0.2 #PORTREVISION is set from ${CFGFILE} CATEGORIES= ports-mgmt MASTER_SITES= # none diff --git a/ports-mgmt/wanted-ports/files/wanted-ports.in b/ports-mgmt/wanted-ports/files/wanted-ports.in index c29af3232389..3be93c465421 100644 --- a/ports-mgmt/wanted-ports/files/wanted-ports.in +++ b/ports-mgmt/wanted-ports/files/wanted-ports.in @@ -2,7 +2,7 @@ # # $FreeBSD$ -# Copyright 2010 Matthew Seaman. All rights reserved. +# Copyright 2010,2012 Matthew Seaman. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -280,13 +280,7 @@ CONF_FILE=${WANTEDPORTSCFG:-/var/db/%%PORTNAME%%.conf} # The currently installed version of %%PKGNAME%% -- accounting for any # dynamic updates to PORTREVISION -INSTALLED_PKG=$( pkg_info -Ex %%PKGNAME%% ) - -if [ -z $INSTALLED_PKG ] ; then - echo "${ME}: FATAL -- the package providing this script seems " \ - "not to be installed" >&2 - exit 1 -fi +INSTALLED_PKG="%%PKGNAME%%" # # Handle Options -- Main Code Loop |