Date: Sat, 4 May 2013 08:07:59 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317297 - in head: . japanese/sj3-server japanese/sj3-server/files Message-ID: <201305040807.r4487xk9070821@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Sat May 4 08:07:59 2013 New Revision: 317297 URL: http://svnweb.freebsd.org/changeset/ports/317297 Log: - Fix build after utmp->utmpx migration. - Use OPTIONS_DEFINE. - Use USERS and GROUPS for _sj3 user. - Trim old-style header. Added: head/japanese/sj3-server/files/patch-sj3h-sj.h (contents, props changed) head/japanese/sj3-server/files/post-patch-sj3-sj3.c (contents, props changed) Deleted: head/japanese/sj3-server/pkg-install Modified: head/GIDs head/japanese/sj3-server/Makefile Modified: head/GIDs ============================================================================== --- head/GIDs Sat May 4 06:53:06 2013 (r317296) +++ head/GIDs Sat May 4 08:07:59 2013 (r317297) @@ -196,6 +196,7 @@ dahdi:*:843:asterisk fossy:*:901:www bacula:*:910: iserv:*:911: +_sj3:*:912: _relayd:*:913: bitlbee:*:914: logcheck:*:915: Modified: head/japanese/sj3-server/Makefile ============================================================================== --- head/japanese/sj3-server/Makefile Sat May 4 06:53:06 2013 (r317296) +++ head/japanese/sj3-server/Makefile Sat May 4 08:07:59 2013 (r317297) @@ -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 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-Imak 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> Added: head/japanese/sj3-server/files/patch-sj3h-sj.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/sj3-server/files/patch-sj3h-sj.h Sat May 4 08:07:59 2013 (r317297) @@ -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> Added: head/japanese/sj3-server/files/post-patch-sj3-sj3.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/sj3-server/files/post-patch-sj3-sj3.c Sat May 4 08:07:59 2013 (r317297) @@ -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 */ +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305040807.r4487xk9070821>