diff options
| -rw-r--r-- | GIDs | 1 | ||||
| -rw-r--r-- | japanese/sj3-server/Makefile | 25 | ||||
| -rw-r--r-- | japanese/sj3-server/files/patch-sj3h-sj.h | 14 | ||||
| -rw-r--r-- | japanese/sj3-server/files/post-patch-sj3-sj3.c | 54 | ||||
| -rw-r--r-- | japanese/sj3-server/pkg-install | 37 |
5 files changed, 79 insertions, 52 deletions
@@ -196,6 +196,7 @@ dahdi:*:843:asterisk fossy:*:901:www bacula:*:910: iserv:*:911: +_sj3:*:912: _relayd:*:913: bitlbee:*:914: logcheck:*:915: diff --git a/japanese/sj3-server/Makefile b/japanese/sj3-server/Makefile index 62dbcc4ea7a3..c986c5e4df71 100644 --- a/japanese/sj3-server/Makefile +++ b/japanese/sj3-server/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: sj3-server -# Date created: 18 Aug 1998 -# Whom: Hidekazu Kuroki <hidekazu@cs.titech.ac.jp> -# +# Created by: Hidekazu Kuroki <hidekazu@cs.titech.ac.jp> # $FreeBSD$ -# PORTNAME= sj3 PORTVERSION= 2.0.1.20 @@ -19,13 +15,16 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= hrs@FreeBSD.org COMMENT= A Japanese input method, binary part -LIB_DEPENDS= sj3lib.1:${PORTSDIR}/japanese/sj3-lib +LIB_DEPENDS= sj3lib:${PORTSDIR}/japanese/sj3-lib USE_RC_SUBR= sj3 USE_IMAKE= yes SUB_FILES= sj3_freebsd.tmpl SUB_LIST= DESTDIR=${DESTDIR} +USERS= _sj3 +GROUPS= _sj3 + MAN1= sj3.1 sj3dic.1 sj3mkdic.1 sj3serv.1 MANLANG= ja MANCOMPRESSED= no @@ -33,6 +32,7 @@ PORTDOCS= Nihongo.ps.Z hinsi.ms makedict.ms sj3lib.ms sj3serv.ms POSTPATCHES= ${FILESDIR}/post-patch-Imakefile \ ${FILESDIR}/post-patch-sj3lib-Imakefile \ + ${FILESDIR}/post-patch-sj3-sj3.c \ ${FILESDIR}/post-patch-include-Const.h \ ${FILESDIR}/post-patch-server-setup.c \ ${FILESDIR}/post-patch-server-serverrc \ @@ -41,22 +41,17 @@ POSTPATCHES= ${FILESDIR}/post-patch-Imakefile \ POSTPATCHES.nodocports= \ ${FILESDIR}/post-patch-doc-doc-Imakefile.nodocports -.include <bsd.port.pre.mk> +OPTIONS_DEFINE= DOCS -.if ${OSVERSION} > 900007 -BROKEN= fails to build with new utmpx -.endif +.include <bsd.port.options.mk> post-patch: cd ${WRKSRC} && ${CAT} ${POSTPATCHES} | ${PATCH} -.if defined(NOPORTDOCS) +.if !${PORT_OPTIONS:MDOCS} cd ${WRKSRC} && ${CAT} ${POSTPATCHES.nodocports} | ${PATCH} .endif pre-configure: apply-slist ${INSTALL_DATA} ${WRKDIR}/sj3_freebsd.tmpl ${WRKSRC}/sj3_freebsd.tmpl -pre-su-install: - @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/japanese/sj3-server/files/patch-sj3h-sj.h b/japanese/sj3-server/files/patch-sj3h-sj.h new file mode 100644 index 000000000000..173d2712a74d --- /dev/null +++ b/japanese/sj3-server/files/patch-sj3h-sj.h @@ -0,0 +1,14 @@ +--- sj3h/sj.h.orig 2013-05-04 16:36:40.000000000 +0900 ++++ sj3h/sj.h 2013-05-04 16:37:11.000000000 +0900 +@@ -62,7 +62,11 @@ + #include <sac.h> + #include <utmpx.h> + #else ++#if __FreeBSD_version <= 900006 + #include <utmp.h> ++#else ++#include <utmpx.h> ++#endif + #endif + #if defined(__sony_news) && defined(SVR4) + #include <jctype.h> diff --git a/japanese/sj3-server/files/post-patch-sj3-sj3.c b/japanese/sj3-server/files/post-patch-sj3-sj3.c new file mode 100644 index 000000000000..82e2dc4e4500 --- /dev/null +++ b/japanese/sj3-server/files/post-patch-sj3-sj3.c @@ -0,0 +1,54 @@ +--- sj3/sj3.c.orig2 2013-05-04 16:52:58.000000000 +0900 ++++ sj3/sj3.c 2013-05-04 16:53:34.000000000 +0900 +@@ -829,6 +829,8 @@ + aprintf ("%s:\tmakeutx failed\r\n", progname); + #endif /* SYSV_UTMP */ + #else /* SYSV_TERMIOS */ ++/* XXX */ ++#if __FreeBSD_version <= 900006 + struct utmp Utmp; + char *p; + /* +@@ -863,6 +865,7 @@ + + getslave (); + #endif /* SYSV_TERMIOS */ ++#endif + (void) close (master); + dup2 (slave, 0); + dup2 (slave, 1); +@@ -870,11 +873,14 @@ + (void) close (slave); + + #ifndef SYSV_TERMIOS ++/* XXX */ ++#if __FreeBSD_version <= 900006 + if (Ttyslot > 0 && (f = open (_PATH_UTMP, 1)) >= 0) { + lseek (f, (long) (Ttyslot * sizeof (Utmp)), 0); + write (f, (char *)&Utmp, sizeof (Utmp)); + close (f); + } ++#endif + #endif /* SYSV_TERMIOS */ + + setgid (getgid ()); +@@ -1227,6 +1233,8 @@ + void + clearutmpentry () + { ++/* XXX */ ++#if __FreeBSD_version <= 900006 + int f; + struct utmp Utmp; + +@@ -1240,7 +1248,10 @@ + write (f, (char *)&Utmp, sizeof (Utmp)); + close (f); + } ++#else ++ return; + } ++#endif + #endif /* SYSV_UTMP */ + #endif /* SVR4 */ + diff --git a/japanese/sj3-server/pkg-install b/japanese/sj3-server/pkg-install deleted file mode 100644 index b253b2139168..000000000000 --- a/japanese/sj3-server/pkg-install +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -PATH=/bin:/usr/sbin - -case $2 in - PRE-INSTALL) - USER=_sj3 - GROUP=${USER} - UID=912 - GID=${UID} - - if pw group show "${GROUP}" 2>/dev/null; then - echo "You already have a group \"${GROUP}\", so I will use it." - else - if pw groupadd ${GROUP} -g ${GID}; then - echo "Added group \"${GROUP}\"." - else - echo "Adding group \"${GROUP}\" failed..." - exit 1 - fi - fi - - if pw user show "${USER}" 2>/dev/null; then - echo "You already have a user \"${USER}\", so I will use it." - else - if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \ - -d /nonexistent -s /usr/sbin/nologin -c "SJ3 Daemon" - then - echo "Added user \"${USER}\"." - else - echo "Adding user \"${USER}\" failed..." - exit 1 - fi - fi - ;; -esac |