[Lunar-commits] r15264 - moonbase/trunk/mail/qpopper

[Moritz Heiber]

Author: moe
Date: 2005-06-05 15:56:35 +0000 (Sun, 05 Jun 2005)
New Revision: 15264

Modified:
   moonbase/trunk/mail/qpopper/BUILD
   moonbase/trunk/mail/qpopper/POST_INSTALL
Log:
Cleaning this up. Reported by Remco.



Modified: moonbase/trunk/mail/qpopper/BUILD
===================================================================
--- moonbase/trunk/mail/qpopper/BUILD	2005-06-05 15:03:44 UTC (rev 15263)
+++ moonbase/trunk/mail/qpopper/BUILD	2005-06-05 15:56:35 UTC (rev 15264)
@@ -1,20 +1,21 @@
 (
 
-  if  module_installed  Linux-PAM;  then
+  if module_installed Linux-PAM; then
     OPTS="$OPTS --with-pam"
+  else
+    OPTS="$OPTS --without-pam"
   fi
 
-  if grep -q "qpopper" $MODULE_CONFIG; then
-    OPTS="$OPTS --enable-standalone"
-  fi
-
-  if  module_installed openssl && grep -q "OPENSSL=y" $MODULE_CONFIG ; then
+  if in_depends $MODULE openssl ; then
     CFLAGS="$CFLAGS -I/usr/include/openssl"
   fi
   
-  echo "Configuring with $OPTS"
+  message "${MESSAGE_COLOR}Configuring with $OPTS${DEFAULT_COLOR}"
 
-  ./configure $OPTS --prefix=/usr --mandir=/usr/share/man  &&
+  ./configure --prefix=/usr \
+	      --mandir=/usr/share/man \
+	      --enable-standalone \
+	      $OPTS &&
   default_make
 
 ) > $C_FIFO 2>&1

Modified: moonbase/trunk/mail/qpopper/POST_INSTALL
===================================================================
--- moonbase/trunk/mail/qpopper/POST_INSTALL	2005-06-05 15:03:44 UTC (rev 15263)
+++ moonbase/trunk/mail/qpopper/POST_INSTALL	2005-06-05 15:56:35 UTC (rev 15264)
@@ -1,4 +1,4 @@
-if  module_installed openssl && grep -q "OPENSSL=y" $MODULE_CONFIG ; then
+if in_depends $MODULE openssl ; then
   if query "Create a new SSL key? " y ; then
     mkdir -p -m665 /etc/mail/certs
     chown root:mail /etc/mail/certs