summaryrefslogtreecommitdiff
path: root/comms/minicom
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2007-06-19 21:46:39 +0000
committerjlam <jlam@pkgsrc.org>2007-06-19 21:46:39 +0000
commit16c9d1a6b881c8cc00e31e50aa65aca1fb8eeb69 (patch)
treed7214efae61682c004f8b1d75a00d8a567ef5d95 /comms/minicom
parent1a6fb589c8b4affce891a1eefa012f1edc56ab30 (diff)
downloadpkgsrc-16c9d1a6b881c8cc00e31e50aa65aca1fb8eeb69.tar.gz
* Use ${DIALER_GROUP} instead of hardcoding "dialer" as the group name.
* ${UUCP_USER} should have a default group membership of ${UUCP_GROUP}, not dialer. * Get the correct install locations for lrzsz and gkermit and use them to locate the binaries from those dependencies in src/rwconf.c. Bump PKGREVISION to 3 due to changed users and groups.
Diffstat (limited to 'comms/minicom')
-rw-r--r--comms/minicom/Makefile22
-rw-r--r--comms/minicom/distinfo4
-rw-r--r--comms/minicom/patches/patch-ad18
3 files changed, 23 insertions, 21 deletions
diff --git a/comms/minicom/Makefile b/comms/minicom/Makefile
index ed5cef2a8fc..573dcf46654 100644
--- a/comms/minicom/Makefile
+++ b/comms/minicom/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.54 2007/06/15 18:23:49 jlam Exp $
+# $NetBSD: Makefile,v 1.55 2007/06/19 21:46:39 jlam Exp $
DISTNAME= minicom-2.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= comms
MASTER_SITES= http://alioth.debian.org/download.php/123/
@@ -23,20 +23,22 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
PKG_SYSCONFSUBDIR= minicom
EGDIR= ${PREFIX}/share/examples/minicom
-UUCP_USER?= uucp # shared with net/uucp
+PKG_GROUPS= ${DIALER_GROUP}
+PKG_USERS= ${UUCP_USER}:${UUCP_GROUP}
-PKG_GROUPS= dialer
-PKG_USERS= ${UUCP_USER}:dialer
-SPECIAL_PERMS= ${PREFIX}/bin/minicom ${UUCP_USER} dialer 4555
-OWN_DIRS_PERMS= ${PKG_SYSCONFDIR} ${UUCP_USER} dialer 0755
+SPECIAL_PERMS= ${PREFIX}/bin/minicom ${UUCP_USER} ${DIALER_GROUP} 4555
+OWN_DIRS_PERMS= ${PKG_SYSCONFDIR} ${UUCP_USER} ${DIALER_GROUP} 0755
CONF_FILES_PERMS= ${EGDIR}/minicom.users ${PKG_SYSCONFDIR}/minicom.users \
- ${UUCP_USER} dialer 0644
+ ${UUCP_USER} ${DIALER_GROUP} 0644
-SUBST_CLASSES+= minicom
+EVAL_PREFIX+= GKERMIT_PREFIX=gkermit
+EVAL_PREFIX+= LRZSZ_PREFIX=lrzsz
+
+SUBST_CLASSES+= minicom
SUBST_MESSAGE.minicom= Fixing hardcoded paths.
SUBST_STAGE.minicom= post-patch
SUBST_FILES.minicom= src/rwconf.c
-SUBST_SED.minicom= -e 's,@PREFIX@,${PREFIX},g'
+SUBST_VARS.minicom= PREFIX GKERMIT_PREFIX LRZSZ_PREFIX
post-install:
${INSTALL_DATA_DIR} ${EGDIR}
diff --git a/comms/minicom/distinfo b/comms/minicom/distinfo
index 13ab913f826..97a1021cc60 100644
--- a/comms/minicom/distinfo
+++ b/comms/minicom/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2006/06/08 01:12:45 minskim Exp $
+$NetBSD: distinfo,v 1.9 2007/06/19 21:46:40 jlam Exp $
SHA1 (minicom-2.1.tar.gz) = 720273f6ee8db5fb2da4379ac610a520a31aba70
RMD160 (minicom-2.1.tar.gz) = 58121cf29991a92914acee855d6e86486c6d370d
@@ -6,7 +6,7 @@ Size (minicom-2.1.tar.gz) = 607939 bytes
SHA1 (patch-aa) = a7c85609f9384ec7c0e5e950d6244f527b0876d1
SHA1 (patch-ab) = 4cfb8bc389f4052c08551651aa86f98d0e751028
SHA1 (patch-ac) = 91a2acce80d7d1815a29843b1de5e1acc172024a
-SHA1 (patch-ad) = 5e866091f58585a16da93fdf9d8bec417c0adc19
+SHA1 (patch-ad) = 31e09b2df1bb93e3ccbd9f400f6fb127726f6070
SHA1 (patch-ae) = b037623c4e3ee4cbc8c73c4b04c6b7f77c689d38
SHA1 (patch-af) = 38905432b60a796742d43be1aed84ee2774bb222
SHA1 (patch-ag) = c8947fb6693d2508d7caa79916142af346e27cdd
diff --git a/comms/minicom/patches/patch-ad b/comms/minicom/patches/patch-ad
index f943840643d..f0bc73112a4 100644
--- a/comms/minicom/patches/patch-ad
+++ b/comms/minicom/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.6 2005/06/19 11:34:45 veego Exp $
+$NetBSD: patch-ad,v 1.7 2007/06/19 21:46:40 jlam Exp $
--- src/rwconf.c.orig 2003-04-13 00:52:20.000000000 +0200
+++ src/rwconf.c 2005-06-19 10:57:52.000000000 +0200
@@ -27,14 +27,14 @@ $NetBSD: patch-ad,v 1.6 2005/06/19 11:34:45 veego Exp $
- { "/usr/local/bin/kermit -i -l %l -r", PUBLIC, "pprog8" },
-#endif
- { "/usr/bin/ascii-xfr -dsv", PUBLIC, "pprog9" },
-+ { "@PREFIX@/bin/lsz -vv -b", PUBLIC, "pprog1" },
-+ { "@PREFIX@/bin/lsb -vv", PUBLIC, "pprog2" },
-+ { "@PREFIX@/bin/lsx -vv", PUBLIC, "pprog3" },
-+ { "@PREFIX@/bin/lrz -vv -b", PUBLIC, "pprog4" },
-+ { "@PREFIX@/bin/lrb -vv", PUBLIC, "pprog5" },
-+ { "@PREFIX@/bin/lrx -vv", PUBLIC, "pprog6" },
-+ { "@PREFIX@/bin/gkermit -i -l %l -s", PUBLIC, "pprog7" },
-+ { "@PREFIX@/bin/gkermit -i -l %l -r", PUBLIC, "pprog8" },
++ { "@LRZSZ_PREFIX@/bin/lsz -vv -b", PUBLIC, "pprog1" },
++ { "@LRZSZ_PREFIX@/bin/lsb -vv", PUBLIC, "pprog2" },
++ { "@LRZSZ_PREFIX@/bin/lsx -vv", PUBLIC, "pprog3" },
++ { "@LRZSZ_PREFIX@/bin/lrz -vv -b", PUBLIC, "pprog4" },
++ { "@LRZSZ_PREFIX@/bin/lrb -vv", PUBLIC, "pprog5" },
++ { "@LRZSZ_PREFIX@/bin/lrx -vv", PUBLIC, "pprog6" },
++ { "@GKERMIT_PREFIX@/bin/gkermit -i -l %l -s", PUBLIC, "pprog7" },
++ { "@GKERMIT_PREFIX@/bin/gkermit -i -l %l -r", PUBLIC, "pprog8" },
+ { "@PREFIX@/bin/ascii-xfr -dsv", PUBLIC, "pprog9" },
{ "", PUBLIC, "pprog10" },
{ "", PUBLIC, "pprog11" },