cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't hardcode /usr/local and don't probe paths that don't exist on OpenBSD

Browse Source 
ok steven@, kili@, landry@, sthen@
This commit is contained in:
naddy 2009-04-04 14:45:48 +00:00
parent 06032b1215
commit e71b604a5c
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
textproc/xpdf/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.62 2008/04/25 19:19:05 deanna Exp $ # $OpenBSD: Makefile,v 1.63 2009/04/04 14:45:48 naddy Exp $
COMMENT-main= PDF viewer for X11 COMMENT-main= PDF viewer for X11
COMMENT-utils= PDF conversion tools COMMENT-utils= PDF conversion tools
DISTNAME= xpdf-3.02 DISTNAME= xpdf-3.02
PKGNAME-main= xpdf-3.02pl2p4 PKGNAME-main= xpdf-3.02pl2p5
PKGNAME-utils= xpdf-utils-3.02pl2p1 PKGNAME-utils= xpdf-utils-3.02pl2p2
CATEGORIES= textproc x11 CATEGORIES= textproc x11
MASTER_SITES= ftp://ftp.foolabs.com/pub/xpdf/ \ MASTER_SITES= ftp://ftp.foolabs.com/pub/xpdf/ \
@ -32,7 +32,7 @@ CONFIGURE_ARGS+= --enable-multithreaded \
--without-Sgm-library \ --without-Sgm-library \
--without-libpaper-library --without-libpaper-library
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include/freetype2 -I${X11BASE}/include -I${LOCALBASE}/include" \ CONFIGURE_ENV= CPPFLAGS='-I${X11BASE}/include/freetype2 -I${X11BASE}/include -I${LOCALBASE}/include -DLOCALBASE="\"${LOCALBASE}\""' \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib -lz" LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib -lz"
LIB_DEPENDS-utils= LIB_DEPENDS-utils=

16
textproc/xpdf/patches/patch-xpdf_GlobalParams_cc Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-xpdf_GlobalParams_cc,v 1.1 2009/04/04 14:45:48 naddy Exp $
--- xpdf/GlobalParams.cc.orig Fri Apr 3 19:30:57 2009
+++ xpdf/GlobalParams.cc Fri Apr 3 19:31:18 2009
@@ -110,11 +110,7 @@ static char *displayFontDirs[] = {
};
#else
static char *displayFontDirs[] = {
- "/usr/share/ghostscript/fonts",
- "/usr/local/share/ghostscript/fonts",
- "/usr/share/fonts/default/Type1",
- "/usr/share/fonts/default/ghostscript",
- "/usr/share/fonts/type1/gsfonts",
+ LOCALBASE "/share/ghostscript/fonts",
NULL
};
#endif