From e35aed3bb4da80140de040b2e9ff64a97041e586 Mon Sep 17 00:00:00 2001 From: Martin Wilke Date: Mon, 27 Nov 2006 13:39:47 +0000 Subject: [PATCH] - Respect X11BASE PR: ports/105878 Submitted by: trasz --- x11-wm/sapphire/Makefile | 1 + x11-wm/sapphire/pkg-plist | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/x11-wm/sapphire/Makefile b/x11-wm/sapphire/Makefile index 12021295427d..60727ec6fa60 100644 --- a/x11-wm/sapphire/Makefile +++ b/x11-wm/sapphire/Makefile @@ -28,6 +28,7 @@ post-patch: ${REINPLACE_CMD} "s|/usr/local|${PREFIX}|g" ${WRKSRC}/${ii} .endfor ${CP} ${WRKSRC}/data.inst ${WRKSRC}/sapphire.inst + ${REINPLACE_CMD} "s|/usr/X11R6|${X11BASE}|g" ${WRKSRC}/configure post-install: ${INSTALL_SCRIPT} ${WRKSRC}/sapphire.inst ${PREFIX}/bin diff --git a/x11-wm/sapphire/pkg-plist b/x11-wm/sapphire/pkg-plist index 6c0497f96d3d..a1f9c0b54249 100644 --- a/x11-wm/sapphire/pkg-plist +++ b/x11-wm/sapphire/pkg-plist @@ -1,14 +1,14 @@ bin/sapphire bin/sapphire.inst -share/doc/sapphire/README -share/sapphire/menu/default -share/sapphire/menu/default.orig -share/sapphire/themes/darkblue.theme -share/sapphire/themes/default.theme -share/sapphire/themes/gray.theme -share/sapphire/themes/rose.theme -share/sapphire/themes/slate.theme -@dirrm share/doc/sapphire -@dirrm share/sapphire/menu -@dirrm share/sapphire/themes -@dirrm share/sapphire +%%DOCSDIR%%/README +%%DATADIR%%/menu/default +%%DATADIR%%/menu/default.orig +%%DATADIR%%/themes/darkblue.theme +%%DATADIR%%/themes/default.theme +%%DATADIR%%/themes/gray.theme +%%DATADIR%%/themes/rose.theme +%%DATADIR%%/themes/slate.theme +@dirrm %%DOCSDIR%% +@dirrm %%DATADIR%%/menu +@dirrm %%DATADIR%%/themes +@dirrm %%DATADIR%%