11 files changed, 113 insertions, 21 deletions

diff --git a/comms/scmxx/Makefile b/comms/scmxx/Makefile
index d1d7ab2abd52..c7867eabebca 100644
--- a/comms/scmxx/Makefile
+++ b/comms/scmxx/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	scmxx
-PORTVERSION=	0.7.5
+PORTVERSION=	0.8.0
 CATEGORIES=	comms
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/comms/scmxx/distinfo b/comms/scmxx/distinfo
index 5852f18fb9f0..1cb5f66a283f 100644
--- a/comms/scmxx/distinfo
+++ b/comms/scmxx/distinfo
@@ -1,2 +1,2 @@
-MD5 (scmxx-0.7.5.tar.bz2) = 6e2a770a1234f0e5fd7703c5ff96dc69
-SIZE (scmxx-0.7.5.tar.bz2) = 165440
+MD5 (scmxx-0.8.0.tar.bz2) = 21de1f98864e296da2cb6b424112361c
+SIZE (scmxx-0.8.0.tar.bz2) = 212558
diff --git a/comms/scmxx/files/patch-docs_Makefile.in b/comms/scmxx/files/patch-docs_Makefile.in
new file mode 100644
index 000000000000..b52dc49efffe
--- /dev/null
+++ b/comms/scmxx/files/patch-docs_Makefile.in
@@ -0,0 +1,20 @@
+
+$FreeBSD$
+
+--- docs/Makefile.in.orig
++++ docs/Makefile.in
+@@ -66,12 +66,12 @@
+ .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/files/patch-po_Makefile.in b/comms/scmxx/files/patch-po_Makefile.in
new file mode 100644
index 000000000000..45824e090701
--- /dev/null
+++ b/comms/scmxx/files/patch-po_Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- po/Makefile.in.orig
++++ po/Makefile.in
+@@ -67,7 +67,7 @@
+ .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/files/patch-src-charsets_ucs4_dec.c b/comms/scmxx/files/patch-src-charsets_ucs4_dec.c
new file mode 100644
index 000000000000..5f767588678f
--- /dev/null
+++ b/comms/scmxx/files/patch-src-charsets_ucs4_dec.c
@@ -0,0 +1,13 @@
+--- src/charsets/ucs4_dec.c.orig	Sat Jul  2 01:42:09 2005
++++ src/charsets/ucs4_dec.c	Thu Jul 14 17:49:12 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/files/patch-src-helper_str.c b/comms/scmxx/files/patch-src-helper_str.c
new file mode 100644
index 000000000000..fc836ec4167c
--- /dev/null
+++ b/comms/scmxx/files/patch-src-helper_str.c
@@ -0,0 +1,10 @@
+--- src/helper/str.c.orig	Thu Jul 14 10:37:13 2005
++++ src/helper/str.c	Thu Jul 14 17:52:39 2005
+@@ -12,6 +12,7 @@
+ #include "helper.h"
+ #include <string.h>
+ #include <stdlib.h>
++#include <sys/types.h>
+ 
+ char* strn_dup (const char* input, size_t insize) {
+   void* retval;
diff --git a/comms/scmxx/files/patch-src-smspdu-smsud_enc.c b/comms/scmxx/files/patch-src-smspdu-smsud_enc.c
new file mode 100644
index 000000000000..01fc064129f8
--- /dev/null
+++ b/comms/scmxx/files/patch-src-smspdu-smsud_enc.c
@@ -0,0 +1,14 @@
+--- src/smspdu/smsud_enc.c.orig	Fri Jul  8 12:26:13 2005
++++ src/smspdu/smsud_enc.c	Thu Jul 14 18:00:19 2005
+@@ -22,6 +22,11 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ 
++#include <limits.h>
++#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)
diff --git a/comms/scmxx/files/patch-src_Makefile.in b/comms/scmxx/files/patch-src_Makefile.in
new file mode 100644
index 000000000000..c6c1acc717bd
--- /dev/null
+++ b/comms/scmxx/files/patch-src_Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src/Makefile.in.orig
++++ src/Makefile.in
+@@ -89,7 +89,7 @@
+ .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/files/patch-src_charsets_ucs4__dec.c b/comms/scmxx/files/patch-src_charsets_ucs4__dec.c
deleted file mode 100644
index 0c897d4af856..000000000000
--- a/comms/scmxx/files/patch-src_charsets_ucs4__dec.c
+++ /dev/null
@@ -1,18 +0,0 @@
-
-$FreeBSD$
-
---- src/charsets/ucs4_dec.c.orig
-+++ src/charsets/ucs4_dec.c
-@@ -21,6 +21,12 @@
- #include <errno.h>
- #include <iconv.h>
- 
-+#include <sys/param.h>
-+#if __FreeBSD_version < 500000
-+#include <limits.h>
-+#define UINT16_MAX USHRT_MAX
-+#endif
-+
- size_t replace_char_escape (char **inbuf, size_t *inbytesleft,
-                             char **outbuf, size_t *outbytesleft)
- {
diff --git a/comms/scmxx/files/patch-src_pinfile.c b/comms/scmxx/files/patch-src_pinfile.c
new file mode 100644
index 000000000000..6a48a2dfbe97
--- /dev/null
+++ b/comms/scmxx/files/patch-src_pinfile.c
@@ -0,0 +1,23 @@
+
+$FreeBSD$
+
+--- src/pinfile.c.orig
++++ src/pinfile.c
+@@ -21,6 +21,17 @@
+ #include <limits.h>
+ #include <ctype.h>
+ 
++char* strndup(const char *str, size_t len) {
++  size_t copy_len=(strlen (str) > len) ? strlen(str): len;
++  char *new = (char *) malloc (copy_len + 1);
++
++  if (new == NULL)
++    return NULL;
++
++  new[copy_len] = '\0';
++  return (char *) memcpy (new, str, copy_len);
++}
++
+ char* pinfile_get_data (char* filename) {
+   int fd = open(filename,O_RDONLY);
+   struct stat fdstat;
diff --git a/comms/scmxx/pkg-plist b/comms/scmxx/pkg-plist
index c18520cc3bfc..be67096f9803 100644
--- a/comms/scmxx/pkg-plist
+++ b/comms/scmxx/pkg-plist
@@ -1,9 +1,11 @@
 @comment $FreeBSD$
 bin/scmxx
 share/locale/de/LC_MESSAGES/scmxx.mo
+share/locale/fr/LC_MESSAGES/scmxx.mo
 share/locale/it/LC_MESSAGES/scmxx.mo
 share/locale/ru/LC_MESSAGES/scmxx.mo
 %%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README_WIN32.txt
 %%PORTDOCS%%%%DOCSDIR%%/gsmcharset.txt
 %%PORTDOCS%%%%DOCSDIR%%/gsm0338.txt
 %%PORTDOCS%%%%DOCSDIR%%/doc_sources.txt