From 5ce1bea7b8193de910f347f2ee9f93cf9b673632 Mon Sep 17 00:00:00 2001 From: Thomas Zander Date: Sat, 16 Sep 2017 10:36:17 +0000 Subject: [PATCH] Fix remaining uses of mount_devfs and pkg_install; cleanup port Details: - Fix remaining uses of mount_devfs and pkg_install [1] - Bump PORTREVISION - Add pkg-message about the upstream project no longer being maintained - pet portlint Reported by: christophe.maury@gmail.com via email [1] --- sysutils/freesbie/Makefile | 17 ++++---- .../files/patch-extra_installports.sh | 11 +++++ sysutils/freesbie/files/patch-extra_varmfs.sh | 8 ++++ ...ch-scripts-iso.sh => patch-scripts_iso.sh} | 6 +-- ...atch-pkgng => patch-scripts_pkginstall.sh} | 43 +++---------------- .../freesbie/files/patch-scripts_pkgselect.sh | 29 +++++++++++++ sysutils/freesbie/pkg-message | 5 +++ 7 files changed, 71 insertions(+), 48 deletions(-) create mode 100644 sysutils/freesbie/files/patch-extra_installports.sh create mode 100644 sysutils/freesbie/files/patch-extra_varmfs.sh rename sysutils/freesbie/files/{patch-scripts-iso.sh => patch-scripts_iso.sh} (70%) rename sysutils/freesbie/files/{extra-patch-pkgng => patch-scripts_pkginstall.sh} (57%) create mode 100644 sysutils/freesbie/files/patch-scripts_pkgselect.sh create mode 100644 sysutils/freesbie/pkg-message diff --git a/sysutils/freesbie/Makefile b/sysutils/freesbie/Makefile index 7240dfeea701..4fdb95400b12 100644 --- a/sysutils/freesbie/Makefile +++ b/sysutils/freesbie/Makefile @@ -3,7 +3,7 @@ PORTNAME= freesbie PORTVERSION= 2.0.20070710 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MASTER_SITES= LOCAL/riggs/freesbie DISTNAME= ${PORTNAME}-${PORTVERSION:S/2.0.//} @@ -13,17 +13,16 @@ COMMENT= Yet another cool answer to the system-on-cd question LICENSE= BSD2CLAUSE -RUN_DEPENDS= cdrecord:sysutils/cdrtools - -USES= tar:bzip2 -NO_BUILD= yes - -WRKSRC= ${WRKDIR}/${PORTNAME}2 - ONLY_FOR_ARCHS= amd64 i386 powerpc ONLY_FOR_ARCHS_REASON= FreeSBIE build system only supports amd64, i386 and powerpc -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-pkgng +RUN_DEPENDS= cdrecord:sysutils/cdrtools + +USES= tar:bzip2 +NO_ARCH= yes +NO_BUILD= yes + +WRKSRC= ${WRKDIR}/${PORTNAME}2 pre-configure: @${SED} -e "s:%%ARCH%%:${ARCH}:g" ${FILESDIR}/conf-arch-FREESBIE.in > ${WRKSRC}/conf/${ARCH}/FREESBIE diff --git a/sysutils/freesbie/files/patch-extra_installports.sh b/sysutils/freesbie/files/patch-extra_installports.sh new file mode 100644 index 000000000000..fb8b6e072af8 --- /dev/null +++ b/sysutils/freesbie/files/patch-extra_installports.sh @@ -0,0 +1,11 @@ +--- extra/installports.sh.orig 2007-01-04 18:28:56 UTC ++++ extra/installports.sh +@@ -35,7 +35,7 @@ if [ ! -z "${INSTALL_PORTS}" ]; then + mkdir -p ${BASEDIR}/usr/ports ${BASEDIR}/usr/src + mount_nullfs ${PORTSDIR:-/usr/ports} ${BASEDIR}/usr/ports + mount_nullfs ${SRCDIR:-/usr/src} ${BASEDIR}/usr/src +- mount_devfs none ${BASEDIR}/dev ++ mount -t devfs none ${BASEDIR}/dev + + print_error_umount() { + echo "Something went wrong, check errors!" >&2 diff --git a/sysutils/freesbie/files/patch-extra_varmfs.sh b/sysutils/freesbie/files/patch-extra_varmfs.sh new file mode 100644 index 000000000000..a4afa5f19778 --- /dev/null +++ b/sysutils/freesbie/files/patch-extra_varmfs.sh @@ -0,0 +1,8 @@ +--- extra/varmfs.sh.orig 2006-04-24 11:14:33 UTC ++++ extra/varmfs.sh +@@ -28,4 +28,4 @@ mtree -Pcp ${BASEDIR}/var > ${TMPFILE} + mv ${TMPFILE} ${BASEDIR}/etc/mtree/var.dist + + echo "Generating pkg_info.txt" +-chroot ${BASEDIR} pkg_info > ${BASEDIR}/pkg_info.txt ++chroot ${BASEDIR} pkg info > ${BASEDIR}/pkg_info.txt diff --git a/sysutils/freesbie/files/patch-scripts-iso.sh b/sysutils/freesbie/files/patch-scripts_iso.sh similarity index 70% rename from sysutils/freesbie/files/patch-scripts-iso.sh rename to sysutils/freesbie/files/patch-scripts_iso.sh index ace6d38942fe..847ebcad0221 100644 --- a/sysutils/freesbie/files/patch-scripts-iso.sh +++ b/sysutils/freesbie/files/patch-scripts_iso.sh @@ -1,6 +1,6 @@ ---- scripts/iso.sh.orig 2006-10-01 14:00:47.000000000 +0200 -+++ scripts/iso.sh 2011-11-06 18:07:26.544790101 +0100 -@@ -48,7 +48,7 @@ +--- scripts/iso.sh.orig 2006-10-01 12:00:47 UTC ++++ scripts/iso.sh +@@ -48,7 +48,7 @@ cd ${CLONEDIR} echo "Running mkisofs..." diff --git a/sysutils/freesbie/files/extra-patch-pkgng b/sysutils/freesbie/files/patch-scripts_pkginstall.sh similarity index 57% rename from sysutils/freesbie/files/extra-patch-pkgng rename to sysutils/freesbie/files/patch-scripts_pkginstall.sh index 44c923e22fe7..d6a0420a8142 100644 --- a/sysutils/freesbie/files/extra-patch-pkgng +++ b/sysutils/freesbie/files/patch-scripts_pkginstall.sh @@ -1,6 +1,6 @@ ---- scripts/pkginstall.sh.orig 2007-01-16 19:14:46.000000000 +0900 -+++ scripts/pkginstall.sh 2014-03-10 15:36:47.962245461 +0900 -@@ -52,7 +52,7 @@ +--- scripts/pkginstall.sh.orig 2007-01-16 10:14:46 UTC ++++ scripts/pkginstall.sh +@@ -52,7 +52,7 @@ find_origins() { # pkg_info might fail if the listed package isn't present set +e @@ -9,7 +9,7 @@ retval=$? set -e if [ ${retval} -eq 0 ]; then -@@ -84,7 +84,7 @@ +@@ -84,7 +84,7 @@ find_deps() { touch deps echo -n "Finding dependencies... " while read pkg; do @@ -18,7 +18,7 @@ for dep in ${deps}; do echo ${dep} >> tmp_deps done -@@ -142,7 +142,7 @@ +@@ -142,7 +142,7 @@ copy_packages() { export PACKAGE_BUILDING=yo chrootpkgpath=${CHROOTWD#$BASEDIR} pkgfile=${WORKDIR}/sortpkg @@ -27,7 +27,7 @@ totpkg=$(wc -l $pkgfile | awk '{print $1}') echo "Copying ${totpkg} packages" cd ${CHROOTWD} -@@ -159,7 +159,11 @@ +@@ -159,7 +159,11 @@ copy_packages() { count=$((${count} + 1)) echo "Running pkg_create -b ${pkg} ${CHROOTWD}/${pkg}.tar" >> ${LOGFILE} @@ -40,7 +40,7 @@ echo "Running $pkgaddcmd ${chrootpkgpath}/${pkg}.tar" >> ${LOGFILE} $pkgaddcmd ${chrootpkgpath}/${pkg}.tar >> ${LOGFILE} 2>&1 -@@ -168,12 +172,17 @@ +@@ -168,12 +172,17 @@ copy_packages() { done < $pkgfile echo "]" @@ -59,32 +59,3 @@ } # Deletes workdirs ---- scripts/pkgselect.sh.orig 2014-02-16 02:43:17.000000000 +0000 -+++ scripts/pkgselect.sh 2014-02-25 20:55:34.000000000 +0000 -@@ -21,7 +21,7 @@ - - # Check if there are packages installed on the system - check_pkgs() { -- count=$(pkg_info -Qoa | wc -l) -+ count=$(pkg query -a "%n-%v:%o" | wc -l) - if [ ${count} -eq 0 ]; then - /usr/bin/dialog --title "FreeSBIE Packages selection" --clear \ - --msgbox "Sorry, you don't have any packages installed.\n\nPlease install at least the packages you want\nto include in your distribution." 10 50 -@@ -40,7 +40,7 @@ - # Create a different file for each category. Each row in each file - # will look like: - # PKGNAME PKGNAME-version -- pkg_info -Qoa | awk \ -+ pkg query -a "%n-%v:%o" | awk \ - ' BEGIN { FS=":|/" } - { - a=$1; -@@ -63,7 +63,7 @@ - - # pkg_info might fail if the listed package isn't present - set +e -- origins=$(pkg_info -QoX "^$(escape_pkg ${pkg})($|-[^-]+$)") -+ origins=$(pkg query -x "%n-%v:%o" "^$(escape_pkg ${pkg})($|-[^-]+$)") - retval=$? - set -e - if [ ${retval} -eq 0 ]; then diff --git a/sysutils/freesbie/files/patch-scripts_pkgselect.sh b/sysutils/freesbie/files/patch-scripts_pkgselect.sh new file mode 100644 index 000000000000..3eab26fb9cf4 --- /dev/null +++ b/sysutils/freesbie/files/patch-scripts_pkgselect.sh @@ -0,0 +1,29 @@ +--- scripts/pkgselect.sh.orig 2006-05-26 23:20:09 UTC ++++ scripts/pkgselect.sh +@@ -21,7 +21,7 @@ PKGFILE=${PKGFILE:-${LOCALDIR}/conf/pack + + # Check if there are packages installed on the system + check_pkgs() { +- count=$(pkg_info -Qoa | wc -l) ++ count=$(pkg query -a "%n-%v:%o" | wc -l) + if [ ${count} -eq 0 ]; then + /usr/bin/dialog --title "FreeSBIE Packages selection" --clear \ + --msgbox "Sorry, you don't have any packages installed.\n\nPlease install at least the packages you want\nto include in your distribution." 10 50 +@@ -40,7 +40,7 @@ create_lists() { + # Create a different file for each category. Each row in each file + # will look like: + # PKGNAME PKGNAME-version +- pkg_info -Qoa | awk \ ++ pkg query -a "%n-%v:%o" | awk \ + ' BEGIN { FS=":|/" } + { + a=$1; +@@ -63,7 +63,7 @@ create_lists() { + + # pkg_info might fail if the listed package isn't present + set +e +- origins=$(pkg_info -QoX "^$(escape_pkg ${pkg})($|-[^-]+$)") ++ origins=$(pkg query -x "%n-%v:%o" "^$(escape_pkg ${pkg})($|-[^-]+$)") + retval=$? + set -e + if [ ${retval} -eq 0 ]; then diff --git a/sysutils/freesbie/pkg-message b/sysutils/freesbie/pkg-message new file mode 100644 index 000000000000..59d7fa4cb857 --- /dev/null +++ b/sysutils/freesbie/pkg-message @@ -0,0 +1,5 @@ +=========================================================================== +Note that the FreeSBIE project is not actively maintained. There were no +upstream releases since 2007. If you are a regular user of this port, +please consider adopting the upstream project. +===========================================================================