ports/50577: [patch] fix fetch and build for misc/pybliographer

Thu Apr 3 21:30:16 UTC 2003

>Number:         50577
>Category:       ports
>Synopsis:       [patch] fix fetch and build for misc/pybliographer
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Apr 03 13:30:12 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Mark Linimon
>Release:        FreeBSD-2.0
>Organization:
FreeBSD
>Environment:
System: FreeBSD lonesome.lonesome.com 4.7-STABLE FreeBSD 4.7-STABLE #0: Fri Nov 8 23:46:29 CST 2002 root at lonesome.lonesome.com:/usr/src/sys/compile/MULTIMEDIA i386
>Description:
	pybliographer is on the 'Request For Deletion' list.  I figured
	I would take a stab at fixing it.

	Note: the shar file below does not fix the plist yet.  Consider
	this initial submission a place-holder to keep the port in the
	tree.  It does, however, update the version and fix the build
>How-To-Repeat:
	make install
>Fix:
	The following shar file contains a unified diff for existing
	files, and two new patches to be installed under files/.
	(I'll be happy if someone tells me a better way to handle
	this combination of circumstances).

	Note, also, that the existing "files/patch-Makefile.in" is
	obsolete and needs to be cvs rm'd.

# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	diff.out
#	pybliographer/files/patch-bibtex::reverse.c
#	pybliographer/files/patch-configure
#
echo x - diff.out
sed 's/^X//' >diff.out << 'END-of-diff.out'
X--- pybliographer/Makefile.dist	Sat Dec  7 23:50:16 2002
X+++ pybliographer/Makefile	Thu Apr  3 15:05:35 2003
X@@ -2,19 +2,18 @@
X # Date created:		7 December 2000
X # Whom:	      		Johann Visagie <johann at egenetics.com>
X #
X-# $FreeBSD: ports/misc/pybliographer/Makefile,v 1.15 2002/12/02 00:27:36 kris Exp $
X+# $FreeBSD: ports/misc/pybliographer/Makefile,v 1.17 2003/02/20 18:46:31 knu Exp $
X #
X 
X PORTNAME=	pybliographer
X-PORTVERSION=	1.0.8
X+PORTVERSION=	1.0.11
X PORTREVISION=	1
X CATEGORIES=	misc python gnome
X MASTER_SITES=	${MASTER_SITE_GNOME}
X-MASTER_SITE_SUBDIR=	sources/pyblio/1.0
X+MASTER_SITE_SUBDIR=	sources/pybliographer/1.0
X 
X MAINTAINER=	ports at FreeBSD.org
X-
X-BROKEN=		"Needs GNU Recode c.5 or later"
X+COMMENT=	GUI and command-line tools for editing and searching bibliographic databases
X 
X BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-1.2/_gnomemodule.so:${PORTSDIR}/x11-toolkits/py-gnome \
X 		recode:${PORTSDIR}/converters/recode
X@@ -30,7 +29,7 @@
X CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
X 		LDFLAGS="-L${LOCALBASE}/lib" \
X 		Python="${PYTHON_CMD}"
X-CONFIGURE_ARGS=	--with-recode-prefix="${LOCALBASE}"
X+CONFIGURE_ARGS=	--with-recode_prefix="${LOCALBASE}"
X 
X pre-patch:
X 	@${REINPLACE_CMD} 's|-lpthread|${PTHREAD_LIBS}|g ; \
X--- pybliographer/distinfo.dist	Sun Jan 28 01:44:32 2001
X+++ pybliographer/distinfo	Tue Apr  1 17:46:13 2003
X@@ -1 +1 @@
X-MD5 (pybliographer-1.0.8.tar.gz) = 47377825cb4f6c5f87b541021fe264fa
X+MD5 (pybliographer-1.0.11.tar.gz) = a777fd404a5040622b73011d6c9218f4
END-of-diff.out
echo x - pybliographer/files/patch-bibtex::reverse.c
sed 's/^X//' >pybliographer/files/patch-bibtex::reverse.c << 'END-of-pybliographer/files/patch-bibtex::reverse.c'
X--- bibtex/reverse.c.dist	Tue Apr  1 19:22:52 2003
X+++ bibtex/reverse.c	Tue Apr  1 19:22:09 2003
X@@ -26,7 +26,7 @@
X #endif
X 
X #include <string.h>
X-#include <regex.h>
X+#include <gnuregex.h>
X 
X #ifdef HAVE_STDBOOL_H
X #include <stdbool.h>
END-of-pybliographer/files/patch-bibtex::reverse.c
echo x - pybliographer/files/patch-configure
sed 's/^X//' >pybliographer/files/patch-configure << 'END-of-pybliographer/files/patch-configure'
X--- configure.dist	Tue Apr  1 19:18:58 2003
X+++ configure	Tue Apr  1 19:19:26 2003
X@@ -4178,7 +4178,7 @@
X   rm -rf conftest*
X   
X     echo "$ac_t""no (cannot compile)" 1>&6
X-    { echo "configure: error: please install GNU Recode (version 3.5)" 1>&2; exit 1; } 
X+    { echo "configure: error: please install GNU Recode (version >= 3.5)" 1>&2; exit 1; } 
X   
X fi
X rm -f conftest*
X@@ -4257,7 +4257,7 @@
X   echo "$ac_t""no" 1>&6
X 
X     echo
X-    echo "Please check that your version of GNU Recode is 3.5"
X+    echo "Please check that your version of GNU Recode is >= 3.5"
X     echo "If you installed it as a package, check that"
X     echo
X     echo "            recode-devel"
X@@ -4316,8 +4316,8 @@
X 
X version=`${RECODE} --version | head -n 1 | cut -f 3 -d' '`
X 
X-if test ${version} != "3.5" ; then
X-  { echo "configure: error: Please check that your version of GNU Recode is 3.5" 1>&2; exit 1; }
X+if test ${version} >= "3.5" ; then
X+  { echo "configure: error: Please check that your version of GNU Recode is >= 3.5" 1>&2; exit 1; }
X fi
X 
X cat >> confdefs.h <<\EOF
END-of-pybliographer/files/patch-configure
exit

>Release-Note:
>Audit-Trail:
>Unformatted: