 @@ -1,16 +1,16 @@
 #!@SH@
+#
-# $NetBSD: pkg_alternatives.sh,v 1.6 2007/01/15 02:50:06 rillig Exp $
+# $NetBSD: pkg_alternatives.sh,v 1.7 2012/06/13 15:35:32 jperkin Exp $
+#
 # pkg_alternatives - Generic wrappers for programs with similar interfaces
 # Copyright (c) 2005 Julio M. Merino Vidal <jmmv@NetBSD.org>
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in
 #    the documentation and/or other materials provided with the
 #    distribution.
 @@ -46,29 +46,29 @@ Verbose=yes
 # -------------------------------------------------------------------------
 # action_auto_package package
+#
 # Configures the given package to be in automatic mode.  I.e., it removes
 # local customizations for all related wrappers, so that only the files in
 # the database are taken into account.
+#
 action_auto_package() {
     validate_args auto ${#} -eq 1
     validate_package ${1}
     pkg=${PKG_DBDIR}/${1}*/+ALTERNATIVES
-    set -- $(cat ${pkg} | tr ' ' '�')
+    set -- $(cat ${pkg} | sed -e 's# #__dE/lImIt/Er__#g')
     while [ ${#} -gt 0 ]; do
-        action_auto_wrapper $(echo ${1} | cut -d '�' -f 1)
+        action_auto_wrapper ${1%%__dE/lImIt/Er__*}
         shift
     done
+}
 # -------------------------------------------------------------------------
 # action_auto_wrapper wrapper
+#
 # Configures the given wrapper to be in automatic mode.  I.e., it removes
 # local customizations so that only the files in the database are taken
 # into account.
+#
 # wrapper is a path relative to prefix.
 @@ -151,29 +151,29 @@ action_list_wrapper() {
 # -------------------------------------------------------------------------
 # action_manual_package package
+#
 # Configures the given package to be the preferred alternative for all the
 # wrappers associated to it.
+#
 action_manual_package() {
     validate_args manual ${#} -eq 1
     validate_package ${1}
     pkg=${PKG_DBDIR}/${1}*/+ALTERNATIVES
-    set -- $(cat ${pkg} | tr ' ' '�')
+    set -- $(cat ${pkg} | sed -e 's# #__dE/lImIt/Er__#g')
     while [ ${#} -gt 0 ]; do
-        action_manual_wrapper $(echo ${1} | tr '�' ' ')
+        action_manual_wrapper $(echo ${1} | sed -e 's#__dE/lImIt/Er__# #g')
         shift
     done
+}
 # -------------------------------------------------------------------------
 # action_manual_wrapper wrapper alternative arguments
+#
 # Configures the given wrapper to use the specified alternative.
 # If running as the administrator, the system-wide settings are changed;
 # otherwise, the user-specific settings are affected.
+#
 # wrapper is a path relative to prefix.
 @@ -221,29 +221,29 @@ action_rebuild_wrapper() {
+}
 # -------------------------------------------------------------------------
 # action_register_package file
+#
 # Registers all wrapper/alternative pairs listed in the file.  This is
 # supposed to be an +ALTERNATIVES file found inside a package in PKG_DBDIR.
 # Each line should follow the semantics expected by action_register_wrapper.
+#
 action_register_package() {
     validate_args register ${#} -eq 1
-    set -- $(cat ${1} | tr ' ' '�')
+    set -- $(cat ${1} | sed -e 's# #__dE/lImIt/Er__#g')
     while [ ${#} -gt 0 ]; do
-        action_register_wrapper $(echo ${1} | tr '�' ' ')
+        action_register_wrapper $(echo ${1} | sed -e 's#__dE/lImIt/Er__# #g')
         shift
     done
+}
 # -------------------------------------------------------------------------
 # action_register_wrapper wrapper alternative arguments
+#
 # Registers a new alternative for the given wrapper in the database.
 # The wrapper and its manual page are created if they do not exist.
+#
 action_register_wrapper() {
     validate_args register ${#} -ge 2
 @@ -266,27 +266,28 @@ action_register_wrapper() {
         mkdir_p ${dbconf%/*}
         touch ${dbconf%/*}
     fi
     info "registering alternative \`${alt}' for wrapper \`${wbase}'"
     if [ -n "${args}" ]; then
         echo "${alt} ${args}" >>${dbconf}
     else
         echo "${alt}" >>${dbconf}
     fi
     if [ ! -f ${wabs} ]; then
         info "creating wrapper \`${wbase}'"
         mkdir_p ${wabs%/*}
-        sed -e "s|__SH__|@SH@|g" \
+        sed -e "s|__ID__|@ID@|g" \
             -e "s|__SH__|@SH@|g" \
             -e "s|__CONF_FILE__|${sysconf}|g" \
             -e "s|__CREATOR__|${Prog_Name}|g" \
             -e "s|__DB_FILE__|${dbconf}|g" \
             -e "s|__ROOT_USER__|@ROOT_USER@|g" \
             -e "s|__WRAPPER__|${wabs}|g" \
             <${Data_Dir}/wrapper.sh >${wabs}
         chmod +x ${wabs}
         mkdir_p ${manpage%/*}
         sed -e "s|__CONF_FILE__|${sysconf}|g" \
             -e "s|__CREATOR__|${Prog_Name}|g" \
             -e "s|__DB_FILE__|${dbconf}|g" \
             -e "s|__PREFIX__|${Prefix}|g" \
             -e "s|__SECTION__|$(get_manpage_sect ${wbase})|g" \
 @@ -298,83 +299,83 @@ action_register_wrapper() {
+}
 # -------------------------------------------------------------------------
 # action_status_package package
+#
 # Shows the status of each wrapper associated to the given package.
+#
 action_status_package() {
     validate_args status ${#} -eq 1
     validate_package ${1}
     pkg=${PKG_DBDIR}/${1}*/+ALTERNATIVES
-    set -- $(cat ${pkg} | tr ' ' '�')
+    set -- $(cat ${pkg} | sed -e 's# #__dE/lImIt/Er__#g')
     while [ ${#} -gt 0 ]; do
-        action_status_wrapper $(echo ${1} | cut -d '�' -f 1)
+        action_status_wrapper ${1%%__dE/lImIt/Er__*}
         shift
     done
+}
 # -------------------------------------------------------------------------
 # action_status_wrapper wrapper
+#
 # Shows the current status for the given wrapper.
+#
 action_status_wrapper() {
     validate_args status ${#} -eq 1
     validate_wrapper ${1} yes
     wbase=${1}
     dbconf=${Db_Dir}/${wbase}
     sysconf=${Conf_Dir}/${wbase}
     userconf=~/.pkg_alternatives${Prefix}/${wbase}
-    [ $(id -un) = @ROOT_USER@ ] && userconf=
+    [ $(@ID@ -un) = @ROOT_USER@ ] && userconf=
     alts=$(cat ${userconf} ${sysconf} ${dbconf} 2>/dev/null | grep -v '^#' | \
-           tr ' ' '�')
+           sed -e 's# #__dE/lImIt/Er__#g')
     found=
     for a in ${alts}; do
-        prog=$(echo ${a} | cut -d '�' -f 1)
+        prog=${a%%__dE/lImIt/Er__*}
         if [ -x ${prog} ]; then
-            found=$(echo ${a} | tr '�' ' ')
+            found=$(echo ${a} | sed -e 's#__dE/lImIt/Er__# #g')
             break
         fi
     done
     [ -n "${found}" ] ||
         err "the wrapper \`${wbase}' exists but has no valid alternatives"
     echo "\`${wbase}' points to \`${found}'"
     for a in $(echo ${alts} | tr ' ' '\n' | sort | uniq); do
-        echo "    candidate: $(echo ${a} | tr '�' ' ')"
+        echo "    candidate: $(echo ${a} | sed -e 's#__dE/lImIt/Er__# #g')"
     done
+}
 # -------------------------------------------------------------------------
 # action_unregister_package file
+#
 # Unregisters the given package (given by its +ALTERNATIVES file) and
 # removes all associated alternatives from their respective wrappers.
+#
 action_unregister_package() {
     validate_args unregister ${#} -eq 1
-    set -- $(cat ${1} | tr ' ' '�')
+    set -- $(cat ${1} | sed -e 's# #__dE/lImIt/Er__#g')
     while [ ${#} -gt 0 ]; do
-        action_unregister_wrapper $(echo ${1} | tr '�' ' ')
+        action_unregister_wrapper $(echo ${1} | sed -e 's#__dE/lImIt/Er__# #g')
         shift
     done
+}
 # -------------------------------------------------------------------------
 # action_unregister_wrapper wrapper alternative arguments
+#
 # Unregisters an alternative for the given wrapper.  The lookup is done
 # based on the alternative name and its arguments.  I.e., there must be
 # an exact match.  If no alternatives remain after the removal, the wrapper
 # and its manpage are removed.
+#
 @@ -421,68 +422,68 @@ err() {
+}
 # -------------------------------------------------------------------------
 # filter wrapper
+#
 # Reads the configuration filter from CONFDIR/filter.conf and, for the
 # given wrapper, returns whether it is accepted or ignored.
+#
 filter() {
     [ ! -f @CONFDIR@/filter.conf ] && return 0
     if [ ${Filter_Read} = no ]; then
-        Filter=$(cat @CONFDIR@/filter.conf | grep -v '^#' | tr ' ' '�')
+        Filter=$(cat @CONFDIR@/filter.conf | grep -v '^#' | sed -e 's# #__dE/lImIt/Er__#g')
         Filter_Read=yes
     fi
     [ -z "${Filter}" ] && return 0
     for f in ${Filter}; do
-        what=$(echo ${f} | cut -d '�' -f 1)
+        what=${f%%__dE/lImIt/Er__*}
         case ${what} in
             accept)
-                name=$(echo ${f} | cut -d '�' -f 2- | tr '�' ' ')
+                name=$(echo ${f#*__dE/lImIt/Er__} | sed -e 's#__dE/lImIt/Er__# #g')
                 if echo ${1} | grep "${name}" >/dev/null; then
                     info "filter accepts \`${1}'"
                     return 0
                 fi
                 ;;
             ignore)
-                name=$(echo ${f} | cut -d '�' -f 2- | tr '�' ' ')
+                name=$(echo ${f#*__dE/lImIt/Er__} | sed -e 's#__dE/lImIt/Er__# #g')
                 if echo ${1} | grep "${name}" >/dev/null; then
                     info "filter ignores \`${1}'"
                     return 1
                 fi
                 ;;
             *)
                 warn "unknown filter type \`${what}'; ignoring"
                 ;;
         esac
     done
     true
+}
 # -------------------------------------------------------------------------
 # get_my_config
+#
 # Prints the configuration directory for the current user.  If root, this
 # is the system-wide configuration directory.  Otherwise, it is the user's
 # personal directory.
+#
 get_my_config() {
-    if [ $(id -un) = @ROOT_USER@ ]; then
+    if [ $(@ID@ -un) = @ROOT_USER@ ]; then
         echo ${Conf_Dir}
     else
         echo ~/.pkg_alternatives${Prefix}
     fi
+}
 # -------------------------------------------------------------------------
 # get_manpage wrapper
+#
 # Prints the absolute path to the manual page associated to wrapper.
 # Does no error checking; validate_wrapper has to be called before this
 # function to ensure wrapper is a valid name.

 @@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.17 2012/06/13 15:28:23 jperkin Exp $
+# $NetBSD: Makefile,v 1.18 2012/06/13 15:35:32 jperkin Exp $
+#
-DISTNAME=	pkg_alternatives-1.5
+DISTNAME=	pkg_alternatives-1.6
 CATEGORIES=	pkgtools
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 MAINTAINER=	jmmv@NetBSD.org
 COMMENT=	Generic wrappers for programs with similar interfaces
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 NO_BUILD=		YES
 WRKSRC=			${WRKDIR}
 @@ -28,26 +28,27 @@ PKG_SYSCONFSUBDIR=	pkg_alternatives
 CONF_FILES=		${EGDIR}/filter.conf ${PKG_SYSCONFDIR}/filter.conf
 SUBST_CLASSES+=		vars
 SUBST_STAGE.vars=	do-configure
 SUBST_MESSAGE.vars=	Configuring sources.
 SUBST_FILES.vars=	pkg_alternatives.8 pkg_alternatives.sh
 SUBST_SED.vars=		-e 's|@CONFDIR@|${PKG_SYSCONFDIR}|g'
 SUBST_SED.vars+=	-e 's|@DATADIR@|${DATADIR}|g'
 SUBST_SED.vars+=	-e 's|@DBDIR@|${DBDIR}|g'
 SUBST_SED.vars+=	-e 's|@PKGMANDIR@|${PKGMANDIR}|g'
 SUBST_SED.vars+=	-e 's|@PKG_DBDIR@|${PKG_DBDIR}|g'
 SUBST_SED.vars+=	-e 's|@PREFIX@|${PREFIX}|g'
 SUBST_SED.vars+=	-e 's|@ROOT_USER@|${REAL_ROOT_USER}|g'
 SUBST_SED.vars+=	-e 's|@ID@|${ID}|g'
 SUBST_SED.vars+=	-e 's|@SH@|${SH}|g'
 INSTALLATION_DIRS=	${PKGMANDIR}/man8 sbin
 CHECK_INTERPRETER_SKIP=	${DATADIR}/wrapper.sh
 do-extract:
 	${CP} ${FILESDIR}/pkg_alternatives.sh ${WRKSRC}
 	${CP} ${FILESDIR}/pkg_alternatives.8 ${WRKSRC}
 	${CP} ${FILESDIR}/wrapper.sh ${WRKSRC}
 	${CP} ${FILESDIR}/wrapper.man ${WRKSRC}
 	${CP} ${FILESDIR}/filter.conf ${WRKSRC}

 @@ -1,16 +1,16 @@
 #!__SH__
+#
-# $NetBSD: wrapper.sh,v 1.1.1.1 2005/01/25 13:00:46 jmmv Exp $
+# $NetBSD: wrapper.sh,v 1.2 2012/06/13 15:35:32 jperkin Exp $
+#
 # pkg_alternatives - Generic wrappers for programs with similar interfaces
 # Copyright (c) 2005 Julio M. Merino Vidal <jmmv@NetBSD.org>
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in
 #    the documentation and/or other materials provided with the
 #    distribution.
 @@ -29,36 +29,36 @@
 # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
+#
 wrapper="__WRAPPER__"
 progname="${wrapper##*/} (wrapper)"
 if [ ! -f __DB_FILE__ ]; then
     echo "${progname}: cannot open __DB_FILE__" 1>&2
     exit 1
 fi
-if [ $(id -un) = __ROOT_USER__ ]; then
+if [ $(__ID__ -un) = __ROOT_USER__ ]; then
     userfile=
 else
     userfile=~/.pkg_alternatives/${wrapper}
 fi
 alternatives=$(cat ${userfile} __CONF_FILE__ __DB_FILE__ 2>/dev/null | \
-               grep -v "^#" | tr ' ' '�')
+               grep -v "^#" | sed -e 's# #__dE/lImIt/Er__#g')
 found=
 for a in ${alternatives}; do
-    prog=$(echo ${a} | cut -d '�' -f 1)
+    prog=${a%%__dE/lImIt/Er__*}
     if [ -x ${prog} ]; then
-        found=$(echo ${a} | tr '�' ' ')
+        found=$(echo ${a} | sed -e 's#__dE/lImIt/Er__# #g')
 	break
     fi
 done
 if [ -z "${found}" ]; then
     echo "${progname}: no alternatives found" 1>&2
     exit 1
 fi
 exec ${found} "${@}"