summaryrefslogtreecommitdiff
path: root/comms
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2006-10-01 14:00:12 +0000
committerrillig <rillig@pkgsrc.org>2006-10-01 14:00:12 +0000
commit176f3d9375cb72ce621461b5ed38aa2a0de0ae36 (patch)
tree357e1cbc47b81bf584cb1dc52fbbdc24688093c6 /comms
parentbcce47fa3deb8a3f32efdbfd7a8cfe0b65552842 (diff)
downloadpkgsrc-176f3d9375cb72ce621461b5ed38aa2a0de0ae36.tar.gz
Fixed some pkglint warnings.
Diffstat (limited to 'comms')
-rw-r--r--comms/hylafax/Makefile20
-rw-r--r--comms/hylafax/hacks.mk10
2 files changed, 16 insertions, 14 deletions
diff --git a/comms/hylafax/Makefile b/comms/hylafax/Makefile
index 67d662c9fdf..bf87e5b9377 100644
--- a/comms/hylafax/Makefile
+++ b/comms/hylafax/Makefile
@@ -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
HOMEPAGE= http://www.hylafax.org/
@@ -17,6 +17,8 @@ DEPENDS+= mawk>=1.2.2:../../lang/mawk
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-MAKE=${MAKE_PROGRAM:Q}
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 @@ RCD_SCRIPTS= hylafax
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 @@ CONFIGURE_ARGS+= --disable-pam
.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 --git a/comms/hylafax/hacks.mk b/comms/hylafax/hacks.mk
index be1049f0931..8e87a4a61ba 100644
--- a/comms/hylafax/hacks.mk
+++ b/comms/hylafax/hacks.mk
@@ -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