avoid preprocessor hackery that turns out to be highly non-portable.

This commit is contained in:
espie 2004-01-04 21:32:18 +00:00
parent 815ec7eef2
commit 4828bb03fc
2 changed files with 23 additions and 1 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.22 2003/06/04 01:32:06 margarida Exp $
# $OpenBSD: Makefile,v 1.23 2004/01/04 21:32:18 espie Exp $
COMMENT= "PostScript and PDF previewer"
@ -25,7 +25,11 @@ NO_REGRESS= Yes
INSTALL_TARGET= install install.man install.doc
post-patch:
perl -pi.bak ${.CURDIR}/fixincludes ${WRKSRC}/source/*.[ch]
post-install:
${INSTALL_MAN} ${WRKSRC}/source/gv.0 ${PREFIX}/man/cat1
.include <bsd.port.mk>

18
print/gv/fixincludes Normal file
View File

@ -0,0 +1,18 @@
# $OpenBSD: fixincludes,v 1.1 2004/01/04 21:32:18 espie Exp $
# Copyright (c) 2004 Marc Espie <espie@openbsd.org>
#
# Permission to use, copy, modify, and distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
# copyright notice and this permission notice appear in all copies.
#
# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
s/\#\s*include\s+INC_X11\((.*?)\)/\#include \<X11\/$1\>/;
s/\#\s*include\s+INC_XMU\((.*?)\)/\#include \<X11\/Xmu\/$1\>/;
s/\#\s*include\s+INC_XAW\((.*?)\)/\#include \<X11\/Xaw3d\/$1\>/;