diff options
author | dholland <dholland@pkgsrc.org> | 2011-09-29 09:10:42 +0000 |
---|---|---|
committer | dholland <dholland@pkgsrc.org> | 2011-09-29 09:10:42 +0000 |
commit | 0503afa3b198fa28f3ca81b2e7e0d6ca221a8af8 (patch) | |
tree | 6104c276805730501b0780a35803b09db9574f9c /x11 | |
parent | 9bdce2371be7fdd4b079eec5e5d7d314c5e40292 (diff) | |
download | pkgsrc-0503afa3b198fa28f3ca81b2e7e0d6ca221a8af8.tar.gz |
Override bad imake settings on NetBSD:
- HasSecureRPC is incorrectly set to YES by native X; set to NO.
- HasSetUserContext defaults to NO in both native and pkgsrc X;
set to YES.
While here fix missing <pwd.h> that was causing link-time warnings,
so bump PKGREVISION to 3.
Diffstat (limited to 'x11')
-rw-r--r-- | x11/xdm3d/Makefile | 13 | ||||
-rw-r--r-- | x11/xdm3d/distinfo | 5 | ||||
-rw-r--r-- | x11/xdm3d/patches/patch-ad | 24 | ||||
-rw-r--r-- | x11/xdm3d/patches/patch-session_c | 16 |
4 files changed, 48 insertions, 10 deletions
diff --git a/x11/xdm3d/Makefile b/x11/xdm3d/Makefile index 80b76a9d315..eb334658270 100644 --- a/x11/xdm3d/Makefile +++ b/x11/xdm3d/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.21 2009/02/09 16:28:44 joerg Exp $ +# $NetBSD: Makefile,v 1.22 2011/09/29 09:10:42 dholland Exp $ DISTNAME= xdm3d-1.0 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_LOCAL} @@ -28,6 +28,15 @@ XDMDIR=/etc/X11/xdm PKG_FAIL_REASON+= "Cannot find xdm directory." .endif +# These hacks should probably be moved to the infrastructure +.if ${OPSYS} == "NetBSD" +. if ${X11_TYPE} == "native" +# wrong in 5.x's native X +IMAKEOPTS+=-DHasSecureRPC=NO +. endif +IMAKEOPTS+=-DHasSetUserContext=YES +.endif + do-install: ${ECHO} "${X11BASE} ${XDMDIR}" ${INSTALL_PROGRAM} ${WRKSRC}/xdm ${DESTDIR}${PREFIX}/bin/xdm3d diff --git a/x11/xdm3d/distinfo b/x11/xdm3d/distinfo index 1ada92632d9..b2916703b61 100644 --- a/x11/xdm3d/distinfo +++ b/x11/xdm3d/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2005/02/23 17:36:22 wiz Exp $ +$NetBSD: distinfo,v 1.7 2011/09/29 09:10:42 dholland Exp $ SHA1 (xdm3d-1.0.tar.gz) = 494a33aefee0c1545331b657bf47b90634b69648 RMD160 (xdm3d-1.0.tar.gz) = 6a60c3afaf0756fc2c04256a79c61d413ee1a473 @@ -6,4 +6,5 @@ Size (xdm3d-1.0.tar.gz) = 157858 bytes SHA1 (patch-aa) = 4a86a37ad238e502352346fa86090b7578d862ee SHA1 (patch-ab) = 512f3df37f5480203c99198760fe98e2e127ae15 SHA1 (patch-ac) = 9ea05506db86d181d9826f5c668899b7e760a8aa -SHA1 (patch-ad) = fe87f070a74e6525908aa81cb2242a0d3e1ccd8a +SHA1 (patch-ad) = 99285953811fe2e67acc99b74d9f5a685c5eb978 +SHA1 (patch-session_c) = fec5f1438210fbba8586bcd62391ab17d8b4a743 diff --git a/x11/xdm3d/patches/patch-ad b/x11/xdm3d/patches/patch-ad index 8b56f8eb9a2..931480335f5 100644 --- a/x11/xdm3d/patches/patch-ad +++ b/x11/xdm3d/patches/patch-ad @@ -1,8 +1,20 @@ -$NetBSD: patch-ad,v 1.1 2002/03/20 01:52:31 wiz Exp $ +$NetBSD: patch-ad,v 1.2 2011/09/29 09:10:42 dholland Exp $ ---- greeter/greet.c.orig Tue Aug 18 16:24:56 1998 -+++ greeter/greet.c Sun Dec 23 23:45:13 2001 -@@ -122,6 +122,9 @@ +- needs pwd.h +- ...? + +--- greeter/greet.c.orig 1998-08-18 09:24:56.000000000 +0000 ++++ greeter/greet.c +@@ -38,6 +38,8 @@ from the X Consortium. + * + */ + ++#include <pwd.h> ++ + #include <X11/Intrinsic.h> + #include <X11/StringDefs.h> + #include <X11/Shell.h> +@@ -122,6 +124,9 @@ struct display *d; d = (struct display *) closure; @@ -12,7 +24,7 @@ $NetBSD: patch-ad,v 1.1 2002/03/20 01:52:31 wiz Exp $ scrn = XDefaultScreenOfDisplay(dpy); /* XtSetArg (args[0], XtNwidth, (XtArgVal) &width); -@@ -255,7 +258,7 @@ +@@ -255,7 +260,7 @@ InitGreet (d) 0, 0, 0, 0, XWidthOfScreen(scrn) / 2, XHeightOfScreen(scrn) / 2); @@ -21,7 +33,7 @@ $NetBSD: patch-ad,v 1.1 2002/03/20 01:52:31 wiz Exp $ moveTimeout = XtAppAddTimeOut (context, d->loginmoveInterval*10000, time_test, (XtPointer) d); if (d->pingInterval) -@@ -315,7 +318,7 @@ +@@ -315,7 +320,7 @@ Greet (d, greet) while (!done) { XtAppNextEvent (context, &event); /* by Amit Margalit 19-Apr-1997 */ diff --git a/x11/xdm3d/patches/patch-session_c b/x11/xdm3d/patches/patch-session_c new file mode 100644 index 00000000000..39796c5c04f --- /dev/null +++ b/x11/xdm3d/patches/patch-session_c @@ -0,0 +1,16 @@ +$NetBSD: patch-session_c,v 1.1 2011/09/29 09:10:42 dholland Exp $ + +- needs pwd.h unconditionally. + +--- session.c~ 1998-08-09 11:29:30.000000000 +0000 ++++ session.c +@@ -68,8 +68,8 @@ from the X Consortium. + #endif + #ifdef HAS_SETUSERCONTEXT + #include <login_cap.h> +-#include <pwd.h> + #endif ++#include <pwd.h> + + extern int PingServer(); + extern int SessionPingFailed(); |