summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMamoru Komachi <usata@gentoo.org>2004-11-23 10:01:06 +0000
committerMamoru Komachi <usata@gentoo.org>2004-11-23 10:01:06 +0000
commit7512dbe5933bef84286eede9f2615987b12a54a3 (patch)
tree2ad33cfae1cd79a4e1a44a428f55ff8ca62cbe37 /app-i18n/multiskkserv
parentAdded to ~sparc. (diff)
downloadhistorical-7512dbe5933bef84286eede9f2615987b12a54a3.tar.gz
historical-7512dbe5933bef84286eede9f2615987b12a54a3.tar.bz2
historical-7512dbe5933bef84286eede9f2615987b12a54a3.zip
Changed einstall to make DESTDIR=${D} install; bug #72173. Fixed compilation with >=gcc-3.4.
Diffstat (limited to 'app-i18n/multiskkserv')
-rw-r--r--app-i18n/multiskkserv/ChangeLog8
-rw-r--r--app-i18n/multiskkserv/Manifest16
-rw-r--r--app-i18n/multiskkserv/files/multiskkserv-20020201-gcc34.diff11
-rw-r--r--app-i18n/multiskkserv/files/multiskkserv-20020201-gentoo.diff130
-rw-r--r--app-i18n/multiskkserv/multiskkserv-20020201.ebuild16
5 files changed, 40 insertions, 141 deletions
diff --git a/app-i18n/multiskkserv/ChangeLog b/app-i18n/multiskkserv/ChangeLog
index 0c6b3c0f6af3..01cfa0947c40 100644
--- a/app-i18n/multiskkserv/ChangeLog
+++ b/app-i18n/multiskkserv/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-i18n/multiskkserv
# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/multiskkserv/ChangeLog,v 1.5 2004/06/24 21:52:06 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/multiskkserv/ChangeLog,v 1.6 2004/11/23 10:01:06 usata Exp $
+
+ 23 Nov 2004; Mamoru KOMACHI <usata@gentoo.org>
+ +files/multiskkserv-20020201-gcc34.diff,
+ -files/multiskkserv-20020201-gentoo.diff, multiskkserv-20020201.ebuild:
+ Changed einstall to make DESTDIR=${D} install; bug #72173.
+ Fixed compilation with >=gcc-3.4.
27 Dec 2003; Masatomo Nakano <nakano@gentoo.org>
multiskkserv-20020201.ebuild:
diff --git a/app-i18n/multiskkserv/Manifest b/app-i18n/multiskkserv/Manifest
index 9a6f7946b813..bb5a9ccd9ce5 100644
--- a/app-i18n/multiskkserv/Manifest
+++ b/app-i18n/multiskkserv/Manifest
@@ -1,8 +1,18 @@
-MD5 fe5f27ae828cddd4ed1ef58720fd3c9f multiskkserv-20020201.ebuild 1658
-MD5 2ceff536c511fd3b87d0cb91e94865bb ChangeLog 786
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 88f7139ffcbe9ea4defb8d6651de96c9 multiskkserv-20020201.ebuild 1690
+MD5 eb682697f650e07aadbede0b4dff83f0 ChangeLog 1047
MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
MD5 1a3e347b6ebfe24f60f255100a2af4a0 files/cdb-0.75-errno.diff 243
MD5 b7dd124eba2575850725d5d7cadc5837 files/multiskkserv.initd 941
-MD5 24096a839c83b3c0a574f777254ba9cf files/multiskkserv-20020201-gentoo.diff 5014
+MD5 0eab7e3a010cca14e7d727dbf49d64b4 files/multiskkserv-20020201-gcc34.diff 432
MD5 70560693c79857b305848a2c49fc6bd8 files/multiskkserv.conf 461
MD5 ce6ff83d1b90b4daa1b1b076c72db6d0 files/digest-multiskkserv-20020201 133
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBowpsVWNWqTUmv+0RAh4mAJ9mZzvTOTwcqvf+L17/nIcHZotiUwCfbdjc
+Mdh0OR+JeRwqoftytPJR3y0=
+=LC12
+-----END PGP SIGNATURE-----
diff --git a/app-i18n/multiskkserv/files/multiskkserv-20020201-gcc34.diff b/app-i18n/multiskkserv/files/multiskkserv-20020201-gcc34.diff
new file mode 100644
index 000000000000..6e7f90c4887e
--- /dev/null
+++ b/app-i18n/multiskkserv/files/multiskkserv-20020201-gcc34.diff
@@ -0,0 +1,11 @@
+--- multiskkserv-ctl.c.orig 2002-01-13 06:10:13.000000000 +0900
++++ multiskkserv-ctl.c 2004-11-23 18:19:27.670353257 +0900
+@@ -168,7 +168,7 @@
+ char rbuf[SKKSERV_REQUEST_SIZE];
+
+ if ((sock = socket_connect(remote, &sstr, port, (char *)SKKSERV_SERVICE, family)) < 0) {
+- fprintf(stderr, __FUNCTION__ ": cannot make a connection.\n");
++ fprintf(stderr, "%s: cannot make a connection.\n", __FUNCTION__);
+ return;
+ }
+
diff --git a/app-i18n/multiskkserv/files/multiskkserv-20020201-gentoo.diff b/app-i18n/multiskkserv/files/multiskkserv-20020201-gentoo.diff
deleted file mode 100644
index f31a4fa360e1..000000000000
--- a/app-i18n/multiskkserv/files/multiskkserv-20020201-gentoo.diff
+++ /dev/null
@@ -1,130 +0,0 @@
-diff -Naru before/cdb-0.75/Makefile after/cdb-0.75/Makefile
---- before/cdb-0.75/Makefile 2000-02-19 20:42:05.000000000 +0000
-+++ after/cdb-0.75/Makefile 2003-12-27 04:39:11.000000000 +0000
-@@ -22,7 +22,7 @@
-
- auto_home.c: \
- auto-str conf-home
-- ./auto-str auto_home `head -1 conf-home` > auto_home.c
-+ ./auto-str auto_home `head -n 1 conf-home` > auto_home.c
-
- auto_home.o: \
- compile auto_home.c
-@@ -126,14 +126,14 @@
- cdbmake-12: \
- warn-auto.sh cdbmake-12.sh conf-home
- cat warn-auto.sh cdbmake-12.sh \
-- | sed s}HOME}"`head -1 conf-home`"}g \
-+ | sed s}HOME}"`head -n 1 conf-home`"}g \
- > cdbmake-12
- chmod 755 cdbmake-12
-
- cdbmake-sv: \
- warn-auto.sh cdbmake-sv.sh conf-home
- cat warn-auto.sh cdbmake-sv.sh \
-- | sed s}HOME}"`head -1 conf-home`"}g \
-+ | sed s}HOME}"`head -n 1 conf-home`"}g \
- > cdbmake-sv
- chmod 755 cdbmake-sv
-
-@@ -167,7 +167,7 @@
- compile: \
- warn-auto.sh conf-cc
- ( cat warn-auto.sh; \
-- echo exec "`head -1 conf-cc`" '-c $${1+"$$@"}' \
-+ echo exec "`head -n 1 conf-cc`" '-c $${1+"$$@"}' \
- ) > compile
- chmod 755 compile
-
-@@ -210,7 +210,7 @@
- warn-auto.sh conf-ld
- ( cat warn-auto.sh; \
- echo 'main="$$1"; shift'; \
-- echo exec "`head -1 conf-ld`" \
-+ echo exec "`head -n 1 conf-ld`" \
- '-o "$$main" "$$main".o $${1+"$$@"}' \
- ) > load
- chmod 755 load
-@@ -249,7 +249,7 @@
- rts: \
- warn-auto.sh rts.sh conf-home
- cat warn-auto.sh rts.sh \
-- | sed s}HOME}"`head -1 conf-home`"}g \
-+ | sed s}HOME}"`head -n 1 conf-home`"}g \
- > rts
- chmod 755 rts
-
-@@ -284,8 +284,8 @@
- systype: \
- find-systype.sh conf-cc conf-ld trycpp.c x86cpuid.c
- ( cat warn-auto.sh; \
-- echo CC=\'`head -1 conf-cc`\'; \
-- echo LD=\'`head -1 conf-ld`\'; \
-+ echo CC=\'`head -n 1 conf-cc`\'; \
-+ echo LD=\'`head -n 1 conf-ld`\'; \
- cat find-systype.sh; \
- ) | sh > systype
-
-diff -Naru before/multiskkserv-20020201/aclocal.m4 after/multiskkserv-20020201/aclocal.m4
---- before/multiskkserv-20020201/aclocal.m4 2002-01-31 17:50:23.000000000 +0000
-+++ after/multiskkserv-20020201/aclocal.m4 2003-12-27 04:39:29.000000000 +0000
-@@ -1853,7 +1853,7 @@
- # If the export-symbols file already is a .def file (1st line
- # is EXPORTS), use it as is.
- # If DATA tags from a recent dlltool are present, honour them!
-- archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
-+ archive_expsym_cmds='if test "x`head -n 1 $export_symbols`" = xEXPORTS; then
- cp $export_symbols $output_objdir/$soname-def;
- else
- echo EXPORTS > $output_objdir/$soname-def;
-@@ -3792,7 +3792,7 @@
- lt_cv_file_magic_cmd='/usr/bin/file -L'
- case "$host_os" in
- rhapsody* | darwin1.[[012]])
-- lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1`
-+ lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -n 1`
- ;;
- *) # Darwin 1.3 on
- lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-diff -Naru before/multiskkserv-20020201/config.guess after/multiskkserv-20020201/config.guess
---- before/multiskkserv-20020201/config.guess 2002-01-12 20:23:16.000000000 +0000
-+++ after/multiskkserv-20020201/config.guess 2003-12-27 04:39:35.000000000 +0000
-@@ -319,7 +319,7 @@
- echo m68k-sun-sunos${UNAME_RELEASE}
- exit 0 ;;
- sun*:*:4.2BSD:*)
-- UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-+ UNAME_RELEASE=`(head -n 1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
- test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
- case "`/bin/arch`" in
- sun3)
-@@ -506,7 +506,7 @@
- fi
- exit 0 ;;
- *:AIX:*:[45])
-- IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
-+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -n 1 | awk '{ print $1 }'`
- if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
- IBM_ARCH=rs6000
- else
-diff -Naru before/multiskkserv-20020201/configure after/multiskkserv-20020201/configure
---- before/multiskkserv-20020201/configure 2002-01-31 17:50:26.000000000 +0000
-+++ after/multiskkserv-20020201/configure 2003-12-27 04:39:45.000000000 +0000
-@@ -2590,7 +2590,7 @@
- lt_cv_file_magic_cmd='/usr/bin/file -L'
- case "$host_os" in
- rhapsody* | darwin1.[012])
-- lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1`
-+ lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -n 1`
- ;;
- *) # Darwin 1.3 on
- lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-@@ -4311,7 +4311,7 @@
- # If the export-symbols file already is a .def file (1st line
- # is EXPORTS), use it as is.
- # If DATA tags from a recent dlltool are present, honour them!
-- archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
-+ archive_expsym_cmds='if test "x`head -n 1 $export_symbols`" = xEXPORTS; then
- cp $export_symbols $output_objdir/$soname-def;
- else
- echo EXPORTS > $output_objdir/$soname-def;
diff --git a/app-i18n/multiskkserv/multiskkserv-20020201.ebuild b/app-i18n/multiskkserv/multiskkserv-20020201.ebuild
index 6576b3ae073b..32ee8757e4cb 100644
--- a/app-i18n/multiskkserv/multiskkserv-20020201.ebuild
+++ b/app-i18n/multiskkserv/multiskkserv-20020201.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/multiskkserv/multiskkserv-20020201.ebuild,v 1.8 2004/06/28 01:56:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/multiskkserv/multiskkserv-20020201.ebuild,v 1.9 2004/11/23 10:01:06 usata Exp $
-inherit eutils
+inherit eutils fixheadtails
CDB_PV=0.75
CDB_PN=cdb
@@ -32,11 +32,13 @@ src_unpack() {
cd ${WORKDIR}/${CDB_P}
epatch ${FILESDIR}/${CDB_P}-errno.diff
+ ht_fix_all
- cp ${FILESDIR}/multiskkserv.conf ${S}
+ cd ${S}
+ ht_fix_all
- cd ${WORKDIR}
- epatch ${FILESDIR}/${P}-gentoo.diff
+ cd ${S}/src
+ epatch ${FILESDIR}/${P}-gcc34.diff
}
src_compile() {
@@ -56,10 +58,10 @@ src_compile() {
}
src_install() {
- einstall || die
+ make DESTDIR=${D} install || die
insinto /etc/conf.d
- newins multiskkserv.conf multiskkserv
+ newins ${FILESDIR}/multiskkserv.conf multiskkserv
exeinto /etc/init.d
newexe ${FILESDIR}/multiskkserv.initd multiskkserv