svn commit: r334968 - in head/print/xmbibtex: . files

[William Grzybowski]

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 <tkato432 yahoo.com>

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 at 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 <bsd.port.mk>

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 <iostream.h>
+-#include <fstream.h>
+-#include <string.h>
++#include <iostream>
++#include <fstream>
++#include <cstring>
+ #include <X11/cursorfont.h>
+ #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;
+   }