diff options
| author | wiz <wiz@pkgsrc.org> | 2016-03-10 07:40:23 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2016-03-10 07:40:23 +0000 |
| commit | e72bbac08d2b473a0bc07dcdc0eb0a26fdb78cbc (patch) | |
| tree | 6b84175d3469b41a405dcc352b6db8c2109b1941 /x11 | |
| parent | a3f1b4474e073e3bde51abb15edfaaae8a0bdcf8 (diff) | |
| download | pkgsrc-e72bbac08d2b473a0bc07dcdc0eb0a26fdb78cbc.tar.gz | |
The strerror fix removed patch-aa from distinfo.
Finish the removal, and add some necessary overrides to the Makefile.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/xp/Makefile | 4 | ||||
| -rw-r--r-- | x11/xp/PLIST | 4 | ||||
| -rw-r--r-- | x11/xp/patches/patch-aa | 32 |
3 files changed, 5 insertions, 35 deletions
diff --git a/x11/xp/Makefile b/x11/xp/Makefile index 873d2481499..7c1763c4c60 100644 --- a/x11/xp/Makefile +++ b/x11/xp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2012/10/29 05:07:17 asau Exp $ +# $NetBSD: Makefile,v 1.17 2016/03/10 07:40:23 wiz Exp $ DISTNAME= xp-1.2b10 PKGREVISION= 4 @@ -10,6 +10,8 @@ COMMENT= Fast X11 text file viewer using Athena widgets USE_IMAKE= yes MAKE_FLAGS+= MANPATH=${PREFIX}/${PKGMANDIR} +MAKE_FLAGS+= XPTOP=${PREFIX} +MAKE_FLAGS+= XAPPLOADDIR=${PREFIX}/lib/X11/app-defaults .include "../../x11/libXaw/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" diff --git a/x11/xp/PLIST b/x11/xp/PLIST index 3c16f9eab5d..432112bf92e 100644 --- a/x11/xp/PLIST +++ b/x11/xp/PLIST @@ -1,5 +1,5 @@ -@comment $NetBSD: PLIST,v 1.2 2003/03/03 04:17:31 jschauma Exp $ +@comment $NetBSD: PLIST,v 1.3 2016/03/10 07:40:23 wiz Exp $ bin/xp bin/xpman lib/X11/app-defaults/Xp -${IMAKE_MAN_DIR}/xp.${IMAKE_MANNEWSUFFIX} +${IMAKE_MAN_DIR}/xp.1 diff --git a/x11/xp/patches/patch-aa b/x11/xp/patches/patch-aa deleted file mode 100644 index 6096b24e3af..00000000000 --- a/x11/xp/patches/patch-aa +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 1999/08/13 19:35:45 tron Exp $ - ---- Imakefile.orig Thu Feb 11 15:55:09 1999 -+++ Imakefile Fri Aug 13 21:30:56 1999 -@@ -1,23 +1,12 @@ --/* set MKDIRHIER in case you change BINDIR */ --MKDIRHIER = mkdirhier -- --XPTOP = /usr/local/xp/1.2b10 -- --/* where do you want the binary installed */ --BINDIR = ${XPTOP}/bin -- --/* where do you want the man page installed */ --MANDIR = ${XPTOP}/man/man1 -- --/* where do you want the application defaults file installed */ --XAPPLOADDIR = ${XPTOP}/lib/app-defaults -- -- - #ifdef HasVFork - VFORK_DEFINES = -DHASVFORK - #endif - - #XP_DEFINES= -DNOPUTENV -+ -+#if !(defined(SunArchitecture) && OSMajorVersion == 4) -+XP_DEFINES+= -DHAS_STRERROR -+#endif - - DEFINES= $(SIGNAL_DEFINES) $(VFORK_DEFINES) $(XP_DEFINES) - |