diff options
author | wiz <wiz@pkgsrc.org> | 2007-03-01 17:09:00 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2007-03-01 17:09:00 +0000 |
commit | d43f8f1a05a906fa2048e04d148f36cffe42946b (patch) | |
tree | 9a8161b7a7bed4862bae6d2fd14ee17c240a82cd /comms | |
parent | 5502120d454e516020a573fe8c30fbd3ab3c24d5 (diff) | |
download | pkgsrc-d43f8f1a05a906fa2048e04d148f36cffe42946b.tar.gz |
pkglint cleanup:
Replace configure-script with a patch that does the same.
Use SUBST framework instead of mv+sed.
Diffstat (limited to 'comms')
-rw-r--r-- | comms/mgetty+sendfax/Makefile | 24 | ||||
-rw-r--r-- | comms/mgetty+sendfax/distinfo | 3 | ||||
-rw-r--r-- | comms/mgetty+sendfax/patches/patch-ai | 27 | ||||
-rw-r--r-- | comms/mgetty+sendfax/scripts/configure | 32 |
4 files changed, 41 insertions, 45 deletions
diff --git a/comms/mgetty+sendfax/Makefile b/comms/mgetty+sendfax/Makefile index 586dd8cc8f9..5081fd2f2f2 100644 --- a/comms/mgetty+sendfax/Makefile +++ b/comms/mgetty+sendfax/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.55 2006/10/04 20:51:40 wiz Exp $ +# $NetBSD: Makefile,v 1.56 2007/03/01 17:09:00 wiz Exp $ DISTNAME= mgetty1.1.31-Jul24 PKGNAME= mgetty-1.1.31 @@ -28,7 +28,7 @@ BUILD_MAKE_FLAGS= ${MAKE_FLAGS} CONFDIR=${PKG_SYSCONFDIR:Q} INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} CONFDIR=${EXAMPLES_DIR:Q} USE_TOOLS+= makeinfo -INFO_FILES= # PLIST +INFO_FILES= yes PKG_SYSCONFSUBDIR= mgetty+sendfax .for cfg in dialin.config \ @@ -50,18 +50,18 @@ OWN_DIRS_PERMS+= /var/spool/fax ${ROOT_USER} ${ROOT_GROUP} 755 OWN_DIRS_PERMS+= /var/spool/fax/incoming ${ROOT_USER} ${ROOT_GROUP} 755 OWN_DIRS_PERMS+= /var/spool/fax/outgoing fax ${ROOT_GROUP} 755 +SUBST_CLASSES+= prefix +SUBST_FILES.prefix= faxrunq.config policy.h +SUBST_SED.prefix= -e 's|/usr/local|${PREFIX}|' +SUBST_STAGE.prefix= pre-configure +SUBST_MESSAGE.prefix= Fixing hardcoded installation prefix. + .include "../../graphics/netpbm/buildlink3.mk" +post-extract: + cd ${WRKSRC} && cp policy.h-dist policy.h + do-configure: - ${MV} ${WRKSRC}/doc/fax.1in ${WRKSRC}/doc/sendfax.1in - cd ${WRKSRC} \ - && for _file in faxrunq.config policy.h-dist; \ - do \ - ${MV} $$_file $${_file}.orig; \ - ${SED} 's|/usr/local|${PREFIX}|' \ - $${_file}.orig > $$_file; \ - done \ - && cd ${.CURDIR} \ - && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure + mv ${WRKSRC}/doc/fax.1in ${WRKSRC}/doc/sendfax.1in .include "../../mk/bsd.pkg.mk" diff --git a/comms/mgetty+sendfax/distinfo b/comms/mgetty+sendfax/distinfo index acef1d9b079..1ddd1ddc798 100644 --- a/comms/mgetty+sendfax/distinfo +++ b/comms/mgetty+sendfax/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.25 2006/03/20 04:09:37 jlam Exp $ +$NetBSD: distinfo,v 1.26 2007/03/01 17:09:00 wiz Exp $ SHA1 (mgetty1.1.31-Jul24.tar.gz) = a6f20da26b49bbfa695791edec7d0a2247b79e2d RMD160 (mgetty1.1.31-Jul24.tar.gz) = 255eec0838ce5bfad04c53d478a4505e74111a07 @@ -11,6 +11,7 @@ SHA1 (patch-ae) = 04f35280e337fb766152b7d9badcd0c417aa1739 SHA1 (patch-af) = c3d141a0952c54c392e99399fd05efebd55f0267 SHA1 (patch-ag) = f12e39005c78a94f641ccbdbbfa51b5181821148 SHA1 (patch-ah) = 2d9de861d3bce7b454eee957d32ffe67996e27c7 +SHA1 (patch-ai) = 26038a2960202a0ff6a6e8d919728d68bd2b9e3e SHA1 (patch-aj) = 37d88c1a4f8d5826f7113dd120c32e89cc442e5d SHA1 (patch-ak) = 18f9570f35909089a4083fa24903dfea14dcc475 SHA1 (patch-al) = 2a6dcf13d65446d2064228b1024517e599892a60 diff --git a/comms/mgetty+sendfax/patches/patch-ai b/comms/mgetty+sendfax/patches/patch-ai new file mode 100644 index 00000000000..0d150659898 --- /dev/null +++ b/comms/mgetty+sendfax/patches/patch-ai @@ -0,0 +1,27 @@ +$NetBSD: patch-ai,v 1.5 2007/03/01 17:09:00 wiz Exp $ + +--- policy.h.orig 2007-03-01 17:06:20.000000000 +0000 ++++ policy.h +@@ -620,3 +620,22 @@ + */ + #define MINFREESPACE 1024 + ++#undef DEFAULT_LOGIN_PROGRAM ++#define DEFAULT_LOGIN_PROGRAM "/usr/bin/login" ++ ++#define CNDFILE "dialin.config" ++ ++#undef MGETTY_PID_FILE ++#define MGETTY_PID_FILE "/var/run/mg-pid.%s" ++ ++#undef LOCK ++#define LOCK "/var/spool/lock/LCK..%s" ++ ++#undef FAX_LOG ++#define FAX_LOG "/var/spool/fax/Faxlog" ++ ++#undef MAILER ++#define MAILER "/usr/sbin/sendmail" ++ ++#undef DEVICE_GROUP ++#define DEVICE_GROUP "wheel" diff --git a/comms/mgetty+sendfax/scripts/configure b/comms/mgetty+sendfax/scripts/configure deleted file mode 100644 index 5f44af414f2..00000000000 --- a/comms/mgetty+sendfax/scripts/configure +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# -# $NetBSD: configure,v 1.2 1998/11/15 20:45:30 tron Exp $ - -cd $WRKSRC || exit 1 -cp policy.h-dist policy.h - -cat >> policy.h <<END - -#undef DEFAULT_LOGIN_PROGRAM -#define DEFAULT_LOGIN_PROGRAM "/usr/bin/login" - -#define CNDFILE "dialin.config" - -#undef MGETTY_PID_FILE -#define MGETTY_PID_FILE "/var/run/mg-pid.%s" - -#undef LOCK -#define LOCK "/var/spool/lock/LCK..%s" - -#undef FAX_LOG -#define FAX_LOG "/var/spool/fax/Faxlog" - -#undef MAILER -#define MAILER "/usr/sbin/sendmail" - -#undef DEVICE_GROUP -#define DEVICE_GROUP "wheel" - -END - -exit 0 |