From owner-svn-ports-head@FreeBSD.ORG Tue Nov 26 20:35:38 2013 Return-Path: Delivered-To: svn-ports-head@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 825981F2; Tue, 26 Nov 2013 20:35:38 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 71D2F2B8F; Tue, 26 Nov 2013 20:35:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAQKZcK2028099; Tue, 26 Nov 2013 20:35:38 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAQKZb3m028096; Tue, 26 Nov 2013 20:35:37 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201311262035.rAQKZb3m028096@svn.freebsd.org> From: William Grzybowski Date: Tue, 26 Nov 2013 20:35:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334968 - in head/print/xmbibtex: . 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-head@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Nov 2013 20:35:38 -0000 Author: wg Date: Tue Nov 26 20:35:37 2013 New Revision: 334968 URL: http://svnweb.freebsd.org/changeset/ports/334968 Log: print/xmbibtex: fix build on current PR: ports/184226 Submitted by: KATO Tsuguru Added: head/print/xmbibtex/files/patch-print_cb.cc (contents, props changed) Modified: head/print/xmbibtex/Makefile head/print/xmbibtex/files/patch-aa Modified: head/print/xmbibtex/Makefile ============================================================================== --- head/print/xmbibtex/Makefile Tue Nov 26 20:35:14 2013 (r334967) +++ head/print/xmbibtex/Makefile Tue Nov 26 20:35:37 2013 (r334968) @@ -5,8 +5,7 @@ PORTNAME= xmbibtex PORTVERSION= 1.7 PORTREVISION= 3 CATEGORIES= print databases -MASTER_SITES= ${MASTER_SITE_SUNSITE} -MASTER_SITE_SUBDIR= apps/tex +MASTER_SITES= SUNSITE/apps/tex MAINTAINER= ports@FreeBSD.org COMMENT= Reference manager based on the BibTeX file format @@ -19,9 +18,4 @@ NO_INSTALL_MANPAGES= yes PLIST_FILES= bin/xmbibtex lib/X11/app-defaults/XmBibTeX -NO_STAGE= yes -post-configure: - @${REINPLACE_CMD} -e 's,(CCLINK,(CXXLINK, ; s,/usr/local,${PREFIX},' \ - ${WRKSRC}/Makefile - .include Modified: head/print/xmbibtex/files/patch-aa ============================================================================== --- head/print/xmbibtex/files/patch-aa Tue Nov 26 20:35:14 2013 (r334967) +++ head/print/xmbibtex/files/patch-aa Tue Nov 26 20:35:37 2013 (r334968) @@ -1,11 +1,11 @@ --- Imakefile.orig Sun Oct 19 02:50:16 1997 +++ Imakefile Sun Nov 12 20:17:11 2000 -@@ -1,11 +1,11 @@ --SYS_LIBRARIES = -lXm -lXt -lSM -lICE -lX11 -lXpm -lXext -lXmu +@@ -1,11 +1,12 @@ + SYS_LIBRARIES = -lXm -lXt -lSM -lICE -lX11 -lXpm -lXext -lXmu -CC = g++ -INCLUDES = -I/usr/include/g++ -+SYS_LIBRARIES = ${MOTIFLIB} -lXt -lSM -lICE -lX11 -lXpm -lXext -lXmu +CC = $(CXX) ++CCLINK = $(CXXLINK) +XCOMM INCLUDES = -I/usr/include/g++ -BINDIR = /usr/local/bin Added: head/print/xmbibtex/files/patch-print_cb.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/print/xmbibtex/files/patch-print_cb.cc Tue Nov 26 20:35:37 2013 (r334968) @@ -0,0 +1,45 @@ +--- print_cb.cc.orig ++++ print_cb.cc +@@ -2,9 +2,9 @@ + /* Print LaTeX Module */ + /* Last change 18.08.1996 */ + +-#include +-#include +-#include ++#include ++#include ++#include + #include + #include "globals.h" + +@@ -13,18 +13,18 @@ + char *filename; + char *db, *pdb; + unsigned long n; +- ofstream out; ++ std::ofstream out; + Cursor uhr, pfeil; + + XmFileSelectionBoxCallbackStruct *cbs= + (XmFileSelectionBoxCallbackStruct *) call_data; + + if (!XmStringGetLtoR(cbs->value, XmFONTLIST_DEFAULT_TAG, &filename)) { +- cout << "Internal error pasting filename! \n"; ++ std::cout << "Internal error pasting filename! \n"; + return; + } + if (!*filename) { +- cout << "No file selected! \n"; ++ std::cout << "No file selected! \n"; + XtFree(filename); + return; + } +@@ -37,7 +37,7 @@ + + out.open(filename); + if(!out) { +- cout << "Cannot open LaTeX file for output! \n"; ++ std::cout << "Cannot open LaTeX file for output! \n"; + return; + }