From owner-svn-ports-all@FreeBSD.ORG  Wed Apr 23 13:37:59 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 803C4739;
 Wed, 23 Apr 2014 13:37:59 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6C96C176D;
 Wed, 23 Apr 2014 13:37:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3NDbxRO050081;
 Wed, 23 Apr 2014 13:37:59 GMT (envelope-from danfe@svn.freebsd.org)
Received: (from danfe@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3NDbxq3050079;
 Wed, 23 Apr 2014 13:37:59 GMT (envelope-from danfe@svn.freebsd.org)
Message-Id: <201404231337.s3NDbxq3050079@svn.freebsd.org>
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Wed, 23 Apr 2014 13:37:59 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r351939 - in head/x11/decurs: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Apr 2014 13:37:59 -0000

Author: danfe
Date: Wed Apr 23 13:37:58 2014
New Revision: 351939
URL: http://svnweb.freebsd.org/changeset/ports/351939
QAT: https://qat.redports.org/buildarchive/r351939/

Log:
  - Define LICENSE (GPLv2), reword COMMENT line
  - Take maintainership, undeprecate, and stagify
  - Unbreak on !i386

Added:
  head/x11/decurs/files/patch-src-cppstring.cc   (contents, props changed)
Modified:
  head/x11/decurs/Makefile

Modified: head/x11/decurs/Makefile
==============================================================================
--- head/x11/decurs/Makefile	Wed Apr 23 13:36:36 2014	(r351938)
+++ head/x11/decurs/Makefile	Wed Apr 23 13:37:58 2014	(r351939)
@@ -8,39 +8,31 @@ CATEGORIES=	x11
 MASTER_SITES=	http://freebsd.nsu.ru/distfiles/ \
 		#http://varg.dyndns.org/psi/files/
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Lets you edit your X11 mouse cursors
+MAINTAINER=	danfe@FreeBSD.org
+COMMENT=	Simple X11 mouse cursor editor
 
-LIB_DEPENDS=	libgtkmm-2.0.6.so:${PORTSDIR}/x11-toolkits/gtkmm20
+LICENSE=	GPLv2
 
-DEPRECATED=	Abandonware, not staged
-EXPIRATION_DATE=	2014-04-24
+LIB_DEPENDS=	libgtkmm-2.0.so:${PORTSDIR}/x11-toolkits/gtkmm20
 
+USES=		dos2unix pkgconfig
+DOS2UNIX_FILES=	src/cppstring.cc
 USE_XORG=	x11
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
-USES=		pkgconfig
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} != "i386"
-BROKEN=		Does not compile on !i386
-.endif
 
 post-patch:
 	@${SED} -e 's:%%PREFIX%%:${PREFIX}:g' \
 		${FILESDIR}/decurs.exec > ${WRKSRC}/decurs.exec
-# Hacks for contemporary GCC
-	@${REINPLACE_CMD} -e 's/CppString \&str/const &/' \
-		${WRKSRC}/src/cppstring.cc ${WRKSRC}/src/cppstring.hh
 	@${REINPLACE_CMD} -E 's/^\/\/ friend// ; \
-		s/([^:])ostream/\1std::ostream/g' ${WRKSRC}/src/cppstring.hh
+		s/([^:])ostream/\1std::ostream/g ; \
+		s/CppString \&str/const &/' ${WRKSRC}/src/cppstring.hh
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/decurs ${PREFIX}/bin/decurs.bin
-	${INSTALL_SCRIPT} ${WRKSRC}/decurs.exec ${PREFIX}/bin/decurs
-	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/fonts/*.bdf ${DATADIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/src/decurs \
+		${STAGEDIR}${PREFIX}/bin/decurs.bin
+	${INSTALL_SCRIPT} ${WRKSRC}/decurs.exec ${STAGEDIR}${PREFIX}/bin/decurs
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/fonts/*.bdf ${STAGEDIR}${DATADIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Added: head/x11/decurs/files/patch-src-cppstring.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11/decurs/files/patch-src-cppstring.cc	Wed Apr 23 13:37:58 2014	(r351939)
@@ -0,0 +1,35 @@
+--- src/cppstring.cc.orig	2003-05-01 07:42:11 +0800
++++ src/cppstring.cc
+@@ -7,7 +7,7 @@
+ // #include <except.h>
+ #define DEF_BUFFER_SIZE     512
+ #define CPPSTRING_ERROR(obj,msg,retval) {obj<<"*** ERROR *** : "<<msg<<std::endl;return retval;}
+-std::ostream& operator<<(std::ostream &cou, CppString &str)
++std::ostream& operator<<(std::ostream &cou, const CppString &str)
+ {
+ 	return (cou << str.our_string);
+ }
+@@ -25,7 +25,7 @@ CppString::~CppString()
+ {
+ 	Clean();
+ }
+-CppString::CppString(CppString &str) : our_string(0)
++CppString::CppString(const CppString &str) : our_string(0)
+ {
+ 	Clean();
+ 	(*this)=str.c_str();
+@@ -411,10 +411,12 @@ bool CppString::Contains(char ch) const
+ CppString& CppString::format(const char *fstr, ...)
+ {
+ 	char *buffer=new char[0x1000]; // 4096
+-	char *args=(char*)&fstr+sizeof(fstr);
+-	vsprintf(buffer,fstr,args);
++	va_list args;
++	va_start(args,fstr);
++	vsnprintf(buffer,sizeof(buffer),fstr,args);
+ 	(*this)=buffer;
+ 	delete[]buffer;
++	va_end(args);
+ 	return *this;
+ }
+ // #include <iostream.h>