From 23316dca128ecc8c5b2d1ee9d01ec00d87bd37e7 Mon Sep 17 00:00:00 2001
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Wed, 4 Jul 2007 13:56:47 +0000
Subject: [PATCH] - Fix the build with modern GCC and unbreak [1] - Teach to
 respect PREFIX - Consistently spell application name in Makefile and
 pkg-descr

Reported by:	pointyhat (logs) [1]
---
 print/xmbibtex/Makefile                    | 12 +++++------
 print/xmbibtex/files/patch-searchall_cb.cc | 23 ++++++++++++++++++++++
 print/xmbibtex/pkg-descr                   |  2 +-
 3 files changed, 29 insertions(+), 8 deletions(-)
 create mode 100644 print/xmbibtex/files/patch-searchall_cb.cc

diff --git a/print/xmbibtex/Makefile b/print/xmbibtex/Makefile
index 625aab394bd5..532e2dc30fb1 100644
--- a/print/xmbibtex/Makefile
+++ b/print/xmbibtex/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	xmbibtex
+# New ports collection makefile for:	XmBibTeX
 # Date created:				06 Nov 1997
 # Whom:					Thomas Gellekum <tg@FreeBSD.org>
 #
@@ -23,10 +23,8 @@ NO_INSTALL_MANPAGES=	yes
 
 PLIST_FILES=	bin/xmbibtex lib/X11/app-defaults/XmBibTeX
 
-.include <bsd.port.pre.mk>
+post-configure:
+	@${REINPLACE_CMD} -e 's,(CCLINK,(CXXLINK, ; s,/usr/local,${PREFIX},' \
+		${WRKSRC}/Makefile
 
-.if ${OSVERSION} >= 700042
-BROKEN=		Does not compile with GCC 4.2
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/print/xmbibtex/files/patch-searchall_cb.cc b/print/xmbibtex/files/patch-searchall_cb.cc
new file mode 100644
index 000000000000..ecbf0f452704
--- /dev/null
+++ b/print/xmbibtex/files/patch-searchall_cb.cc
@@ -0,0 +1,23 @@
+--- searchall_cb.cc.orig	Sun May  4 17:21:26 1997
++++ searchall_cb.cc	Thu Jun 14 18:01:36 2007
+@@ -4,6 +4,8 @@
+ 
+ #include <Xm/List.h>
+ #include <X11/cursorfont.h>
++#include <assert.h>
++#include <inttypes.h>
+ #include <stdio.h>
+ #include "globals.h"
+ 
+@@ -26,7 +28,10 @@
+   gefunden   = new unsigned long[b.last+1];
+   gefunden[0]= 0;
+   ref        = new char[100];
+-  cis=(short)client_data;
++
++  /* We're about to convert void * to short: fasten some seatbelts. */
++  assert(((intptr_t)client_data >> 16) == 0);
++  cis=(short)((intptr_t)client_data & 0xFFFF);
+ 
+   switch((int)b.d->id) {
+   case 1:  // .... and;
diff --git a/print/xmbibtex/pkg-descr b/print/xmbibtex/pkg-descr
index 6e2f74d0a2ad..10fc4c39fc67 100644
--- a/print/xmbibtex/pkg-descr
+++ b/print/xmbibtex/pkg-descr
@@ -1,4 +1,4 @@
-xmbibtex is a Motif (LessTif) reference manager based on the BibTeX
+XmBibTeX is a Motif (LessTif) reference manager based on the BibTeX
 file format. It allows to add, delete, and edit references. The
 references can be saved in the BibTeX file format and also written on
 a LaTeX file that can be printed using LaTeX and BibTeX. References