From f4c86ea34d7b95e8b218ad853586f5bb4e4bdf82 Mon Sep 17 00:00:00 2001 From: naddy Date: Fri, 26 Feb 2021 21:09:57 +0000 Subject: [PATCH] comms/scmxx: update to last release 0.9.0 Not tested at runtime for lack of a Siemens mobile phone; the company has been defunct for 15 years. ok tb@ --- comms/scmxx/Makefile | 10 ++--- comms/scmxx/distinfo | 4 +- comms/scmxx/patches/patch-docs_Makefile_in | 18 --------- comms/scmxx/patches/patch-po_Makefile_in | 21 ---------- comms/scmxx/patches/patch-po_it_po | 12 ------ comms/scmxx/patches/patch-src_Makefile_in | 29 -------------- comms/scmxx/patches/patch-src_Makefile_sub_in | 11 +++--- .../patches/patch-src_charsets_ucs4_dec_c | 14 ------- comms/scmxx/patches/patch-src_common_h | 16 -------- comms/scmxx/patches/patch-src_scmxx_c | 16 -------- .../patches/patch-src_smspdu_smspdu_enc_c | 14 ------- .../patches/patch-src_smspdu_smsud_enc_c | 38 ------------------- comms/scmxx/pkg/PLIST | 8 +++- 13 files changed, 20 insertions(+), 191 deletions(-) delete mode 100644 comms/scmxx/patches/patch-docs_Makefile_in delete mode 100644 comms/scmxx/patches/patch-po_Makefile_in delete mode 100644 comms/scmxx/patches/patch-po_it_po delete mode 100644 comms/scmxx/patches/patch-src_Makefile_in delete mode 100644 comms/scmxx/patches/patch-src_charsets_ucs4_dec_c delete mode 100644 comms/scmxx/patches/patch-src_common_h delete mode 100644 comms/scmxx/patches/patch-src_scmxx_c delete mode 100644 comms/scmxx/patches/patch-src_smspdu_smspdu_enc_c delete mode 100644 comms/scmxx/patches/patch-src_smspdu_smsud_enc_c diff --git a/comms/scmxx/Makefile b/comms/scmxx/Makefile index aa7e159ca12..f8004300101 100644 --- a/comms/scmxx/Makefile +++ b/comms/scmxx/Makefile @@ -1,13 +1,12 @@ -# $OpenBSD: Makefile,v 1.17 2021/02/26 16:51:40 tb Exp $ +# $OpenBSD: Makefile,v 1.18 2021/02/26 21:09:57 naddy Exp $ COMMENT= data exchange utility for Siemens mobile phones -DISTNAME= scmxx-0.8.0 -REVISION= 5 +DISTNAME= scmxx-0.9.0 CATEGORIES= comms -HOMEPAGE= http://www.hendrik-sattler.de/scmxx/ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scmxx/} +EXTRACT_SUFX= .tar.bz2 # GPLv2 PERMIT_PACKAGE= Yes @@ -26,7 +25,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ NO_TEST= Yes -DOCS= doc_sources.txt gsm0338.txt gsmcharset.txt +DOCS= adr.txt apo.txt doc_sources.txt \ + gsm0338.txt gsmcharset.txt smi.txt SAMPLES= sms.txt vCalendar.vcs vCard.vcf post-install: diff --git a/comms/scmxx/distinfo b/comms/scmxx/distinfo index cb7ca12941e..9d77c342a9d 100644 --- a/comms/scmxx/distinfo +++ b/comms/scmxx/distinfo @@ -1,2 +1,2 @@ -SHA256 (scmxx-0.8.0.tar.gz) = SAzIqF3WOc/+q9G26YH25eMYsoZNwTpXJmHmgo0WLs0= -SIZE (scmxx-0.8.0.tar.gz) = 285172 +SHA256 (scmxx-0.9.0.tar.bz2) = YL2EvUucaw2HvlnggLR3YyDWCqAl7VdWCleQtRHV1to= +SIZE (scmxx-0.9.0.tar.bz2) = 250681 diff --git a/comms/scmxx/patches/patch-docs_Makefile_in b/comms/scmxx/patches/patch-docs_Makefile_in deleted file mode 100644 index bbc3248aff3..00000000000 --- a/comms/scmxx/patches/patch-docs_Makefile_in +++ /dev/null @@ -1,18 +0,0 @@ -$OpenBSD: patch-docs_Makefile_in,v 1.1 2005/07/26 17:00:51 fgsch Exp $ ---- docs/Makefile.in.orig Tue Jul 26 02:19:13 2005 -+++ docs/Makefile.in Tue Jul 26 02:19:28 2005 -@@ -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-po_Makefile_in b/comms/scmxx/patches/patch-po_Makefile_in deleted file mode 100644 index 1a8984087f2..00000000000 --- a/comms/scmxx/patches/patch-po_Makefile_in +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-po_Makefile_in,v 1.2 2005/07/26 19:18:45 fgsch Exp $ ---- po/Makefile.in.orig Wed Jun 8 16:52:10 2005 -+++ po/Makefile.in Tue Jul 26 04:12:19 2005 -@@ -38,7 +38,7 @@ all: $(MO_FILES) - if ( test -e $(POT_FILE) ) ; then \ - if ( test "$(MSGMERGE)" ); then \ - echo -n "$@: Merging from $(POT_FILE)"; \ -- $(MSGMERGE) $(MSGMERGE_OPTS) $@ $(POT_FILE); \ -+ $(MSGMERGE) $(MSGMERGE_OPTS) $@ $(POT_FILE) -o $@; \ - touch $@; \ - fi \ - fi \ -@@ -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-po_it_po b/comms/scmxx/patches/patch-po_it_po deleted file mode 100644 index bf1ca45f300..00000000000 --- a/comms/scmxx/patches/patch-po_it_po +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-po_it_po,v 1.1 2005/07/26 17:00:51 fgsch Exp $ ---- po/it.po.orig Tue Jul 26 02:15:04 2005 -+++ po/it.po Tue Jul 26 02:15:11 2005 -@@ -13,7 +13,7 @@ msgstr "" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=ISO-8859-1\n" - "Content-Transfer-Encoding: 8bit\n" --"anguage-Team: Italian \n" -+"Language-Team: Italian \n" - "Plural-Forms: nplurals=2; plural=(n != 1);\n" - - #: ../src/atcommand/common.c:58 diff --git a/comms/scmxx/patches/patch-src_Makefile_in b/comms/scmxx/patches/patch-src_Makefile_in deleted file mode 100644 index 12bf3d74e72..00000000000 --- a/comms/scmxx/patches/patch-src_Makefile_in +++ /dev/null @@ -1,29 +0,0 @@ -$OpenBSD: patch-src_Makefile_in,v 1.3 2017/04/27 20:13:36 naddy Exp $ ---- src/Makefile.in.orig Fri Jun 10 20:22:12 2005 -+++ src/Makefile.in Thu Apr 27 22:08:55 2017 -@@ -7,6 +7,7 @@ mandir=@mandir@ - - CC=@CC@ - CFLAGS= @CFLAGS@ -+CPPFLAGS=@CPPFLAGS@ - LDFLAGS=@LDFLAGS@ - LIBS=@LIBS@ - INSTALL=@INSTALL@ -@@ -68,7 +69,7 @@ endif - .PHONY: depend - depend: .dependencies - .dependencies: $(DEP_SRC) $(DEP_HEADER) -- $(CC) $(CFLAGS) -MM $(DEP_SRC) >.dependencies -+ $(CC) $(CPPFLAGS) -MM $(DEP_SRC) >.dependencies - - .PHONY: %-clean - %-clean: -@@ -89,7 +90,7 @@ distclean: clean $(patsubst %,%-distclean,$(SUBDIRS)) - .PHONY: install - install: $(BINARY) - $(INSTALL) -d $(DESTDIR)$(bindir) -- $(INSTALL) --mode=755 $(BINARY) $(DESTDIR)$(bindir) -+ $(INSTALL) -m 755 $(BINARY) $(DESTDIR)$(bindir) - - .PHONY: uninstall - uninstall: diff --git a/comms/scmxx/patches/patch-src_Makefile_sub_in b/comms/scmxx/patches/patch-src_Makefile_sub_in index 16c990e9025..d62094c8172 100644 --- a/comms/scmxx/patches/patch-src_Makefile_sub_in +++ b/comms/scmxx/patches/patch-src_Makefile_sub_in @@ -1,6 +1,7 @@ -$OpenBSD: patch-src_Makefile_sub_in,v 1.1 2017/04/27 20:13:36 naddy Exp $ ---- src/Makefile.sub.in.orig Thu May 5 16:54:30 2005 -+++ src/Makefile.sub.in Thu Apr 27 22:09:46 2017 +$OpenBSD: patch-src_Makefile_sub_in,v 1.2 2021/02/26 21:09:57 naddy Exp $ +Index: src/Makefile.sub.in +--- src/Makefile.sub.in.orig ++++ src/Makefile.sub.in @@ -5,7 +5,8 @@ SHELL=@SHELL@ CC=@CC@ @@ -10,8 +11,8 @@ $OpenBSD: patch-src_Makefile_sub_in,v 1.1 2017/04/27 20:13:36 naddy Exp $ +CPPFLAGS=@CPPFLAGS@ -I.. OBJEXT=@OBJEXT@ - SOURCES=$(shell ls -1 *.c 2>/dev/null) -@@ -33,10 +34,10 @@ endif + ifeq '$(SOURCES)' '' +@@ -35,10 +36,10 @@ endif .PHONY: depend depend: diff --git a/comms/scmxx/patches/patch-src_charsets_ucs4_dec_c b/comms/scmxx/patches/patch-src_charsets_ucs4_dec_c deleted file mode 100644 index 8eef612e0f3..00000000000 --- a/comms/scmxx/patches/patch-src_charsets_ucs4_dec_c +++ /dev/null @@ -1,14 +0,0 @@ -$OpenBSD: patch-src_charsets_ucs4_dec_c,v 1.1 2005/07/26 17:00:51 fgsch Exp $ ---- src/charsets/ucs4_dec.c.orig Tue Jul 26 01:40:42 2005 -+++ src/charsets/ucs4_dec.c Tue Jul 26 01:41:13 2005 -@@ -26,6 +26,10 @@ - #define MB_LEN_MAX 6 - #endif - -+#ifndef UINT16_MAX -+#define UINT16_MAX USHRT_MAX -+#endif -+ - static - size_t replace_char_escape (char **inbuf, size_t *inbytesleft, - char **outbuf, size_t *outbytesleft) diff --git a/comms/scmxx/patches/patch-src_common_h b/comms/scmxx/patches/patch-src_common_h deleted file mode 100644 index a2b94adeece..00000000000 --- a/comms/scmxx/patches/patch-src_common_h +++ /dev/null @@ -1,16 +0,0 @@ -$OpenBSD: patch-src_common_h,v 1.1 2021/02/26 16:51:40 tb Exp $ - -Fix build with -fno-common - -Index: src/common.h ---- src/common.h.orig -+++ src/common.h -@@ -17,7 +17,7 @@ - - #include - --int VERBOSE_LEVEL; -+extern int VERBOSE_LEVEL; - #define VERBOSE_LEVEL_ERROR 0 - #define VERBOSE_LEVEL_WARNING 1 - #define VERBOSE_LEVEL_NOTICE 2 diff --git a/comms/scmxx/patches/patch-src_scmxx_c b/comms/scmxx/patches/patch-src_scmxx_c deleted file mode 100644 index ea667920bdf..00000000000 --- a/comms/scmxx/patches/patch-src_scmxx_c +++ /dev/null @@ -1,16 +0,0 @@ -$OpenBSD: patch-src_scmxx_c,v 1.1 2021/02/26 16:51:40 tb Exp $ - -Fix build with -fno-common - -Index: src/scmxx.c ---- src/scmxx.c.orig -+++ src/scmxx.c -@@ -20,6 +20,8 @@ - #include - #include - -+int VERBOSE_LEVEL; -+ - int main (int argc, char** argv) { - char* supported_phones[] = { - "S25", diff --git a/comms/scmxx/patches/patch-src_smspdu_smspdu_enc_c b/comms/scmxx/patches/patch-src_smspdu_smspdu_enc_c deleted file mode 100644 index 4f01b272a8b..00000000000 --- a/comms/scmxx/patches/patch-src_smspdu_smspdu_enc_c +++ /dev/null @@ -1,14 +0,0 @@ -$OpenBSD: patch-src_smspdu_smspdu_enc_c,v 1.1 2021/02/26 16:51:40 tb Exp $ - -Index: src/smspdu/smspdu_enc.c ---- src/smspdu/smspdu_enc.c.orig -+++ src/smspdu/smspdu_enc.c -@@ -84,7 +84,7 @@ char* sms_pdu_create_submit_frame (char* number, - sms_number_set(&da,numtype(number),number); - temp = sms_number_get(&da); - if (temp == NULL || strcmp(temp,number) != 0) { -- fprintf(stderr,_("%s: sms number cannot have more than %d digits.\n"),_("Error"),sizeof(da.digits)-1); -+ fprintf(stderr,_("%s: sms number cannot have more than %zd digits.\n"),_("Error"),sizeof(da.digits)-1); - return NULL; - } - mem_realloc(temp,0); diff --git a/comms/scmxx/patches/patch-src_smspdu_smsud_enc_c b/comms/scmxx/patches/patch-src_smspdu_smsud_enc_c deleted file mode 100644 index 4a395a85120..00000000000 --- a/comms/scmxx/patches/patch-src_smspdu_smsud_enc_c +++ /dev/null @@ -1,38 +0,0 @@ -$OpenBSD: patch-src_smspdu_smsud_enc_c,v 1.2 2021/02/26 16:51:40 tb Exp $ - -Index: src/smspdu/smsud_enc.c ---- src/smspdu/smsud_enc.c.orig -+++ src/smspdu/smsud_enc.c -@@ -21,7 +21,12 @@ - #include - #include - #include -+#include - -+#ifndef UINT16_MAX -+#define UINT16_MAX USHRT_MAX -+#endif -+ - static - uint16_t sms_new_sequence_id () { - /* this does not have to be good random (linear would be ok) -@@ -150,7 +155,7 @@ char* sms_data_ucs2_encode (struct sms_pdu_ud_header** - if (headersize) sms_data_insert_header(header,retval+2); - memcpy(retval+2+strlen(retval+2),tmp,strlen(tmp)); - mem_realloc(tmp,3); -- sprintf(tmp,"%02X",strlen(retval+2)/2); -+ sprintf(tmp,"%02zX",strlen(retval+2)/2); - memcpy(retval,tmp,2); - mem_realloc(tmp,0); - -@@ -215,8 +220,8 @@ char** sms_data_encode (enum sms_encoding charset, - } - fprintf(stderr,"%s: ",_("Notice")); - fprintf(stderr, -- ngettext("This message has %d character", -- "This message has %d characters", -+ ngettext("This message has %zd character", -+ "This message has %zd characters", - ucs4len(input)), - ucs4len(input)); - fprintf(stderr,"%s"," "); diff --git a/comms/scmxx/pkg/PLIST b/comms/scmxx/pkg/PLIST index 4bbe65751fb..6ff7a576ec2 100644 --- a/comms/scmxx/pkg/PLIST +++ b/comms/scmxx/pkg/PLIST @@ -1,5 +1,8 @@ -@comment $OpenBSD: PLIST,v 1.4 2010/05/21 14:13:22 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.5 2021/02/26 21:09:58 naddy Exp $ +@bin bin/adr2vcf +@bin bin/apoconv @bin bin/scmxx +@bin bin/smi @comment man/de/ @comment man/de/man1/ @comment @man man/de/man1/scmxx.1 @@ -11,9 +14,12 @@ @comment man/ru/man1/ @comment @man man/ru/man1/scmxx.1 share/doc/scmxx/ +share/doc/scmxx/adr.txt +share/doc/scmxx/apo.txt share/doc/scmxx/doc_sources.txt share/doc/scmxx/gsm0338.txt share/doc/scmxx/gsmcharset.txt +share/doc/scmxx/smi.txt share/examples/scmxx/ share/examples/scmxx/sms.txt share/examples/scmxx/vCalendar.vcs