diff options
| author | jperkin <jperkin> | 2015-11-25 12:48:55 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2015-11-25 12:48:55 +0000 |
| commit | 7738159ed48671f1edce9cc9c229d7bcc2b96b74 (patch) | |
| tree | d0d06427d9690c87a91868ad23c550f90ef43ad2 /comms | |
| parent | d2feee675057cea269e911b1dfe310c2048062e9 (diff) | |
| download | pkgsrc-7738159ed48671f1edce9cc9c229d7bcc2b96b74.tar.gz | |
Remove mk/find-prefix.mk usage from the comms category.
The find-prefix infrastructure was required in a pkgviews world where
packages installed from pkgsrc could have different installation
prefixes, and this was a way for a dependency prefix to be determined.
Now that pkgviews has been removed there is no longer any need for the
overhead of this infrastructure. Instead we use BUILDLINK_PREFIX.pkg
for dependencies pulled in via buildlink, or LOCALBASE/PREFIX where the
dependency is coming from pkgsrc.
Provides a reasonable performance win due to the reduction of `pkg_info
-qp` calls, some of which were redundant anyway as they were duplicating
the same information provided by BUILDLINK_PREFIX.pkg.
Diffstat (limited to 'comms')
| -rw-r--r-- | comms/minicom/Makefile | 7 | ||||
| -rw-r--r-- | comms/minicom/distinfo | 4 | ||||
| -rw-r--r-- | comms/minicom/patches/patch-ad | 20 |
3 files changed, 14 insertions, 17 deletions
diff --git a/comms/minicom/Makefile b/comms/minicom/Makefile index b684172e985..b1b352985e8 100644 --- a/comms/minicom/Makefile +++ b/comms/minicom/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.66 2015/07/24 10:33:27 adam Exp $ +# $NetBSD: Makefile,v 1.67 2015/11/25 12:48:55 jperkin Exp $ DISTNAME= minicom-2.7 CATEGORIES= comms @@ -30,14 +30,11 @@ PKG_USERS_VARS= UUCP_USER SPECIAL_PERMS= ${PREFIX}/bin/minicom ${UUCP_USER} ${DIALER_GROUP} 4555 OWN_DIRS_PERMS= ${PKG_SYSCONFDIR} ${UUCP_USER} ${DIALER_GROUP} 0755 -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_VARS.minicom= PREFIX GKERMIT_PREFIX LRZSZ_PREFIX +SUBST_VARS.minicom= PREFIX .include "options.mk" diff --git a/comms/minicom/distinfo b/comms/minicom/distinfo index d504830ac89..e65bd7d12af 100644 --- a/comms/minicom/distinfo +++ b/comms/minicom/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.16 2015/11/03 01:34:55 agc Exp $ +$NetBSD: distinfo,v 1.17 2015/11/25 12:48:55 jperkin Exp $ SHA1 (minicom-2.7.tar.gz) = 939eef8ca1bda82ee801b087d9db4f16a19fbe6e RMD160 (minicom-2.7.tar.gz) = a7947e2e45cc6655b55b70cb65f8784a606248ce @@ -6,7 +6,7 @@ SHA512 (minicom-2.7.tar.gz) = eb9679ac3a3d3585ea06c54407567898e50b981378656e7f8a Size (minicom-2.7.tar.gz) = 863544 bytes SHA1 (patch-ab) = e87dbe616958b2b1a01a9a7dfa8cb8f8c1a6978f SHA1 (patch-ac) = b2ffa106989ea562b8ea85bfd15e516713a37f3f -SHA1 (patch-ad) = a3e50ae6dcacb6ae6a177e5b6e4d3d959d960eca +SHA1 (patch-ad) = 407bf7e19ce4ca1aa8580f0b2e79c69d99ad0e6e SHA1 (patch-ae) = ea2fb58212de7caaaed4c0817290ca3612212b6c SHA1 (patch-ag) = 5f635b67e2e48d13c9df7f3ed4fdca83a1c7f7ef SHA1 (patch-ah) = ae6048f6a8e81134a459aaf21527e944c68ae07f diff --git a/comms/minicom/patches/patch-ad b/comms/minicom/patches/patch-ad index 5684c4c99d2..dff9a411a56 100644 --- a/comms/minicom/patches/patch-ad +++ b/comms/minicom/patches/patch-ad @@ -1,6 +1,6 @@ -$NetBSD: patch-ad,v 1.9 2012/12/12 12:35:21 wiz Exp $ +$NetBSD: patch-ad,v 1.10 2015/11/25 12:48:55 jperkin Exp $ -Removed hardcoded LRZSZ_PREFIX and PREFIX. +Removed hardcoded paths. --- src/rwconf.c.orig 2011-12-27 22:21:05.000000000 +0000 +++ src/rwconf.c @@ -29,14 +29,14 @@ Removed hardcoded LRZSZ_PREFIX and PREFIX. - { "/usr/local/bin/kermit -i -l %l -r", 0, "pprog8" }, -#endif - { "/usr/bin/ascii-xfr -dsv", 0, "pprog9" }, -+ { "@LRZSZ_PREFIX@/bin/lsz -vv", 0, "pprog1" }, -+ { "@LRZSZ_PREFIX@/bin/lsb -vv", 0, "pprog2" }, -+ { "@LRZSZ_PREFIX@/bin/lsx -vv", 0, "pprog3" }, -+ { "@LRZSZ_PREFIX@/bin/lrz -vv", 0, "pprog4" }, -+ { "@LRZSZ_PREFIX@/bin/lrb -vv", 0, "pprog5" }, -+ { "@LRZSZ_PREFIX@/bin/lrx -vv", 0, "pprog6" }, -+ { "@LRZSZ_PREFIX@/bin/gkermit -i -l %l -s", 0, "pprog7" }, -+ { "@LRZSZ_PREFIX@/bin/gkermit -i -l %l -r", 0, "pprog8" }, ++ { "@PREFIX@/bin/lsz -vv", 0, "pprog1" }, ++ { "@PREFIX@/bin/lsb -vv", 0, "pprog2" }, ++ { "@PREFIX@/bin/lsx -vv", 0, "pprog3" }, ++ { "@PREFIX@/bin/lrz -vv", 0, "pprog4" }, ++ { "@PREFIX@/bin/lrb -vv", 0, "pprog5" }, ++ { "@PREFIX@/bin/lrx -vv", 0, "pprog6" }, ++ { "@PREFIX@/bin/gkermit -i -l %l -s", 0, "pprog7" }, ++ { "@PREFIX@/bin/gkermit -i -l %l -r", 0, "pprog8" }, + { "@PREFIX@/bin/ascii-xfr -dsv", 0, "pprog9" }, { "", 0, "pprog10" }, { "", 0, "pprog11" }, |