summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--comms/scmxx/Makefile6
-rw-r--r--comms/scmxx/PLIST6
-rw-r--r--comms/scmxx/distinfo13
-rw-r--r--comms/scmxx/patches/patch-aa54
-rw-r--r--comms/scmxx/patches/patch-ab19
-rw-r--r--comms/scmxx/patches/patch-ac13
-rw-r--r--comms/scmxx/patches/patch-ad13
7 files changed, 98 insertions, 26 deletions
diff --git a/comms/scmxx/Makefile b/comms/scmxx/Makefile
index 701a83feb97..44b0d418b5b 100644
--- a/comms/scmxx/Makefile
+++ b/comms/scmxx/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2005/05/22 20:07:44 jlam Exp $
+# $NetBSD: Makefile,v 1.37 2005/07/14 19:15:56 wiz Exp $
#
-DISTNAME= scmxx-0.7.5
+DISTNAME= scmxx-0.8.0
CATEGORIES= comms
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scmxx/}
EXTRACT_SUFX= .tar.bz2
@@ -10,8 +10,8 @@ MAINTAINER= wiz@NetBSD.org
HOMEPAGE= http://www.hendrik-sattler.de/scmxx/
COMMENT= Data exchange utility for Siemens mobile phones
-
GNU_CONFIGURE= yes
+USE_PKGLOCALEDIR= yes
USE_TOOLS+= gmake
post-install:
diff --git a/comms/scmxx/PLIST b/comms/scmxx/PLIST
index 2024512e3de..82b96df9cbe 100644
--- a/comms/scmxx/PLIST
+++ b/comms/scmxx/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2005/02/20 23:05:54 wiz Exp $
+@comment $NetBSD: PLIST,v 1.11 2005/07/14 19:15:56 wiz Exp $
bin/scmxx
man/de/man1/scmxx.1
man/it/man1/scmxx.1
@@ -10,6 +10,10 @@ share/examples/scmxx/debian_with_scmxx.bmp
share/examples/scmxx/sms.txt
share/examples/scmxx/vCalendar.vcs
share/examples/scmxx/vCard.vcf
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/scmxx.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/scmxx.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/scmxx.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/scmxx.mo
@dirrm share/doc/scmxx
@dirrm share/examples/scmxx
@dirrm man/it/man1
diff --git a/comms/scmxx/distinfo b/comms/scmxx/distinfo
index 21a576d7a06..a41d43b654d 100644
--- a/comms/scmxx/distinfo
+++ b/comms/scmxx/distinfo
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.25 2005/02/23 16:05:31 agc Exp $
+$NetBSD: distinfo,v 1.26 2005/07/14 19:15:56 wiz Exp $
-SHA1 (scmxx-0.7.5.tar.bz2) = 382e3791664e11211f073026e8ab7e428f2883b3
-RMD160 (scmxx-0.7.5.tar.bz2) = bf48382fa9b3e21e5e7c4b0d135c361af09141f5
-Size (scmxx-0.7.5.tar.bz2) = 165440 bytes
-SHA1 (patch-aa) = 057bba85618fd5a6b75f147446e3820c86ebf06e
+SHA1 (scmxx-0.8.0.tar.bz2) = 86757ac0e171d81c1887353316caf935dd260899
+RMD160 (scmxx-0.8.0.tar.bz2) = 17541ed99b736a76f380e6255d982b2283031a6a
+Size (scmxx-0.8.0.tar.bz2) = 212558 bytes
+SHA1 (patch-aa) = 549a9146132749143b23f2f4e151b8b4789f0b1e
+SHA1 (patch-ab) = 5bd30d280e7c4ad91570f56c96de3b90f6168d77
+SHA1 (patch-ac) = a4bc9571948b032427a3b9dd3fdbdd9f1f12ebc3
+SHA1 (patch-ad) = a4f40faa7fa1c921fef7cbb059adac9ef97a0921
diff --git a/comms/scmxx/patches/patch-aa b/comms/scmxx/patches/patch-aa
index 8e6a3f651f5..920161ba5c0 100644
--- a/comms/scmxx/patches/patch-aa
+++ b/comms/scmxx/patches/patch-aa
@@ -1,18 +1,38 @@
-$NetBSD: patch-aa,v 1.8 2004/11/27 23:00:00 wiz Exp $
+$NetBSD: patch-aa,v 1.9 2005/07/14 19:17:00 wiz Exp $
---- Makefile.in.orig 2004-09-17 13:44:29.000000000 +0200
-+++ Makefile.in
-@@ -2,11 +2,11 @@ SHELL=@SHELL@
-
- .PHONY:all
- all:
-- for i in src po; do $(MAKE) -C $$i $@; done
-+ for i in src ; do $(MAKE) -C $$i $@; done
-
- .PHONY:install
- install: all
-- for i in src po docs; do $(MAKE) -C $$i $@; done
-+ for i in src docs; do $(MAKE) -C $$i $@; done
-
- .PHONY:uninstall
- uninstall:
+--- src/pinfile.c.orig 2005-06-08 19:49:17.000000000 +0200
++++ src/pinfile.c
+@@ -220,7 +220,14 @@ char* pinfile_get_subdata (const char* s
+ mem_realloc(temp,0);
+ if (pin != NULL) {
+ //find_pinpuk() already checked it
+- puk = strndup(puk,strchr(puk,';')-puk);
++ char *foo;
++
++ foo = strchr(puk,';');
++ if (foo != NULL)
++ *foo = '\0';
++ puk = strdup(puk);
++ if (foo != NULL)
++ *foo = ';';
+ }
+ }
+ } else {
+@@ -232,9 +239,16 @@ char* pinfile_get_subdata (const char* s
+ print_verbose(0,"%s\n",_("not found"));
+ return strdup("");
+ } else {
++ char *foo;
++
+ print_verbose(0,"%s\n",_("found"));
+ //find_pinpuk() already checked it
+- pin = strndup(pin,strchr(pin,';')-pin);
++ foo = strchr(pin,';');
++ if (foo != NULL)
++ *foo = '\0';
++ pin = strdup(pin);
++ if (foo != NULL)
++ *foo = ';';
+ mem_realloc(data,0);
+ if (puk == NULL) {
+ return pin;
diff --git a/comms/scmxx/patches/patch-ab b/comms/scmxx/patches/patch-ab
new file mode 100644
index 00000000000..b6af155463e
--- /dev/null
+++ b/comms/scmxx/patches/patch-ab
@@ -0,0 +1,19 @@
+$NetBSD: patch-ab,v 1.9 2005/07/14 19:15:56 wiz Exp $
+
+--- docs/Makefile.in.orig 2005-06-24 13:27:09.000000000 +0200
++++ docs/Makefile.in
+@@ -66,12 +66,12 @@ distclean:
+ .PHONY: install-$(PACKAGE_NAME).en.$(MANCAT)
+ install-$(PACKAGE_NAME).en.$(MANCAT): $(PACKAGE_NAME).en.$(MANCAT)
+ $(INSTALL) -d $(mandir)/man$(MANCAT); \
+- $(INSTALL) --mode=644 $(PACKAGE_NAME).en.$(MANCAT) $(mandir)/man$(MANCAT)/$(MAN); \
++ $(INSTALL) -m 644 $(PACKAGE_NAME).en.$(MANCAT) $(mandir)/man$(MANCAT)/$(MAN); \
+
+ .PHONY: install-$(PACKAGE_NAME).%.$(MANCAT)
+ install-$(PACKAGE_NAME).%.$(MANCAT): $(PACKAGE_NAME).%.$(MANCAT)
+ $(INSTALL) -d $(mandir)/$*/man$(MANCAT); \
+- $(INSTALL) --mode=644 $(PACKAGE_NAME).$*.$(MANCAT) $(mandir)/$*/man$(MANCAT)/$(MAN); \
++ $(INSTALL) -m 644 $(PACKAGE_NAME).$*.$(MANCAT) $(mandir)/$*/man$(MANCAT)/$(MAN); \
+
+ .PHONY: install
+ install: $(patsubst %,install-$(PACKAGE_NAME).%.$(MANCAT),$(MAN_LANGS))
diff --git a/comms/scmxx/patches/patch-ac b/comms/scmxx/patches/patch-ac
new file mode 100644
index 00000000000..4a079fbec5e
--- /dev/null
+++ b/comms/scmxx/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.3 2005/07/14 19:15:56 wiz Exp $
+
+--- po/Makefile.in.orig 2005-06-08 21:52:10.000000000 +0200
++++ po/Makefile.in
+@@ -67,7 +67,7 @@ $(POT_FILE): $(SOURCE_FILES)
+ .PHONY:install-%.mo
+ install-%.mo: %.mo
+ $(INSTALL) -d $(DESTDIR)$(GETTEXTDIR)/$*/LC_MESSAGES; \
+- $(INSTALL) --mode=644 $< $(DESTDIR)$(GETTEXTDIR)/$*/LC_MESSAGES/$(PACKAGE_NAME).mo; \
++ $(INSTALL) -m 644 $< $(DESTDIR)$(GETTEXTDIR)/$*/LC_MESSAGES/$(PACKAGE_NAME).mo; \
+
+ .PHONY:install
+ install: $(patsubst %,install-%,$(MO_FILES))
diff --git a/comms/scmxx/patches/patch-ad b/comms/scmxx/patches/patch-ad
new file mode 100644
index 00000000000..c6edf5229fd
--- /dev/null
+++ b/comms/scmxx/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.3 2005/07/14 19:15:56 wiz Exp $
+
+--- src/Makefile.in.orig 2005-06-10 20:22:12.000000000 +0200
++++ src/Makefile.in
+@@ -89,7 +89,7 @@ distclean: clean $(patsubst %,%-distclea
+ .PHONY: install
+ install: $(BINARY)
+ $(INSTALL) -d $(DESTDIR)$(bindir)
+- $(INSTALL) --mode=755 $(BINARY) $(DESTDIR)$(bindir)
++ $(INSTALL) -m 755 $(BINARY) $(DESTDIR)$(bindir)
+
+ .PHONY: uninstall
+ uninstall: