summaryrefslogtreecommitdiff
path: root/inputmethod
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2016-02-25 13:37:46 +0000
committerjperkin <jperkin@pkgsrc.org>2016-02-25 13:37:46 +0000
commit113ff2274f575cf33db39900e0a169183f6f9c2d (patch)
tree94113be68a0bce10362d82772b0687bfd2945c82 /inputmethod
parentd1d2d89cd0847d4f097bd0eb16ddac7092db728d (diff)
downloadpkgsrc-113ff2274f575cf33db39900e0a169183f6f9c2d.tar.gz
Use OPSYSVARS.
Diffstat (limited to 'inputmethod')
-rw-r--r--inputmethod/mozc-server/Makefile.common11
-rw-r--r--inputmethod/scim/Makefile10
2 files changed, 8 insertions, 13 deletions
diff --git a/inputmethod/mozc-server/Makefile.common b/inputmethod/mozc-server/Makefile.common
index 85e298124e2..c4af95198df 100644
--- a/inputmethod/mozc-server/Makefile.common
+++ b/inputmethod/mozc-server/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.22 2015/11/25 12:50:58 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.23 2016/02/25 13:43:53 jperkin Exp $
# used by inputmethod/ibus-mozc/Makefile
# used by inputmethod/mozc-elisp/Makefile
# used by inputmethod/mozc-server/Makefile
@@ -63,11 +63,10 @@ SUBST_VARS.gyp+= PREFIX QTDIR
ALL_ENV+= LINK=${CXX}
.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "NetBSD"
-OSDEST= bsd
-.elif ${OPSYS} == "Linux"
-OSDEST= linux
-.endif
+
+OPSYSVARS+= OSDEST
+OSDEST.Linux= linux
+OSDEST.NetBSD= bsd
MOZC_BUILD_MODE= Release # or Debug
diff --git a/inputmethod/scim/Makefile b/inputmethod/scim/Makefile
index 2f6593ddaed..2573bc5f015 100644
--- a/inputmethod/scim/Makefile
+++ b/inputmethod/scim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2015/06/12 10:50:15 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2016/02/25 13:43:54 jperkin Exp $
#
DISTNAME= scim-1.4.15
@@ -44,13 +44,9 @@ INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples
# for DLOPEN_REQUIRE_PTHREADS
PTHREAD_AUTO_VARS= yes
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ENV+= ac_cv_func_gethostbyname_r=no
+CONFIGURE_ENV.NetBSD+= ac_cv_func_gethostbyname_r=no
+CONFIGURE_ENV.SunOS+= ac_cv_func_gethostbyname_r=no
LDFLAGS.SunOS+= -lsocket -lnsl
-.elif ${OPSYS} == "NetBSD"
-CONFIGURE_ENV+= ac_cv_func_gethostbyname_r=no
-.endif
# unused test script
CHECK_PORTABILITY_SKIP+= extras/immodules/tests/test-exec.sh.in