[pkgsrc/trunk]: pkgsrc/comms/hylafax Fixed some pkglint warnings.

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/207a2ce45eba
branches:  trunk
changeset: 519308:207a2ce45eba
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Oct 01 14:00:12 2006 +0000

description:
Fixed some pkglint warnings.

diffstat:

 comms/hylafax/Makefile |  20 +++++++++++---------
 comms/hylafax/hacks.mk |  10 +++++-----
 2 files changed, 16 insertions(+), 14 deletions(-)

diffs (88 lines):

diff -r 3ecf0056be96 -r 207a2ce45eba comms/hylafax/Makefile
--- a/comms/hylafax/Makefile    Sun Oct 01 13:56:38 2006 +0000
+++ b/comms/hylafax/Makefile    Sun Oct 01 14:00:12 2006 +0000
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.53 2006/05/15 19:02:47 joerg Exp $
+# $NetBSD: Makefile,v 1.54 2006/10/01 14:00:12 rillig Exp $
 
 VERS=          4.2.5
 DISTNAME=      hylafax-${VERS}
 PKGREVISION=   3
 CATEGORIES=    comms
 MASTER_SITES_BETA=     ftp://ftp.hylafax.org/source/BETA/
-MASTER_SITES_RELEASE=   ftp://ftp.hylafax.org/source/ \
-                ftp://ftp.leo.org/pub/comp/os/unix/networking/fax/hylafax/source/
-MASTER_SITES=   ${MASTER_SITES_RELEASE}
+MASTER_SITES_RELEASE=  ftp://ftp.hylafax.org/source/ \
+       ftp://ftp.leo.org/pub/comp/os/unix/networking/fax/hylafax/source/
+MASTER_SITES=  ${MASTER_SITES_RELEASE}
 
 MAINTAINER=    hallmann%ahatec.de@localhost
 HOMEPAGE=      http://www.hylafax.org/
@@ -17,6 +17,8 @@
 
 CONFLICTS=     hylafax-devel-[0-9]* mgetty-[0-9]*
 
+BUILD_DEFS+=   FAXUSER FAXGROUP VARBASE
+
 USE_LANGUAGES=         c c++
 USE_TOOLS+=            gs:run
 HAS_CONFIGURE=         yes
@@ -24,7 +26,7 @@
 CONFIGURE_ARGS+=       --with-INSTALL="" --nointeractive
 CONFIGURE_ARGS+=       --with-ZLIBINC=-I${BUILDLINK_PREFIX.zlib}/include
 CONFIGURE_ARGS+=       --with-LIBZ="-L${BUILDLINK_PREFIX.zlib}/lib -lz"
-CONFIGURE_ENV+=                PREFIX=${PREFIX:Q} OPTIMIZER=${CFLAGS:M*:Q}
+CONFIGURE_ENV+=                PREFIX=${PREFIX:Q} OPTIMIZER=${CFLAGS:Q}
 CONFIGURE_ENV+=                FAXUID=${FAXUSER:Q} FAXGID=${FAXGROUP:Q}
 CONFIGURE_ENV+=                VARBASE=${VARBASE:Q}
 MANCOMPRESSED=         yes
@@ -36,8 +38,8 @@
 SUID_EXES=     ${PREFIX}/libexec/faxgetty ${PREFIX}/sbin/faxq \
                ${PREFIX}/bin/faxrm ${PREFIX}/bin/faxalter
 
-PKG_OPTIONS_VAR=      PKG_OPTIONS.hylafax
-PKG_SUPPORTED_OPTIONS=        pam
+PKG_OPTIONS_VAR=       PKG_OPTIONS.hylafax
+PKG_SUPPORTED_OPTIONS= pam
 #pam doesn't work right now, so disabled by default
 #PKG_SUGGESTED_OPTIONS=       pam
 .include "../../mk/bsd.options.mk"
@@ -49,8 +51,8 @@
 .endif
 
 post-install:
-       ${CHOWN} ${FAXUSER} ${SUID_EXES}
-       ${CHMOD} 4555 ${SUID_EXES}
+       chown ${FAXUSER} ${SUID_EXES}
+       chmod 4555 ${SUID_EXES}
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
diff -r 3ecf0056be96 -r 207a2ce45eba comms/hylafax/hacks.mk
--- a/comms/hylafax/hacks.mk    Sun Oct 01 13:56:38 2006 +0000
+++ b/comms/hylafax/hacks.mk    Sun Oct 01 14:00:12 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.1 2006/05/15 19:02:47 joerg Exp $
+# $NetBSD: hacks.mk,v 1.2 2006/10/01 14:00:12 rillig Exp $
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -6,13 +6,13 @@
 #
 # Workaround an ICE in the stack-smashing protection in GCC 3.4.x.
 #
-.if !defined(HAS_PROPOLICE)
+.  if !defined(HAS_PROPOLICE)
 HAS_PROPOLICE!=        ( ${CC} -v 2>&1 | ${GREP} 'propolice' ) 2>/dev/null || echo no
 MAKEVARS+=     HAS_PROPOLICE
-.endif
+.  endif
 
-.if ${HAS_PROPOLICE} != "no"
+.  if ${HAS_PROPOLICE} != "no"
 CFLAGS+=       -fno-stack-protector
 CXXFLAGS+=     -fno-stack-protector
+.  endif
 .endif
-.endif