- Update to 0.7.4:

  - Added German and Russian translations
  - Configuration file changes

PR:		ports/72735
Submitted by:	Janos Mohacsi (maintainer)

While I'm here:
- Move examples installation out of NOPORTDOCS check
- Add CONFIGURE_TARGET to silense configure warning
- Minor Makefile tweaks

4 files changed, 25 insertions, 22 deletions

diff --git a/comms/scmxx/Makefile b/comms/scmxx/Makefile
index 3ffb8ca65ed..32730c8303d 100644
--- a/comms/scmxx/Makefile
+++ b/comms/scmxx/Makefile
@@ -6,35 +6,36 @@
 #
 
 PORTNAME=	scmxx
-PORTVERSION=	0.7.3
+PORTVERSION=	0.7.4
 CATEGORIES=	comms
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	scmxx
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	janos.mohacsi@bsd.hu
 COMMENT=	Data exchange utility for Siemens mobile phones
 
 USE_BZIP2=	yes
+USE_GMAKE=	yes
 USE_ICONV=	yes
+USE_GETTEXT=	yes
 USE_GETOPT_LONG=yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		CFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-USE_GMAKE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=		scmxx.1
 MANLANG=	"" ru de
+DOCS=		README docs/*.txt
+EXAMPLES=	sms.txt vCalendar.vcs vCard.vcf
 
-.ifndef(NOPORTDOCS)
 post-install:
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${DOCSDIR}
 	@${MKDIR} ${EXAMPLESDIR}
-.for file in sms.txt vCalendar.vcs vCard.vcf
-	${INSTALL_DATA} ${WRKSRC}/examples/${file} ${EXAMPLESDIR}
-.endfor
+	cd ${WRKSRC}/examples && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR}
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/comms/scmxx/distinfo b/comms/scmxx/distinfo
index 6cbe054d336..71f67753647 100644
--- a/comms/scmxx/distinfo
+++ b/comms/scmxx/distinfo
@@ -1,2 +1,2 @@
-MD5 (scmxx-0.7.3.tar.bz2) = b1f8172568985f6c95934816c6629b98
-SIZE (scmxx-0.7.3.tar.bz2) = 109384
+MD5 (scmxx-0.7.4.tar.bz2) = 3139f8ce4da47b684851fed208e6d41e
+SIZE (scmxx-0.7.4.tar.bz2) = 152086
diff --git a/comms/scmxx/files/patch-src_charsets_ucs4__dec.c b/comms/scmxx/files/patch-src_charsets_ucs4__dec.c
index 02e40fefdd9..0c897d4af85 100644
--- a/comms/scmxx/files/patch-src_charsets_ucs4__dec.c
+++ b/comms/scmxx/files/patch-src_charsets_ucs4__dec.c
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- src/charsets/ucs4_dec.c.orig	Thu Jul 22 18:16:40 2004
-+++ src/charsets/ucs4_dec.c	Thu Jul 22 18:20:04 2004
-@@ -19,6 +19,12 @@
+--- src/charsets/ucs4_dec.c.orig
++++ src/charsets/ucs4_dec.c
+@@ -21,6 +21,12 @@
  #include <errno.h>
  #include <iconv.h>
  
@@ -13,6 +13,6 @@ $FreeBSD$
 +#define UINT16_MAX USHRT_MAX
 +#endif
 +
- #include <config.h>
- #ifndef ICONV_CAST
- #  define ICONV_CAST char**
+ size_t replace_char_escape (char **inbuf, size_t *inbytesleft,
+                             char **outbuf, size_t *outbytesleft)
+ {
diff --git a/comms/scmxx/pkg-plist b/comms/scmxx/pkg-plist
index 32fa09fc9b9..2035be4e959 100644
--- a/comms/scmxx/pkg-plist
+++ b/comms/scmxx/pkg-plist
@@ -1,11 +1,13 @@
 @comment $FreeBSD$
 bin/scmxx
+share/locale/de/LC_MESSAGES/scmxx.mo
+share/locale/ru/LC_MESSAGES/scmxx.mo
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/gsmcharset.txt
 %%PORTDOCS%%%%DOCSDIR%%/gsm0338.txt
 %%PORTDOCS%%%%DOCSDIR%%/doc_sources.txt
-%%PORTDOCS%%%%EXAMPLESDIR%%/sms.txt
-%%PORTDOCS%%%%EXAMPLESDIR%%/vCalendar.vcs
-%%PORTDOCS%%%%EXAMPLESDIR%%/vCard.vcf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%EXAMPLESDIR%%/sms.txt
+%%EXAMPLESDIR%%/vCalendar.vcs
+%%EXAMPLESDIR%%/vCard.vcf
+@dirrm %%EXAMPLESDIR%%