Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 23 Sep 2013 19:40:09 +0000 (UTC)
From:      Boris Samorodov <bsam@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r328032 - in head/devel/ddd: . files
Message-ID:  <201309231940.r8NJe9PD018703@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bsam
Date: Mon Sep 23 19:40:09 2013
New Revision: 328032
URL: http://svnweb.freebsd.org/changeset/ports/328032

Log:
  Fix build at 10.x.
  
  While here:
  . use stage phase;
  . use MKDIR macro instead of INSTALL -d one to create a directory;
  . unmute install command.
  
  PR:		ports/182315
  Submitted by:	Sergio Mangialardi <sergio@softshark.org> (maintainer)

Added:
  head/devel/ddd/files/patch-ddd-VSLDefList.C   (contents, props changed)
Modified:
  head/devel/ddd/Makefile
  head/devel/ddd/pkg-plist   (contents, props changed)

Modified: head/devel/ddd/Makefile
==============================================================================
--- head/devel/ddd/Makefile	Mon Sep 23 19:06:06 2013	(r328031)
+++ head/devel/ddd/Makefile	Mon Sep 23 19:40:09 2013	(r328032)
@@ -23,7 +23,6 @@ CONFIGURE_ARGS=	--with-motif-libraries="
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
-MAN1=		ddd.1
 DOCS=		AUTHORS INSTALL PROBLEMS README TIPS TODO \
 		doc/html/ddd.html doc/ddd-paper.ps \
 		doc/ddd-themes.pdf doc/ddd.pdf
@@ -39,7 +38,6 @@ LIBXMDIR!=	${ECHO_CMD} ${MOTIFLIB} | ${S
 LIBXMDIR=	${LOCALBASE}
 .endif
 
-NO_STAGE=	yes
 pre-patch:
 	@${RM} -fv ${WRKSRC}/ddd/ddd.info*
 	@${RM} -fv ${WRKSRC}/ddd/ddd-themes.info*
@@ -52,13 +50,11 @@ post-configure:
 	@${ECHO_CMD} "LIBXM = ${MOTIFLIB}" >> ${WRKSRC}/ddd/Makefile
 
 post-install:
-.if !defined(NOPORTDOCS)
-	@${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
 .endfor
-	@${GZIP_CMD} ${DOCSDIR}/*.ps
-.endif
+	${GZIP_CMD} ${STAGEDIR}${DOCSDIR}/*.ps
 
 check:
 	(cd ${WRKSRC} ; ${GMAKE} check)

Added: head/devel/ddd/files/patch-ddd-VSLDefList.C
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/ddd/files/patch-ddd-VSLDefList.C	Mon Sep 23 19:40:09 2013	(r328032)
@@ -0,0 +1,11 @@
+--- ddd/VSLDefList.C.orig	2013-09-23 10:38:30.000000000 +0200
++++ ddd/VSLDefList.C	2013-09-23 10:39:12.000000000 +0200
+@@ -60,7 +60,7 @@
+     {
+ 	std::ostringstream s;
+ 	s << *arg;
+-	VSLLib::eval_error("no suiting definition for " + f_name() + s);
++	VSLLib::eval_error("no suiting definition for " + f_name() + s.str().c_str());
+     }
+ 
+     return d ? d->eval(arg) : 0;

Modified: head/devel/ddd/pkg-plist
==============================================================================
--- head/devel/ddd/pkg-plist	Mon Sep 23 19:06:06 2013	(r328031)
+++ head/devel/ddd/pkg-plist	Mon Sep 23 19:40:09 2013	(r328032)
@@ -1,4 +1,5 @@
 bin/ddd
+man/man1/ddd.1.gz
 share/applications/ddd.desktop
 share/ddd-%%VERSION%%/COPYING
 share/ddd-%%VERSION%%/NEWS



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309231940.r8NJe9PD018703>