diff options
| author | dmcmahill <dmcmahill@pkgsrc.org> | 2005-03-01 22:55:26 +0000 |
|---|---|---|
| committer | dmcmahill <dmcmahill@pkgsrc.org> | 2005-03-01 22:55:26 +0000 |
| commit | 97bef8397a60bf0e7308e554094ac2ad6b90f7d2 (patch) | |
| tree | 7e603c38ed5e6bd811d9a11334d3baa80db5e94c /x11 | |
| parent | 6bdf53b08edb94fb7b9b212952c27920caabedd4 (diff) | |
| download | pkgsrc-97bef8397a60bf0e7308e554094ac2ad6b90f7d2.tar.gz | |
fix installation directory to not have .../X11/X11/Xaw3d but .../X11/Xaw3d on solaris
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/Xaw3d/Makefile | 12 | ||||
| -rw-r--r-- | x11/Xaw3d/distinfo | 4 | ||||
| -rw-r--r-- | x11/Xaw3d/patches/patch-aa | 4 |
3 files changed, 9 insertions, 11 deletions
diff --git a/x11/Xaw3d/Makefile b/x11/Xaw3d/Makefile index 91758f34392..f4c959c8d3a 100644 --- a/x11/Xaw3d/Makefile +++ b/x11/Xaw3d/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2005/02/23 04:09:51 minskim Exp $ +# $NetBSD: Makefile,v 1.41 2005/03/01 22:55:26 dmcmahill Exp $ # DISTNAME= Xaw3d-1.5E @@ -20,14 +20,12 @@ PLIST_SRC= ${WRKDIR}/PLIST-src .include "../../mk/bsd.prefs.mk" -.if !empty(X11BASE:M*openwin) #|| ${OPSYS} == "IRIX" -PLIST_SUBST+= INCDIR=include/X11/X11 -.else -PLIST_SUBST+= INCDIR=include/X11 -.endif - +.if empty(X11BASE:M*openwin) post-extract: @(cd ${WRKSRC}; ${LN} -s .. X11) +.endif + +PLIST_SUBST+= INCDIR=include/X11 post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/Xaw3d diff --git a/x11/Xaw3d/distinfo b/x11/Xaw3d/distinfo index b26a4fd512e..992b86da01f 100644 --- a/x11/Xaw3d/distinfo +++ b/x11/Xaw3d/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.6 2005/02/23 17:36:09 wiz Exp $ +$NetBSD: distinfo,v 1.7 2005/03/01 22:55:26 dmcmahill Exp $ SHA1 (Xaw3d-1.5E.tar.gz) = efc5b923feda52866c859c59a5b553cb675a69d1 RMD160 (Xaw3d-1.5E.tar.gz) = 086cbabaa45ce5c110815aea24eebcbb54613118 Size (Xaw3d-1.5E.tar.gz) = 309264 bytes -SHA1 (patch-aa) = cfd730a6fe81d42c6a89049c602647b344897a72 +SHA1 (patch-aa) = 1f9fbc5c21ea0658b95332e0fc951a407fc0e8a7 SHA1 (patch-ab) = 9bbe44041708b2d01b728638ac07e32addc01cff diff --git a/x11/Xaw3d/patches/patch-aa b/x11/Xaw3d/patches/patch-aa index f29dc6376c0..c3805add7e2 100644 --- a/x11/Xaw3d/patches/patch-aa +++ b/x11/Xaw3d/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.9 2005/02/18 15:54:48 wiz Exp $ +$NetBSD: patch-aa,v 1.10 2005/03/01 22:55:26 dmcmahill Exp $ --- Imakefile.orig 2003-03-08 15:55:18.000000000 +0100 +++ Imakefile @@ -16,7 +16,7 @@ $NetBSD: patch-aa,v 1.9 2005/02/18 15:54:48 wiz Exp $ #define LibName Xaw3d #define SoRev SOXAWREV +#ifdef SunArchitecture -+#define IncSubdir X11/Xaw3d ++#define IncSubdir Xaw3d +#else +#ifdef SGIArchitecture +#define IncSubdir Xaw3d |