diff options
| author | agc <agc> | 1998-01-16 17:39:17 +0000 |
|---|---|---|
| committer | agc <agc> | 1998-01-16 17:39:17 +0000 |
| commit | 74f1f0dd47974afe661e2d01d9c050887787d59d (patch) | |
| tree | cf544facb78da87ad1fe85804e0df47c8abdaa53 /x11/Xaw3d | |
| parent | 05d70073b63609671ba1687f9d0cb69e623fd8a4 (diff) | |
| download | pkgsrc-74f1f0dd47974afe661e2d01d9c050887787d59d.tar.gz | |
Revert yesterday's changes, which didn't work with our xsrc.
Fixes PR/4828, from Perry Metzger.
Diffstat (limited to 'x11/Xaw3d')
| -rw-r--r-- | x11/Xaw3d/Makefile | 5 | ||||
| -rw-r--r-- | x11/Xaw3d/patches/patch-aa | 9 | ||||
| -rw-r--r-- | x11/Xaw3d/pkg/PLIST | 3 |
3 files changed, 15 insertions, 2 deletions
diff --git a/x11/Xaw3d/Makefile b/x11/Xaw3d/Makefile index ef339b8ce10..534cfa31153 100644 --- a/x11/Xaw3d/Makefile +++ b/x11/Xaw3d/Makefile @@ -3,7 +3,7 @@ # Date created: 30th November 1997 # Whom: tron@lyssa.owl.de, soren@t.dk # -# $NetBSD: Makefile,v 1.5 1998/01/15 16:25:55 agc Exp $ +# $NetBSD: Makefile,v 1.6 1998/01/16 17:39:17 agc Exp $ # FreeBSD Id: Makefile,v 1.14 1997/06/19 09:33:26 asami Exp # @@ -15,6 +15,9 @@ MASTER_SITE_SUBDIR= widgets/Xaw3d/R6.1 USE_IMAKE= yes WRKSRC= ${WRKDIR}/xc/lib/Xaw3d +post-extract: + @(cd ${WRKSRC};ln -s .. X11) + post-install: ${LDCONFIG} -m ${PREFIX}/lib ${MKDIR} -p ${PREFIX}/share/doc/Xaw3d diff --git a/x11/Xaw3d/patches/patch-aa b/x11/Xaw3d/patches/patch-aa index d7468a37449..5d0721b0ca7 100644 --- a/x11/Xaw3d/patches/patch-aa +++ b/x11/Xaw3d/patches/patch-aa @@ -1,5 +1,14 @@ --- Imakefile.orig Wed May 29 17:38:40 1996 +++ Imakefile Mon Dec 1 01:02:08 1997 +@@ -7,7 +7,7 @@ + #define HasSharedData YES + #define LibName Xaw3d + #define SoRev SOXAWREV +-#define IncSubdir Xaw3d ++#define IncSubdir X11/Xaw3d + + #ifdef LinuxArchitecture + JUMP_ROOT_Xaw3d = $(AWIDGETSRC)3d @@ -38,9 +38,9 @@ LINTLIBS = $(LINTXLIB) $(LINTXTOOL) diff --git a/x11/Xaw3d/pkg/PLIST b/x11/Xaw3d/pkg/PLIST index 43e73afcb29..a67246ec496 100644 --- a/x11/Xaw3d/pkg/PLIST +++ b/x11/Xaw3d/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 1998/01/15 16:25:56 agc Exp $ +@comment $NetBSD: PLIST,v 1.4 1998/01/16 17:39:19 agc Exp $ include/X11/Xaw3d/AllWidgets.h include/X11/Xaw3d/AsciiSink.h include/X11/Xaw3d/AsciiSinkP.h @@ -74,6 +74,7 @@ include/X11/Xaw3d/Viewport.h include/X11/Xaw3d/ViewportP.h include/X11/Xaw3d/XawImP.h include/X11/Xaw3d/XawInit.h +lib/libXaw3d.a lib/libXaw3d.so.6.1 @exec /sbin/ldconfig -m %B || true @unexec /sbin/ldconfig -m %B || true |