]> gitweb.fluxo.info Git - slackbuilds.git/commitdiff
projects / slackbuilds.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e1e6b23)
Consertando alguns bugs
authorluis <luis@370017ae-e619-0410-ac65-c121f96126d4>
Mon, 29 Jan 2007 08:21:30 +0000 (08:21 +0000)
committerluis <luis@370017ae-e619-0410-ac65-c121f96126d4>
Mon, 29 Jan 2007 08:21:30 +0000 (08:21 +0000)
git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@995 370017ae-e619-0410-ac65-c121f96126d4

app/crypt/gnupg2/gnupg2.SlackBuild patch | blob | history
dev/libs/libassuan/libassuan.SlackBuild patch | blob | history
dev/libs/libgcrypt/libgcrypt.SlackBuild patch | blob | history
dev/libs/libgpg-error/libgpg-error.SlackBuild patch | blob | history
dev/libs/libksba/libksba.SlackBuild patch | blob | history
dev/libs/libpth/libpth.SlackBuild patch | blob | history
sci/electronics/gtkwave/gtkwave.SlackBuild patch | blob | history
sci/electronics/iverilog/iverilog.SlackBuild patch | blob | history
sci/electronics/ivi/ivi.SlackBuild patch | blob | history
sys/apps/microcode_ctl/microcode_ctl.SlackBuild patch | blob | history

diff --git a/app/crypt/gnupg2/gnupg2.SlackBuild b/app/crypt/gnupg2/gnupg2.SlackBuild
index 17d5d7175b2a0e4779228edcc58434aa8ee07dc1..2e7a17fa59a5a374a40c09bcc317fa7907e357f9 100755 (executable)
--- a/app/crypt/gnupg2/gnupg2.SlackBuild
+++ b/app/crypt/gnupg2/gnupg2.SlackBuild
@@ -91,7 +91,8 @@ fi
 gpg --verify "$SRC_DIR/$SRC.sig" "$SRC_DIR/$SRC" || exit $ERROR_GPG
 
 # Untar, patch, configure, compile and install
-tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" -C "$SRC_DIR" || exit $ERROR_TAR
+cd "$SRC_DIR"
+tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
 cd "$PKG_SRC/g10"
 patch -Np0 < "$CWD/filter-context-20-small.diff" || exit $ERROR_PATCH
 cd "$PKG_SRC"
@@ -116,7 +117,7 @@ make install DESTDIR="$PKG" || exit $ERROR_INSTALL
 mv -f "$PKG/$PREFIX/share/gnupg" "$PKG/$PREFIX/share/gnupg2"
 
 # Install gpg2, gpgv2, gpg-agent, and gpgsm already suid root
-chmod 4755 "$PKG/$PREFIX/bin/{gpg2,gpgv2,gpg-agent,gpgsm}"
+chmod 4755 "$PKG/$PREFIX/bin/"{gpg2,gpgv2,gpg-agent,gpgsm}
 
 # Compress and link manpages
 if [ -d "$PKG/$PREFIX/man" ]; then
diff --git a/dev/libs/libassuan/libassuan.SlackBuild b/dev/libs/libassuan/libassuan.SlackBuild
index 884b74ecc758dcba83d61d2269341c8214167979..294022677312a1c1ed9dbc57e32f7825aaa40085 100755 (executable)
--- a/dev/libs/libassuan/libassuan.SlackBuild
+++ b/dev/libs/libassuan/libassuan.SlackBuild
@@ -91,13 +91,14 @@ fi
 gpg --verify "$SRC_DIR/$SRC.sig" "$SRC_DIR/$SRC" || exit $ERROR_GPG
 
 # Untar, configure, compile and install
-tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" -C "$SRC_DIR" || exit $ERROR_TAR
+cd "$SRC_DIR"
+tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
 cd "$PKG_SRC"
 CFLAGS="$SLKCFLAGS" \
   CXXFLAGS="$SLKCFLAGS" \
   ./configure \
   --prefix="$PREFIX" --libdir="$LIBDIR" \
-  --infodir="$PREFIX/info" --mandir="$PREFIX/man" || exit $ERROR_CONF
+  --infodir="$PREFIX/info" || exit $ERROR_CONF
 make || exit $ERROR_MAKE
 make install DESTDIR="$PKG" || exit $ERROR_INSTALL
 
diff --git a/dev/libs/libgcrypt/libgcrypt.SlackBuild b/dev/libs/libgcrypt/libgcrypt.SlackBuild
index ef4c64fb59b449c9b5e1cdd5c91ac01f717a2872..769b628361c99597f992ff1dd5d572a9e2cc4219 100755 (executable)
--- a/dev/libs/libgcrypt/libgcrypt.SlackBuild
+++ b/dev/libs/libgcrypt/libgcrypt.SlackBuild
@@ -91,13 +91,13 @@ fi
 gpg --verify "$SRC_DIR/$SRC.sig" "$SRC_DIR/$SRC" || exit $ERROR_GPG
 
 # Untar, configure, compile and install
-tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" -C "$SRC_DIR" || exit $ERROR_TAR
+cd "$SRC_DIR"
+tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
 cd "$PKG_SRC"
 CFLAGS="$SLKCFLAGS" \
   CXXFLAGS="$SLKCFLAGS" \
   ./configure \
-  --prefix="$PREFIX" --libdir="$LIBDIR" \
-  --infodir="$PREFIX/info" --mandir="$PREFIX/man" \
+  --prefix="$PREFIX" --libdir="$LIBDIR" --infodir="$PREFIX/info" \
   --enable-m-guard --enable-noexecstack || exit $ERROR_CONF
 make || exit $ERROR_MAKE
 make install DESTDIR="$PKG" || exit $ERROR_INSTALL
diff --git a/dev/libs/libgpg-error/libgpg-error.SlackBuild b/dev/libs/libgpg-error/libgpg-error.SlackBuild
index 7d765e852f4af800eccf6f595923b1a29e9b1d98..339d65c2dbc60998e9fcb17e48469d4133b4a0c9 100755 (executable)
--- a/dev/libs/libgpg-error/libgpg-error.SlackBuild
+++ b/dev/libs/libgpg-error/libgpg-error.SlackBuild
@@ -91,13 +91,13 @@ fi
 gpg --verify "$SRC_DIR/$SRC.sig" "$SRC_DIR/$SRC" || exit $ERROR_GPG
 
 # Untar, configure, compile and install
-tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" -C "$SRC_DIR" || exit $ERROR_TAR
+cd "$SRC_DIR"
+tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
 cd "$PKG_SRC"
 CFLAGS="$SLKCFLAGS" \
   CXXFLAGS="$SLKCFLAGS" \
   ./configure \
-  --prefix="$PREFIX" --libdir="$LIBDIR" \
-  --infodir="$PREFIX/info" --mandir="$PREFIX/man" || exit $ERROR_CONF
+  --prefix="$PREFIX" --libdir="$LIBDIR" || exit $ERROR_CONF
 make || exit $ERROR_MAKE
 make install DESTDIR="$PKG" || exit $ERROR_INSTALL
 
diff --git a/dev/libs/libksba/libksba.SlackBuild b/dev/libs/libksba/libksba.SlackBuild
index a82132675224413f831978a4182727b071226522..7a678abc5d93e5f2a2d5f7f335a96f6110a879ed 100755 (executable)
--- a/dev/libs/libksba/libksba.SlackBuild
+++ b/dev/libs/libksba/libksba.SlackBuild
@@ -91,13 +91,14 @@ fi
 gpg --verify "$SRC_DIR/$SRC.sig" "$SRC_DIR/$SRC" || exit $ERROR_GPG
 
 # Untar, configure, compile and install
-tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" -C "$SRC_DIR" || exit $ERROR_TAR
+cd "$SRC_DIR"
+tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
 cd "$PKG_SRC"
 CFLAGS="$SLKCFLAGS" \
   CXXFLAGS="$SLKCFLAGS" \
   ./configure \
   --prefix="$PREFIX" --libdir="$LIBDIR" \
-  --infodir="$PREFIX/info" --mandir="$PREFIX/man" || exit $ERROR_CONF
+  --infodir="$PREFIX/info" || exit $ERROR_CONF
 make || exit $ERROR_MAKE
 make install DESTDIR="$PKG" || exit $ERROR_INSTALL
 
diff --git a/dev/libs/libpth/libpth.SlackBuild b/dev/libs/libpth/libpth.SlackBuild
index fce16c92127d02a202595ed1650b346ae0e82d91..7c12db4e3918aeaceb77485aa09c1495327f818d 100755 (executable)
--- a/dev/libs/libpth/libpth.SlackBuild
+++ b/dev/libs/libpth/libpth.SlackBuild
@@ -108,12 +108,14 @@ fi
 gpg --verify "$SRC_DIR/$SRC.sig" "$SRC_DIR/$SRC" || exit $ERROR_GPG
 
 # Untar, configure, compile and install
-tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" -C "$SRC_DIR" || exit $ERROR_TAR
+cd "$SRC_DIR"
+tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
 cd "$PKG_SRC"
 CFLAGS="$SLKCFLAGS" \
   CXXFLAGS="$SLKCFLAGS" \
   ./configure \
-  --prefix="$PREFIX" --libdir="$LIBDIR" || exit $ERROR_CONF
+  --prefix="$PREFIX" --libdir="$LIBDIR" \
+  --mandir="$PREFIX/man" || exit $ERROR_CONF
 make || exit $ERROR_MAKE
 make test
 make install DESTDIR="$PKG" || exit $ERROR_INSTALL
diff --git a/sci/electronics/gtkwave/gtkwave.SlackBuild b/sci/electronics/gtkwave/gtkwave.SlackBuild
index a4c9a9af80487e1e258ba477260d35d683a9d894..ac330113816b24a2793e894e5997ceb4c21f090f 100755 (executable)
--- a/sci/electronics/gtkwave/gtkwave.SlackBuild
+++ b/sci/electronics/gtkwave/gtkwave.SlackBuild
@@ -83,12 +83,12 @@ else
 fi
 
 # Untar, configure, compile and install
-tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" -C "$SRC_DIR" || exit $ERROR_TAR
+cd "$SRC_DIR"
+tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
 cd "$PKG_SRC"
 CFLAGS="$SLKCFLAGS" \
   CXXFLAGS="$SLKCFLAGS" \
-  echo $GTK_VERSION | ./configure \
-  --prefix="$PREFIX" --libdir="$LIBDIR" || exit $ERROR_CONF
+  echo $GTK_VERSION | ./configure || exit $ERROR_CONF
 make || exit $ERROR_MAKE
 make install prefix="$PKG/$PREFIX" || exit $ERROR_INSTALL
 
diff --git a/sci/electronics/iverilog/iverilog.SlackBuild b/sci/electronics/iverilog/iverilog.SlackBuild
index d7a5490352ec694a11424c66c9995956cdaafae5..b23bfaa3e53ab18b7b7e42d5dac3b82dfff082fc 100755 (executable)
--- a/sci/electronics/iverilog/iverilog.SlackBuild
+++ b/sci/electronics/iverilog/iverilog.SlackBuild
@@ -68,12 +68,12 @@ if [ ! -f "$SRC_DIR/$SRC" ]; then
 fi
 
 # Untar, configure, compile and install
-tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" -C "$SRC_DIR" || exit $ERROR_TAR
+cd "$SRC_DIR"
+tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
 cd "$PKG_SRC"
 CFLAGS="$SLKCFLAGS" \
   CXXFLAGS="$SLKCFLAGS" \
-  ./configure \
-  --prefix="$PREFIX" --libdir="$LIBDIR" || exit $ERROR_CONF
+  ./configure || exit $ERROR_CONF
 make || exit $ERROR_MAKE
 make install prefix="$PKG/$PREFIX" || exit $ERROR_INSTALL
 
diff --git a/sci/electronics/ivi/ivi.SlackBuild b/sci/electronics/ivi/ivi.SlackBuild
index b1391f37068c91fa5d898a7af52a15d1b0fae255..3b732c0ea5bf12caf1ac7a2dd0b8e86b6785d5c2 100755 (executable)
--- a/sci/electronics/ivi/ivi.SlackBuild
+++ b/sci/electronics/ivi/ivi.SlackBuild
@@ -69,20 +69,34 @@ if [ ! -f "$SRC_DIR/$SRC" ]; then
 fi
 
 # Untar, patch, configure, compile and install
-tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" -C "$SRC_DIR" || exit $ERROR_TAR
+cd "$SRC_DIR"
+tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
 cd "$PKG_SRC"
 patch -Np1 < "$CWD/ivi-0.4-pre-20031121-gcc3.4.patch" || exit $ERROR_PATCH
 CFLAGS="$SLKCFLAGS" \
   CXXFLAGS="$SLKCFLAGS" \
-  ./configure \
-  --prefix="$PREFIX" --libdir="$LIBDIR" --enable-release || exit $ERROR_CONF
+  ./configure --enable-release || exit $ERROR_CONF
 make || exit $ERROR_MAKE
-make install prefix="$PKG/$PREFIX" || exit $ERROR_INSTALL
+make install prefix="$PKG/$PREFIX/share/ivi" || exit $ERROR_INSTALL
+
+# Don't overwrite files under $PKG/$PREFIX/share/ivi/etc
+( cd "$PKG/$PREFIX/share/ivi/etc"
+  mv -f system.conf system.conf.new
+  mv -f site.conf site.conf.new
+  mv -f ivi.conf.rct ivi.conf.rct.new
+)
+
+# Install /usr/bin wrapper (taken from Debian's package)
+mkdir -p "$PKG/$PREFIX/bin" || exit $ERROR_MKDIR
+cat << EOSCRIPT > "$PKG/$PREFIX/bin/ivi"
+#!/bin/sh
+exec /usr/share/ivi/bin/ivi "\$@"
+EOSCRIPT
 
 # Fix permissions
-find "$PKG" -type f -exec chmod a-x {} \;
-chmod a+x "$PKG/$PREFIX/bin/ivi"
-find "$PKG/$PREFIX/modules" -name "*.vpi" -exec chmod a+x {} \;
+find "$PKG" -type f -exec chmod 644 {} \;
+chmod 755 "$PKG/$PREFIX/share/ivi/bin/ivi" "$PKG/$PREFIX/bin/ivi"
+find "$PKG/$PREFIX/share/ivi/modules" -name "*.vpi" -exec chmod 755 {} \;
 
 # Strip binaries
 ( cd "$PKG"
@@ -94,9 +108,10 @@ find "$PKG/$PREFIX/modules" -name "*.vpi" -exec chmod a+x {} \;
 
 # Install documentation and examples
 DOCS="LIMITATIONS README *.txt"
+mv -f "$PKG/$PREFIX/share/ivi/doc" "$PKG/$PREFIX/doc"
 mkdir -p "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR
 cp -a $DOCS "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION"
-mv "$PKG/$PREFIX/{examples,doc/getting_started,doc/ivi_commands}" \
+mv "$PKG/$PREFIX/doc/"{getting_started,ivi_commands} \
   "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION"
 
 # Add package description (slack-desc)
@@ -123,6 +138,26 @@ ivi:
 ivi:
 EODESC
 
+# Add a post-installation script (doinst.sh)
+cat << EOSCRIPT > "$PKG/install/doinst.sh"
+config() {
+  NEW="\$1"
+  OLD="\$(dirname \$NEW)/\$(basename \$NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r \$OLD ]; then
+    mv \$NEW \$OLD
+  elif [ "\$(cat \$OLD | md5sum)" = "\$(cat \$NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm \$NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config usr/share/ivi/etc/system.conf.new
+config usr/share/ivi/etc/site.conf.new
+config usr/share/ivi/etc/ivi.conf.rct.new
+EOSCRIPT
+
 # Build the package
 cd "$PKG"
 makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
diff --git a/sys/apps/microcode_ctl/microcode_ctl.SlackBuild b/sys/apps/microcode_ctl/microcode_ctl.SlackBuild
index 09493c1e2f161cac777eff9943e3921a66978c66..838c81e56d1f55c778affef7b3a388a5a9e9bbc5 100755 (executable)
--- a/sys/apps/microcode_ctl/microcode_ctl.SlackBuild
+++ b/sys/apps/microcode_ctl/microcode_ctl.SlackBuild
@@ -19,7 +19,7 @@ fi
 SRC_NAME="microcode_ctl"
 PKG_NAME="microcode_ctl"
 ARCH=${ARCH:=i486}
-VERSION=${VERSION:=1.14}
+VERSION=${VERSION:=1.16}
 BUILD=${BUILD:=1ls}
 SRC_DIR=${SRC_DIR:=$CWD}
 TMP=${TMP:=/tmp}
@@ -68,7 +68,8 @@ if [ ! -f "$SRC_DIR/$SRC" ]; then
 fi
 
 # Untar, compile and install
-tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" -C "$SRC_DIR" || exit $ERROR_TAR
+cd "$SRC_DIR"
+tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
 cd "$PKG_SRC"
 make all || exit $ERROR_MAKE
 if [ ! -c /dev/cpu/microcode ]; then
Slackware Build Scripts