diff options
| author | jperkin <jperkin@pkgsrc.org> | 2015-11-25 12:50:57 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2015-11-25 12:50:57 +0000 |
| commit | ce0a8db11cb3371e3f19784cfdf2fba5015c7e60 (patch) | |
| tree | 6e0f6dcdcaaa8431cd523c7b1458cc679eeb048c /inputmethod/multiskkserv | |
| parent | 9f026fc529baa5b8b73fd2c6a8f42ba48af73ded (diff) | |
| download | pkgsrc-ce0a8db11cb3371e3f19784cfdf2fba5015c7e60.tar.gz | |
Remove mk/find-prefix.mk usage from the inputmethod 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 'inputmethod/multiskkserv')
| -rw-r--r-- | inputmethod/multiskkserv/Makefile | 7 | ||||
| -rw-r--r-- | inputmethod/multiskkserv/files/multiskkserv.sh | 4 |
2 files changed, 3 insertions, 8 deletions
diff --git a/inputmethod/multiskkserv/Makefile b/inputmethod/multiskkserv/Makefile index 25292b6e16f..b908805bf4f 100644 --- a/inputmethod/multiskkserv/Makefile +++ b/inputmethod/multiskkserv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2012/10/06 14:25:14 asau Exp $ +# $NetBSD: Makefile,v 1.5 2015/11/25 12:50:58 jperkin Exp $ # DISTNAME= multiskkserv-20100128-ac @@ -14,8 +14,6 @@ LICENSE= gnu-gpl-v2 DEPENDS= skk-jisyo-cdb-[0-9]*:../../inputmethod/skk-jisyo-cdb -FIND_PREFIX:= SKKJISYOCDBDIR=skk-jisyo-cdb - DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} INSTALLATION_DIRS= ${DOCSDIR} @@ -27,8 +25,6 @@ GNU_CONFIGURE= yes RCD_SCRIPTS= multiskkserv -FILES_SUBST= SKKJISYOCDBDIR=${SKKJISYOCDBDIR} - post-install: .for filename in ${INSTALL_DOCS} ${INSTALL_DATA} ${WRKSRC}/${filename} ${DESTDIR}/${DOCSDIR} @@ -40,6 +36,5 @@ SUBST_FILES.pthread= configure SUBST_SED.pthread= -e 's/-D_REENTRANT/${PTHREAD_CFLAGS}/g' SUBST_SED.pthread+= -e 's/-lpthread/${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}/g' -.include "../../mk/find-prefix.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/inputmethod/multiskkserv/files/multiskkserv.sh b/inputmethod/multiskkserv/files/multiskkserv.sh index c0a83a5b7f4..bdf17f74b91 100644 --- a/inputmethod/multiskkserv/files/multiskkserv.sh +++ b/inputmethod/multiskkserv/files/multiskkserv.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: multiskkserv.sh,v 1.1.1.1 2010/09/18 11:04:17 obache Exp $ +# $NetBSD: multiskkserv.sh,v 1.2 2015/11/25 12:50:58 jperkin Exp $ # # PROVIDE: multiskkserv # REQUIRE: DAEMON @@ -11,7 +11,7 @@ name="multiskkserv" rcvar=$name command="@PREFIX@/sbin/${name}" -multiskkserv_flags="@SKKJISYOCDBDIR@/share/skk/SKK-JISYO.L.cdb &" +multiskkserv_flags="@PREFIX@/share/skk/SKK-JISYO.L.cdb &" load_rc_config $name run_rc_command "$1" |