summaryrefslogtreecommitdiffstats
path: root/display/qingy
diff options
context:
space:
mode:
authorArjan Bouter2006-10-03 16:12:45 +0200
committerArjan Bouter2006-10-03 16:12:45 +0200
commitbae75c634b6d0d05b0da378a70e3681f05ee6976 (patch)
tree0d5266ddd721a63f48a1fd0cc8163f08f2525405 /display/qingy
parentf7e6c9f524c60a2026819c6b781db1de27902050 (diff)
qingy: added some crypto options and version bump to 0.9.1
Diffstat (limited to 'display/qingy')
-rwxr-xr-xdisplay/qingy/BUILD1
-rwxr-xr-xdisplay/qingy/CONFIGURE4
-rwxr-xr-xdisplay/qingy/DEPENDS7
-rwxr-xr-xdisplay/qingy/DETAILS4
-rw-r--r--display/qingy/HISTORY5
-rwxr-xr-xdisplay/qingy/PRE_BUILD4
6 files changed, 16 insertions, 9 deletions
diff --git a/display/qingy/BUILD b/display/qingy/BUILD
index 6c7ac5ffa9..df530ce700 100755
--- a/display/qingy/BUILD
+++ b/display/qingy/BUILD
@@ -3,6 +3,7 @@ OPTS="--with-themes-dir=/etc/qingy/themes \
$QINGY_CRYPTO_OPTION \
$QINGY_OPTIMIZATIONS \
$QINGY_STATIC \
+ --enable-crypto=$QINGY_CRYPTO \
$OPTS" &&
default_build
diff --git a/display/qingy/CONFIGURE b/display/qingy/CONFIGURE
index 035ba3dfc0..6248837e3d 100755
--- a/display/qingy/CONFIGURE
+++ b/display/qingy/CONFIGURE
@@ -3,9 +3,7 @@ config_query QINGY_XINIT 'Allow X server to accept tcp connections?' n &&
config_query_option QINGY_SCREENSAVERS 'Enable screen savers?' y \
'--enable-screen-savers' '--disable-screen-savers' &&
-config_query_option QINGY_CRYPTO_OPTION \
- 'encrypt communications between qingy and its user interface?' y \
- '--enable-crypto' '--disable-crypto'
+config_query_list QINGY_CRYPTO 'Which library do you prefer to encrypt internal communication?' openssl libgcrypt none
config_query_option QINGY_OPTIMIZATIONS 'Enable optimizations?' y \
'--enable-optimizations' '--disable-optimizations' &&
diff --git a/display/qingy/DEPENDS b/display/qingy/DEPENDS
index bdcbef0d9c..8d9685464b 100755
--- a/display/qingy/DEPENDS
+++ b/display/qingy/DEPENDS
@@ -1,4 +1,9 @@
-depends openssl &&
+if [[ "$QINGY_CRYPTO" == 'openssl' ]]; then
+ depends openssl
+elif [[ "QINGY_CRYPTO" == 'libgcrypt' ]]; then
+ depends libgcrypt
+fi &&
+
depends directfb &&
optional_depends X11-SERVER \
diff --git a/display/qingy/DETAILS b/display/qingy/DETAILS
index 092c352484..bed7d375b8 100755
--- a/display/qingy/DETAILS
+++ b/display/qingy/DETAILS
@@ -1,9 +1,9 @@
SPELL=qingy
- VERSION=0.6.0
+ VERSION=0.9.1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
- SOURCE_HASH=sha512:dbb767dac9f0af5317e123a6a70d262d8bb2bfc005891ad26e2b231045c95e4b0dc588b1dda46478ac2a2676cc96d718a56ba398ed7f2883280e6b2732a8bf55
+ SOURCE_HASH=sha512:e74de5e8a49a2c1f9d5bfd1d83d837fae9fcd6372d5905f2d07cea85f13fea90325f52cac8cecd7538df80b0ebc7fe8af3d596c6372886af4dbfa40707f2b1ca
WEB_SITE=http://qingy.sourceforge.net
ENTERED=20040913
PATCHLEVEL=1
diff --git a/display/qingy/HISTORY b/display/qingy/HISTORY
index 64e6f83adf..43eac25586 100644
--- a/display/qingy/HISTORY
+++ b/display/qingy/HISTORY
@@ -1,3 +1,8 @@
+2006-10-03 Arjan Bouter <abouter@sourcemage.org>
+ * DETAILS: 0.9.1
+ * DEPENDS, CONFIGURE: offer a choice for internal crypto
+ * PRE_BUILD: use is_depends_enabled instead of custom voodoo
+
2006-08-15 Juuso Alasuutari <iuso@sourcemage.org>
* DETAILS: [automated] Removed UPDATED (deprecated in favor of
PATCHLEVEL).
diff --git a/display/qingy/PRE_BUILD b/display/qingy/PRE_BUILD
index 92c1e0a2f3..e7bfa7e3d3 100755
--- a/display/qingy/PRE_BUILD
+++ b/display/qingy/PRE_BUILD
@@ -1,9 +1,7 @@
default_pre_build &&
-patch $SOURCE_DIRECTORY/media/Makefile.in \
- $SCRIPT_DIRECTORY/config.patch &&
cd ${SOURCE_DIRECTORY} &&
patch -p1 < $SCRIPT_DIRECTORY/shutdown.patch &&
-if ! ( echo $OPTS | grep -q "enable-emacs" ); then
+if ! ( is_depends_enabled emacs ); then
rm media/sessions/emacs &&
sedit "s/emacs//" media/sessions/Makefile.am &&
sedit "s/emacs//" media/sessions/Makefile.in