[pkgsrc/trunk]: pkgsrc/inputmethod * Convert to USE_TOOLS+=itools instead of ...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/inputmethod * Convert to USE_TOOLS+=itools instead of ...
From: jlam <jlam%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 03:42:39 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/36d20e09f1ea
branches:  trunk
changeset: 515622:36d20e09f1ea
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Jul 05 04:55:23 2006 +0000

description:
* Convert to USE_TOOLS+=itools instead of including nbitools/buildlink3.mk.

* Fully convert to pkginstall framework by properly using OWN_DIRS*
  to manage required directories during package installation and
  deinstallation.

* Drop the need to explicitly set PREFIX in the package Makefiles.  We
  now install into ${LOCALBASE} like all other pkgsrc packages and use
  symlinks and file copies to put the right files into ${IMDICTDIR}.

* Change default dependency relationship in sj3-lib/buildlink3.mk to a
  build dependency since it the package only installs headers and a
  static library archive.

* Move some important setup instructions from the DESCR file to MESSAGE
  files so that the admin will see them at package installation.

* Rewrite the sj3 rc.d script so that all necessary directories are
  created before the daemon is started.

* Miscellaneous touch ups to the DESCR and MESSAGE files.

Bump the PKGREVISIONs on the sj3* packages.

diffstat:

 inputmethod/sj3-dict/DESCR              |  24 ++++----------------
 inputmethod/sj3-dict/INSTALL            |  10 --------
 inputmethod/sj3-dict/Makefile           |  39 +++++++++++---------------------
 inputmethod/sj3-dict/PLIST              |   6 +---
 inputmethod/sj3-lib/DESCR               |  24 ++++----------------
 inputmethod/sj3-lib/Makefile            |  17 ++++----------
 inputmethod/sj3-lib/buildlink3.mk       |   3 +-
 inputmethod/sj3-server-bin/DESCR        |  24 ++++----------------
 inputmethod/sj3-server-bin/MESSAGE      |  10 ++++++++
 inputmethod/sj3-server-bin/Makefile     |  34 ++++++++++++++++-----------
 inputmethod/sj3-server-bin/files/sj3.sh |  38 ++++++++++++++++++++++----------
 inputmethod/sj3-server/DESCR            |  24 +++----------------
 inputmethod/sj3-server/Makefile         |  10 ++++----
 13 files changed, 103 insertions(+), 160 deletions(-)

diffs (truncated from 425 to 300 lines):

diff -r c52507ca540a -r 36d20e09f1ea inputmethod/sj3-dict/DESCR
--- a/inputmethod/sj3-dict/DESCR        Wed Jul 05 04:48:28 2006 +0000
+++ b/inputmethod/sj3-dict/DESCR        Wed Jul 05 04:55:23 2006 +0000
@@ -1,20 +1,6 @@
-This is SJ3 2.0.1.20, a Japanese input method.
-This system developed by Sony Corporation.
-SJ3 is composed of Kana-Kanji conversion server(sj3serv),
-Kana-Kanji conversion client for terminal(sj3) and Kana-Kanji
-conversion library(sj3lib).
-
-If you start up sj3serv, you must add a following entry into
-/etc/services file or NIS/YP services map.
+SJ3 is a Japanese input method developed by Sony Corporation.  SJ3 is
+composed of a Kana-Kanji conversion server (sj3serv), a Kana-Kanji
+conversion client for terminals (sj3) and Kana-Kanji conversion library
+(sj3lib).
 
-sj3            3086/tcp
-
-This port number may be changed by the setup file(See manpages).
-
-This also include many patches for FreeBSD or others.
-(Remove warning, support pseudo-terminal of FreeBSD,
- some bug fix and change make rules.) If there are any problem
-in this patches, please know me via E-mail.
-
-Hidekazu Kuroki
-(hidekazu%cs.titech.ac.jp@localhost)
+This package contains the Kana-Kanji dictionary file.
diff -r c52507ca540a -r 36d20e09f1ea inputmethod/sj3-dict/INSTALL
--- a/inputmethod/sj3-dict/INSTALL      Wed Jul 05 04:48:28 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-case $2 in
-    POST-INSTALL)
-       dic="${PKG_PREFIX}/sj3/user"
-       mkdir -p $dic
-       chmod 755 $dic
-       chown @SJ3OWNER@:@SJ3GROUP@ $dic
-       ;;
-esac
diff -r c52507ca540a -r 36d20e09f1ea inputmethod/sj3-dict/Makefile
--- a/inputmethod/sj3-dict/Makefile     Wed Jul 05 04:48:28 2006 +0000
+++ b/inputmethod/sj3-dict/Makefile     Wed Jul 05 04:55:23 2006 +0000
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.12 2006/03/14 01:14:29 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2006/07/05 04:55:23 jlam Exp $
 #
 
 DISTNAME=      sj3-2.0.1.20
 PKGNAME=       sj3-dict-2.0.1.20
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    japanese inputmethod
 MASTER_SITES=  ftp://ftp.sony.co.jp/pub/unsupported/src/       \
                ftp://ftp.cs.titech.ac.jp/pub/japanese/sj3/
 
 MAINTAINER=    tech-pkg-ja%jp.NetBSD.org@localhost
-COMMENT=       Japanese input method (dictionary)
+COMMENT=       SJ3 Japanese input method dictionary
 
 BUILD_DEPENDS+=        sj3-server-bin>=2.0.1.20nb1:../../inputmethod/sj3-server-bin
 
@@ -17,21 +17,21 @@
 DISTINFO_FILE= ${.CURDIR}/../sj3-lib/distinfo
 PATCHDIR=      ${.CURDIR}/../sj3-lib/patches
 
-PKG_INSTALLATION_TYPES=        overwrite pkgviews
-
-
 .include "../../mk/bsd.prefs.mk"
 
-NO_MTREE=       YES
-SJ3OWNER?=     daemon
-SJ3GROUP?=     daemon
+USE_TOOLS+=    itools
+USE_IMAKE=     yes
 MAKE_ENV+=     SJ3OWNER=${SJ3OWNER:Q} SJ3GROUP=${SJ3GROUP:Q} \
                IMDICTDIR=${IMDICTDIR:Q} LOCAL_LDFLAGS=${LDFLAGS:M*:Q}
 FILES_SUBST+=  SJ3OWNER=${SJ3OWNER} SJ3GROUP=${SJ3GROUP} IMDICTDIR=${IMDICTDIR}
-DEINSTALL_SRC= # empty
-INSTALL_SRC=   ${PKGDIR}/INSTALL
+EVAL_PREFIX+=  SJ3SERVERBINDIR=sj3-server-bin
+
+CONFIGURE_DIRS+=       dict/dict
 
-EVAL_PREFIX+=  SJ3SERVERBINDIR=sj3-server-bin
+SJ3OWNER?=     daemon
+SJ3GROUP?=     daemon
+
+INSTALLATION_DIRS=     ${PREFIX}/libdata
 
 pre-configure:
        @${CHMOD} +w ${WRKSRC}/dict/dict/Imakefile*
@@ -40,18 +40,7 @@
                ${WRKSRC}/dict/dict/Imakefile.orig \
                        > ${WRKSRC}/dict/dict/Imakefile
 
-do-configure:
-       @(cd ${WRKSRC}/dict/dict; ${XMKMF_CMD}; \
-               ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} Makefiles)
-
-do-build:
-       @(cd ${WRKSRC}/dict/dict; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM})
+do-install:
+       ${INSTALL_DATA} ${WRKSRC}/dict/dict/sj3main.dic ${PREFIX}/libdata
 
-do-install:
-       @(cd ${WRKSRC}/dict/dict; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} install)
-
-.include "../../devel/nbitools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
-
-# Need to set this here _after_ bsd.pkg.mk
-PREFIX=                ${IMDICTDIR}
diff -r c52507ca540a -r 36d20e09f1ea inputmethod/sj3-dict/PLIST
--- a/inputmethod/sj3-dict/PLIST        Wed Jul 05 04:48:28 2006 +0000
+++ b/inputmethod/sj3-dict/PLIST        Wed Jul 05 04:55:23 2006 +0000
@@ -1,4 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/10 09:15:23 sakamoto Exp $
-sj3/sj3main.dic
-@dirrm sj3/user
-@dirrm sj3
+@comment $NetBSD: PLIST,v 1.2 2006/07/05 04:55:23 jlam Exp $
+libdata/sj3main.dic
diff -r c52507ca540a -r 36d20e09f1ea inputmethod/sj3-lib/DESCR
--- a/inputmethod/sj3-lib/DESCR Wed Jul 05 04:48:28 2006 +0000
+++ b/inputmethod/sj3-lib/DESCR Wed Jul 05 04:55:23 2006 +0000
@@ -1,20 +1,6 @@
-This is SJ3 2.0.1.20, a Japanese input method.
-This system developed by Sony Corporation.
-SJ3 is composed of Kana-Kanji conversion server(sj3serv),
-Kana-Kanji conversion client for terminal(sj3) and Kana-Kanji
-conversion library(sj3lib).
-
-If you start up sj3serv, you must add a following entry into
-/etc/services file or NIS/YP services map.
+SJ3 is a Japanese input method developed by Sony Corporation.  SJ3 is
+composed of a Kana-Kanji conversion server (sj3serv), a Kana-Kanji
+conversion client for terminals (sj3) and Kana-Kanji conversion library
+(sj3lib).
 
-sj3            3086/tcp
-
-This port number may be changed by the setup file(See manpages).
-
-This also include many patches for FreeBSD or others.
-(Remove warning, support pseudo-terminal of FreeBSD,
- some bug fix and change make rules.) If there are any problem
-in this patches, please know me via E-mail.
-
-Hidekazu Kuroki
-(hidekazu%cs.titech.ac.jp@localhost)
+This package contains the Kana-Kanji conversion library (sj3lib).
diff -r c52507ca540a -r 36d20e09f1ea inputmethod/sj3-lib/Makefile
--- a/inputmethod/sj3-lib/Makefile      Wed Jul 05 04:48:28 2006 +0000
+++ b/inputmethod/sj3-lib/Makefile      Wed Jul 05 04:55:23 2006 +0000
@@ -1,20 +1,17 @@
-# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:24 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2006/07/05 04:55:24 jlam Exp $
 
 DISTNAME=      sj3-2.0.1.20
 PKGNAME=       sj3-lib-2.0.1.20
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    japanese inputmethod
 MASTER_SITES=  ftp://ftp.sony.co.jp/pub/unsupported/src/       \
                ftp://ftp.cs.titech.ac.jp/pub/japanese/sj3/
 
 MAINTAINER=    tech-pkg-ja%jp.NetBSD.org@localhost
-COMMENT=       Japanese input method (library)
-
-PKG_INSTALLATION_TYPES=        overwrite pkgviews
+COMMENT=       SJ3 Japanese input method library
 
-
-.include "../../mk/bsd.prefs.mk"
-
+USE_TOOLS+=    itools
+USE_IMAKE=     yes
 MAKE_ENV+=     IMDICTDIR=${IMDICTDIR:Q}
 
 pre-configure:
@@ -22,8 +19,4 @@
        @${SED} -e 's|\(SUBDIRS = \).*\(sj3lib\).*|\1\2|'       \
                ${WRKSRC}/Imakefile.orig > ${WRKSRC}/Imakefile
 
-do-configure:
-       @(cd ${WRKSRC}; ${XMKMF_CMD}; ${MAKE} Makefiles)
-
-.include "../../devel/nbitools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r c52507ca540a -r 36d20e09f1ea inputmethod/sj3-lib/buildlink3.mk
--- a/inputmethod/sj3-lib/buildlink3.mk Wed Jul 05 04:48:28 2006 +0000
+++ b/inputmethod/sj3-lib/buildlink3.mk Wed Jul 05 04:55:23 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/04/12 10:27:20 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/05 04:55:24 jlam Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 SJ3_LIB_BUILDLINK3_MK:=        ${SJ3_LIB_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@
 .if !empty(SJ3_LIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.sj3-lib+=        sj3-lib>=2.0.1.20nb1
 BUILDLINK_PKGSRCDIR.sj3-lib?=  ../../inputmethod/sj3-lib
+BUILDLINK_DEPMETHOD.sj3-lib?=  build
 .endif # SJ3_LIB_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH:S/+$//}
diff -r c52507ca540a -r 36d20e09f1ea inputmethod/sj3-server-bin/DESCR
--- a/inputmethod/sj3-server-bin/DESCR  Wed Jul 05 04:48:28 2006 +0000
+++ b/inputmethod/sj3-server-bin/DESCR  Wed Jul 05 04:55:23 2006 +0000
@@ -1,20 +1,6 @@
-This is SJ3 2.0.1.20, a Japanese input method.
-This system developed by Sony Corporation.
-SJ3 is composed of Kana-Kanji conversion server(sj3serv),
-Kana-Kanji conversion client for terminal(sj3) and Kana-Kanji
-conversion library(sj3lib).
-
-If you start up sj3serv, you must add a following entry into
-/etc/services file or NIS/YP services map.
+SJ3 is a Japanese input method developed by Sony Corporation.  SJ3 is
+composed of a Kana-Kanji conversion server (sj3serv), a Kana-Kanji
+conversion client for terminals (sj3) and Kana-Kanji conversion library
+(sj3lib).
 
-sj3            3086/tcp
-
-This port number may be changed by the setup file(See manpages).
-
-This also include many patches for FreeBSD or others.
-(Remove warning, support pseudo-terminal of FreeBSD,
- some bug fix and change make rules.) If there are any problem
-in this patches, please know me via E-mail.
-
-Hidekazu Kuroki
-(hidekazu%cs.titech.ac.jp@localhost)
+This package contains the Kana-Kanji conversion server and client.
diff -r c52507ca540a -r 36d20e09f1ea inputmethod/sj3-server-bin/MESSAGE
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/inputmethod/sj3-server-bin/MESSAGE        Wed Jul 05 04:55:23 2006 +0000
@@ -0,0 +1,10 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2006/07/05 04:55:24 jlam Exp $
+
+The default port number for the SJ3 service should be added to the
+/etc/services database:
+
+    sj3       3086/tcp
+
+This port number may be changed in configuration files.
+===========================================================================
diff -r c52507ca540a -r 36d20e09f1ea inputmethod/sj3-server-bin/Makefile
--- a/inputmethod/sj3-server-bin/Makefile       Wed Jul 05 04:48:28 2006 +0000
+++ b/inputmethod/sj3-server-bin/Makefile       Wed Jul 05 04:55:23 2006 +0000
@@ -1,31 +1,41 @@
-# $NetBSD: Makefile,v 1.13 2005/12/29 06:21:45 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2006/07/05 04:55:24 jlam Exp $
 #
 
 DISTNAME=      sj3-2.0.1.20
 PKGNAME=       sj3-server-bin-2.0.1.20
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    japanese inputmethod
 MASTER_SITES=  ftp://ftp.sony.co.jp/pub/unsupported/src/       \
                ftp://ftp.cs.titech.ac.jp/pub/japanese/sj3/
 
 MAINTAINER=    tech-pkg-ja%jp.NetBSD.org@localhost
-COMMENT=       Japanese input method (server binary)
+COMMENT=       SJ3 Japanese input method server & client
 
 DISTINFO_FILE= ${.CURDIR}/../sj3-lib/distinfo
 PATCHDIR=      ${.CURDIR}/../sj3-lib/patches
 
-PKG_INSTALLATION_TYPES=        overwrite pkgviews
-
-
 .include "../../mk/bsd.prefs.mk"
 
-BUILD_DEFS+=   SJ3OWNER SJ3GROUP
+USE_TOOLS+=    itools
+USE_IMAKE=     yes
+MAKE_ENV+=     SJ3OWNER=${SJ3OWNER:Q} SJ3GROUP=${SJ3GROUP:Q}           \
+               IMDICTDIR=${IMDICTDIR:Q} LOCAL_LDFLAGS=${LDFLAGS:M*:Q}
+
 SJ3OWNER?=     daemon
 SJ3GROUP?=     daemon
-MAKE_ENV+=     SJ3OWNER=${SJ3OWNER:Q} SJ3GROUP=${SJ3GROUP:Q} \
-               IMDICTDIR=${IMDICTDIR:Q} LOCAL_LDFLAGS=${LDFLAGS:M*:Q}
+
+FILES_SUBST+=  IMDICTDIR=${IMDICTDIR:Q}
+FILES_SUBST+=  SJ3OWNER=${SJ3OWNER:Q}
+FILES_SUBST+=  SJ3GROUP=${SJ3GROUP:Q}
 
-RCD_SCRIPTS=           sj3
+PKG_GROUPS+=   ${SJ3GROUP}
+PKG_USERS+=    ${SJ3OWNER}:${SJ3GROUP}
Prev by Date: [pkgsrc/trunk]: pkgsrc/mk/checksum Strip out *all* of the lines containing Ne...
Next by Date: [pkgsrc/trunk]: pkgsrc/inputmethod/skkserv Drop use of INSTALL_SRC and DEINST...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/mk/checksum Strip out *all* of the lines containing Ne...
Next by Thread: [pkgsrc/trunk]: pkgsrc/inputmethod/skkserv Drop use of INSTALL_SRC and DEINST...
Indexes:
Home | Main Index | Thread Index | Old Index