- Move the project over to GitHub, together with our patches

- Set EXTRACT_SUFX to prevent clobbering of the original distfile
- Relinquish control: should be stable enough now to fly solo

x11/decurs/Makefile

@@ -5,28 +5,28 @@ PORTNAME=	decurs
 PORTVERSION=	0.55.1
 PORTREVISION=	12
 CATEGORIES=	x11
-MASTER_SITES=	http://freebsd.nsu.ru/distfiles/ \
-		#http://varg.dyndns.org/psi/files/
+EXTRACT_SUFX=	_.tar.gz	# prevent clobbering of the original distfile
 
-MAINTAINER=	danfe@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple X11 mouse cursor editor
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libgtkmm-2.0.so:${PORTSDIR}/x11-toolkits/gtkmm20
 
-USES=		dos2unix pkgconfig
-DOS2UNIX_FILES=	src/cppstring.cc
+USE_GITHUB=	yes
+GH_ACCOUNT=	danfe
+GH_TAGNAME=	${GH_COMMIT}
+GH_COMMIT=	10c5691
+
+USES=		pkgconfig
+GNU_CONFIGURE=	yes
 USE_XORG=	x11
 USE_GNOME=	gtk20
-GNU_CONFIGURE=	yes
 
 post-patch:
-	@${SED} -e 's:%%PREFIX%%:${PREFIX}:g' \
+	@${SED} -e 's:%%PREFIX%%:${PREFIX}:' \
 		${FILESDIR}/decurs.exec > ${WRKSRC}/decurs.exec
-	@${REINPLACE_CMD} -E 's/^\/\/ friend// ; \
-		s/([^:])ostream/\1std::ostream/g ; \
-		s/CppString \&str/const &/' ${WRKSRC}/src/cppstring.hh
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/decurs \

x11/decurs/distinfo

@@ -1,2 +1,2 @@
-SHA256 (decurs-0.55.1.tar.gz) = 28524b864f64c36b0b14759153a5d5409f17ff9e698af3c60986ffdd07092f5f
-SIZE (decurs-0.55.1.tar.gz) = 155218
+SHA256 (decurs-0.55.1_.tar.gz) = d306956b8df6d65c75f1d96e370c8a5b16f1c6966c3255fff8e332286406f15d
+SIZE (decurs-0.55.1_.tar.gz) = 159160

x11/decurs/files/patch-src-cppstring.cc

@@ -1,35 +0,0 @@
---- 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>

x11/decurs/pkg-descr

@@ -1,3 +1,5 @@
 DeCurs is a GTK+ based program that lets you edit you X11 mouse cursors.
 It reads them from BDF-formatted font files.  Now don't worry, it comes
 with one handy.
+
+WWW: https://github.com/danfe/decurs