svn commit: r355052 - in head/japanese: sj3-lib sj3-lib/files sj3-server sj3-server/files
Hiroki Sato
hrs at FreeBSD.org
Sat May 24 17:00:13 UTC 2014
Author: hrs
Date: Sat May 24 17:00:11 2014
New Revision: 355052
URL: http://svnweb.freebsd.org/changeset/ports/355052
QAT: https://qat.redports.org/buildarchive/r355052/
Log:
- STAGEDIR support.
- Add LICENSE.
- Remove GCC dependency.
Added:
head/japanese/sj3-lib/files/COPYING (contents, props changed)
head/japanese/sj3-server/files/COPYING (contents, props changed)
head/japanese/sj3-server/files/post-patch-dict-dict-Imakefile (contents, props changed)
Deleted:
head/japanese/sj3-lib/pkg-plist
Modified:
head/japanese/sj3-lib/Makefile
head/japanese/sj3-server/Makefile
head/japanese/sj3-server/files/post-patch-Imakefile
head/japanese/sj3-server/files/post-patch-sj3lib-Imakefile
head/japanese/sj3-server/files/sj3.in
head/japanese/sj3-server/pkg-plist
Modified: head/japanese/sj3-lib/Makefile
==============================================================================
--- head/japanese/sj3-lib/Makefile Sat May 24 16:44:47 2014 (r355051)
+++ head/japanese/sj3-lib/Makefile Sat May 24 17:00:11 2014 (r355052)
@@ -3,7 +3,7 @@
PORTNAME= sj3
PORTVERSION= 2.0.1.20
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= japanese
MASTER_SITES= LOCAL/nork
PKGNAMESUFFIX= -lib
@@ -15,17 +15,23 @@ PATCH_DIST_STRIP= -p1
MAINTAINER= hrs at FreeBSD.org
COMMENT= Japanese input method, library part
+LICENSE= MIT
+LICENSE_FILE= ${FILESDIR}/COPYING
+
USES= imake
-USE_GCC= any
USE_LDCONFIG= yes
NO_INSTALL_MANPAGES= yes
SUB_FILES= sj3_freebsd.tmpl
SUB_LIST= DESTDIR=${DESTDIR}
+PLIST_FILES= include/sj3lib.h \
+ lib/libsj3lib.a \
+ lib/libsj3lib.so \
+ lib/libsj3lib.so.1
+
POSTPATCHES= ${FILESDIR}/post-patch-Imakefile \
${FILESDIR}/post-patch-include-Const.h
-NO_STAGE= yes
post-patch:
cd ${WRKSRC} && ${CAT} ${POSTPATCHES} | ${PATCH}
Added: head/japanese/sj3-lib/files/COPYING
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/japanese/sj3-lib/files/COPYING Sat May 24 17:00:11 2014 (r355052)
@@ -0,0 +1,27 @@
+$FreeBSD$
+
+Copyright (c) 1991-1994 Sony Corporation
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL SONY CORPORATION BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of Sony Corporation
+shall not be used in advertising or otherwise to promote the sale, use
+or other dealings in this Software without prior written authorization
+from Sony Corporation.
Modified: head/japanese/sj3-server/Makefile
==============================================================================
--- head/japanese/sj3-server/Makefile Sat May 24 16:44:47 2014 (r355051)
+++ head/japanese/sj3-server/Makefile Sat May 24 17:00:11 2014 (r355052)
@@ -3,7 +3,7 @@
PORTNAME= sj3
PORTVERSION= 2.0.1.20
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= japanese
MASTER_SITES= LOCAL/nork
PKGNAMESUFFIX= -server
@@ -15,25 +15,25 @@ PATCH_DIST_STRIP= -p1
MAINTAINER= hrs at FreeBSD.org
COMMENT= Japanese input method, binary part
-LIB_DEPENDS= sj3lib:${PORTSDIR}/japanese/sj3-lib
+LICENSE= MIT
+LICENSE_FILE= ${FILESDIR}/COPYING
+
+LIB_DEPENDS= libsj3lib.so:${PORTSDIR}/japanese/sj3-lib
USES= imake
USE_RC_SUBR= sj3
+PLIST_SUB= USERS=${USERS} GROUPS=${GROUPS}
SUB_FILES= sj3_freebsd.tmpl
SUB_LIST= DESTDIR=${DESTDIR}
CFLAGS+= -Wno-return-type
-
USERS= _sj3
GROUPS= _sj3
-
-MAN1= sj3.1 sj3dic.1 sj3mkdic.1 sj3serv.1
-MANLANG= ja
-MANCOMPRESSED= no
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-dict-dict-Imakefile \
${FILESDIR}/post-patch-include-Const.h \
${FILESDIR}/post-patch-server-setup.c \
${FILESDIR}/post-patch-server-serverrc \
@@ -44,7 +44,6 @@ POSTPATCHES.nodocports= \
OPTIONS_DEFINE= DOCS
-NO_STAGE= yes
.include <bsd.port.options.mk>
post-patch:
@@ -56,4 +55,7 @@ post-patch:
pre-configure: apply-slist
${INSTALL_DATA} ${WRKDIR}/sj3_freebsd.tmpl ${WRKSRC}/sj3_freebsd.tmpl
+post-install:
+ ${MKDIR} ${STAGEDIR}${PREFIX}/lib/sj3/dict/user
+
.include <bsd.port.mk>
Added: head/japanese/sj3-server/files/COPYING
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/japanese/sj3-server/files/COPYING Sat May 24 17:00:11 2014 (r355052)
@@ -0,0 +1,27 @@
+$FreeBSD$
+
+Copyright (c) 1991-1994 Sony Corporation
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL SONY CORPORATION BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of Sony Corporation
+shall not be used in advertising or otherwise to promote the sale, use
+or other dealings in this Software without prior written authorization
+from Sony Corporation.
Modified: head/japanese/sj3-server/files/post-patch-Imakefile
==============================================================================
--- head/japanese/sj3-server/files/post-patch-Imakefile Sat May 24 16:44:47 2014 (r355051)
+++ head/japanese/sj3-server/files/post-patch-Imakefile Sat May 24 17:00:11 2014 (r355052)
@@ -1,5 +1,5 @@
---- Imakefile.orig 2008-09-07 16:30:58.000000000 +0900
-+++ Imakefile 2008-09-07 16:34:36.000000000 +0900
+--- Imakefile.orig 2014-04-06 04:49:25.000000000 +0900
++++ Imakefile 2014-04-06 04:50:20.000000000 +0900
@@ -62,11 +62,6 @@
echo "#define DEFKEYFILE \"$(SJ3CONFDIR)/cvtkey.\"") \ @@\
>> include/Paths.h
Added: head/japanese/sj3-server/files/post-patch-dict-dict-Imakefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/japanese/sj3-server/files/post-patch-dict-dict-Imakefile Sat May 24 17:00:11 2014 (r355052)
@@ -0,0 +1,12 @@
+--- dict/dict/Imakefile.orig 2014-04-06 04:46:53.000000000 +0900
++++ dict/dict/Imakefile 2014-04-06 04:47:04.000000000 +0900
+@@ -59,9 +59,3 @@
+ $(RM) $(OBJS) $(OUTPUT)
+
+ InstallNamedNonExec(sj3main.dic,sj3main.dic,$(SJ3DICTDIR))
+-
+-install::
+- if [ ! -d $(SJ3DICTDIR)/user ]; then \ @@\
+- ($(MKDIRHIER) $(SJ3DICTDIR)/user; \ @@\
+- chown $(SJ3OWNER) $(SJ3DICTDIR)/user; \ @@\
+- chgrp $(SJ3GROUP) $(SJ3DICTDIR)/user); fi
Modified: head/japanese/sj3-server/files/post-patch-sj3lib-Imakefile
==============================================================================
--- head/japanese/sj3-server/files/post-patch-sj3lib-Imakefile Sat May 24 16:44:47 2014 (r355051)
+++ head/japanese/sj3-server/files/post-patch-sj3lib-Imakefile Sat May 24 17:00:11 2014 (r355052)
@@ -1,6 +1,15 @@
---- sj3lib/Imakefile.orig 2008-09-07 16:42:18.000000000 +0900
-+++ sj3lib/Imakefile 2008-09-07 16:42:39.000000000 +0900
-@@ -72,7 +72,5 @@
+--- sj3lib/Imakefile.orig 2014-04-06 04:51:07.000000000 +0900
++++ sj3lib/Imakefile 2014-04-06 04:56:15.000000000 +0900
+@@ -62,6 +62,8 @@
+ sj.o \
+ string.o
+
++#define LibInstall NO
++
+ #include <Library.tmpl>
+
+ #if InstallNonstandard
+@@ -72,7 +74,5 @@
LibraryObjectRule()
Modified: head/japanese/sj3-server/files/sj3.in
==============================================================================
--- head/japanese/sj3-server/files/sj3.in Sat May 24 16:44:47 2014 (r355051)
+++ head/japanese/sj3-server/files/sj3.in Sat May 24 17:00:11 2014 (r355052)
@@ -1,8 +1,6 @@
#!/bin/sh
-#
# $FreeBSD$
#
-
# PROVIDE: sj3
# REQUIRE: DAEMON
# BEFORE: LOGIN
@@ -15,15 +13,14 @@
#
# DO NOT CHANGE THESE DEFAULT VALUES HERE
#
-sj3_enable=${sj3_enable:-"NO"} # Enable sj3
-#sj3_program="%%PREFIX%%/sbin/sj3serv" # Location of sj3
+: ${sj3_enable:=NO} # Enable sj3
+: ${sj3_program:="%%PREFIX%%/sbin/sj3serv"} # Location of sj3
. /etc/rc.subr
-name="sj3"
+name=sj3
rcvar=sj3_enable
-command="%%PREFIX%%/sbin/sj3serv"
-start_precmd="sj3serv_precmd"
+start_precmd=sj3serv_precmd
sj3serv_precmd()
{
Modified: head/japanese/sj3-server/pkg-plist
==============================================================================
--- head/japanese/sj3-server/pkg-plist Sat May 24 16:44:47 2014 (r355051)
+++ head/japanese/sj3-server/pkg-plist Sat May 24 17:00:11 2014 (r355052)
@@ -1,3 +1,4 @@
+ at comment $FreeBSD$
bin/sj3
bin/sj3dic
bin/sj3mkdic
@@ -11,9 +12,12 @@ etc/sj3/sjrc
etc/sj3/sjrk
lib/sj3/dict/sj3main.dic
sbin/sj3serv
+man/ja/man1/sj3.1.gz
+man/ja/man1/sj3dic.1.gz
+man/ja/man1/sj3mkdic.1.gz
+man/ja/man1/sj3serv.1.gz
+ at exec install -m 0775 -o %%USERS%% -g %%GROUPS%% -d %D/lib/sj3/dict/user
@dirrm lib/sj3/dict/user
@dirrm lib/sj3/dict
@dirrm lib/sj3
@dirrm etc/sj3
- at cwd /var/run
- at dirrmtry sj3
More information about the svn-ports-all
mailing list