diff --git a/base/dcron/dcron.SMBuild b/base/dcron/dcron.SMBuild index f456faf..b793710 100755 --- a/base/dcron/dcron.SMBuild +++ b/base/dcron/dcron.SMBuild @@ -1,6 +1,6 @@ app=dcron version=4.5 -build=1sml +build=2sml homepage='http://www.jimpryor.net/linux/dcron.html' download='http://www.jimpryor.net/linux/releases/dcron-4.5.tar.gz' desc="Dillons Cron daemon" @@ -30,7 +30,7 @@ build() { install -Dm 644 $srcdir/run-parts.8 $pkg/share/man/man8/run-parts.8 # Create some other stuff we need - mkdir -p $pkg/etc/cron.{hourly,daily,weekly,monthly + mkdir -p $pkg/etc/cron.{hourly,daily,weekly,monthly} install -dm 0751 $pkg/var/spool/cron install -dm 750 $pkg/var/spool/cron/crontabs install -dm 750 $pkg/var/spool/cron/cronstamps @@ -39,8 +39,6 @@ build() { # dcron will whine about "unable to scan this directory", so we'll create it mkdir -p $pkg/etc/cron.d - cp CHANGELOG README $pkgdocs/ - mkfinalpkg } sha512sums=" diff --git a/base/pkgtools/scripts/installpkg b/base/pkgtools/scripts/installpkg index d56e260..92f8d5e 100755 --- a/base/pkgtools/scripts/installpkg +++ b/base/pkgtools/scripts/installpkg @@ -513,9 +513,17 @@ EOF echo "PACKAGE MD5SUM: $(md5sum $package | cut -f 1 -d ' ')" >> $ADM_DIR/packages/$shortname fi echo "PACKAGE DESCRIPTION:" >> $ADM_DIR/packages/$shortname - grep "^$packagebase:" $DESCRIPTION >> $ADM_DIR/packages/$shortname 2> /dev/null + if [ -n "$SMLINUX_DESC" ] ; then + echo $DESCRIPTION >> $ADM_DIR/packages/$shortname 2> /dev/null + else + grep "^$packagebase:" $DESCRIPTION >> $ADM_DIR/packages/$shortname 2> /dev/null + fi if [ "$shortname" != "$packagebase" ]; then - grep "^$shortname:" $DESCRIPTION >> $ADM_DIR/packages/$shortname 2> /dev/null + if [ -n "$SMLINUX_DESC" ] ; then + echo $DESCRIPTION >> $ADM_DIR/packages/$shortname 2> /dev/null + else + grep "^$shortname:" $DESCRIPTION >> $ADM_DIR/packages/$shortname 2> /dev/null + fi fi echo "FILE LIST:" >> $ADM_DIR/packages/$shortname ( cd $ROOT/ ; $packagecompression -dc | $TAR -xlUpvf - | sort ) < $package >> $TMP/$shortname 2> /dev/null diff --git a/net/epiphany/epiphany.SMBuild b/net/epiphany/epiphany.SMBuild deleted file mode 100755 index b2c155d..0000000 --- a/net/epiphany/epiphany.SMBuild +++ /dev/null @@ -1,31 +0,0 @@ -app=epiphany -version=3.38.5 -build=1sml -desc="Webkit-based browser for GNOME" -homepage="https://wiki.gnome.org/Apps/Web" -download="https://gitlab.gnome.org/GNOME/epiphany/-/archive/41.3/epiphany-41.3.tar.bz2" -requires="libhandy libdazzle webkitgtk" - -build() { - mkandenterbuilddir - rm -rf $app-$version - - tar xf $srcdir/$app-$version.tar.?z** - cd $app-$version - fixbuilddirpermissions - - patch -p1 < $srcdir/fix-portal-header.patch - - mkdir -p smbuild && cd smbuild - meson .. \ - --prefix="/" - - ninja - DESTDIR="$pkg" ninja install - - mkfinalpkg -} - -sha512sums=" -9c0189fb4570d5060c5443090a783d0634f687b8c50df36dcc24881cda02709ee458ae553780c00ff313042324b5d4707382c77c7b06900821c8fa495cfbacd9 epiphany-3.38.5.tar.bz2 -" diff --git a/net/epiphany/fix-portal-header.patch b/net/epiphany/fix-portal-header.patch deleted file mode 100644 index f8baa5e..0000000 --- a/net/epiphany/fix-portal-header.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/lib/ephy-flatpak-utils.c 2022-02-20 21:15:29.929976667 +0530 -+++ b/lib/ephy-flatpak-utils.c 2022-02-20 21:15:53.009691292 +0530 -@@ -28,7 +28,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include