diff options
| author | dholland <dholland@pkgsrc.org> | 2011-12-13 04:40:30 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2011-12-13 04:40:30 +0000 |
| commit | 75ede24715db3756e54f5366b477e90ecd9948f2 (patch) | |
| tree | d0e8a770f1097039a892e04d230b18aa912a54a8 /x11 | |
| parent | 4fceb1ceb7ad2b4ef2f66807f8d53647731bf46a (diff) | |
| download | pkgsrc-75ede24715db3756e54f5366b477e90ecd9948f2.tar.gz | |
Disabling 'Secure' RPC via IMAKEOPTS isn't sufficient -- I thought it
worked at the time, but now it doesn't. Add a BUILDLINK_TRANSFORM hack
as well, and now this package builds.
(I also just fixed NetBSD HEAD's imake to stop claiming 'Secure' RPC is
supported.)
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/xdm3d/Makefile | 3 | ||||
| -rw-r--r-- | x11/xdm3d/distinfo | 3 | ||||
| -rw-r--r-- | x11/xdm3d/patches/patch-rpcauth_c | 24 |
3 files changed, 28 insertions, 2 deletions
diff --git a/x11/xdm3d/Makefile b/x11/xdm3d/Makefile index eb334658270..6d925262be2 100644 --- a/x11/xdm3d/Makefile +++ b/x11/xdm3d/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2011/09/29 09:10:42 dholland Exp $ +# $NetBSD: Makefile,v 1.23 2011/12/13 04:40:30 dholland Exp $ DISTNAME= xdm3d-1.0 PKGREVISION= 3 @@ -33,6 +33,7 @@ PKG_FAIL_REASON+= "Cannot find xdm directory." . if ${X11_TYPE} == "native" # wrong in 5.x's native X IMAKEOPTS+=-DHasSecureRPC=NO +BUILDLINK_TRANSFORM+= rm:-DSECURE_RPC . endif IMAKEOPTS+=-DHasSetUserContext=YES .endif diff --git a/x11/xdm3d/distinfo b/x11/xdm3d/distinfo index b2916703b61..bd4d6c80e5f 100644 --- a/x11/xdm3d/distinfo +++ b/x11/xdm3d/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2011/09/29 09:10:42 dholland Exp $ +$NetBSD: distinfo,v 1.8 2011/12/13 04:40:31 dholland Exp $ SHA1 (xdm3d-1.0.tar.gz) = 494a33aefee0c1545331b657bf47b90634b69648 RMD160 (xdm3d-1.0.tar.gz) = 6a60c3afaf0756fc2c04256a79c61d413ee1a473 @@ -7,4 +7,5 @@ SHA1 (patch-aa) = 4a86a37ad238e502352346fa86090b7578d862ee SHA1 (patch-ab) = 512f3df37f5480203c99198760fe98e2e127ae15 SHA1 (patch-ac) = 9ea05506db86d181d9826f5c668899b7e760a8aa SHA1 (patch-ad) = 99285953811fe2e67acc99b74d9f5a685c5eb978 +SHA1 (patch-rpcauth_c) = 39e849564f5027cf0e5d5116c873ca88da92462e SHA1 (patch-session_c) = fec5f1438210fbba8586bcd62391ab17d8b4a743 diff --git a/x11/xdm3d/patches/patch-rpcauth_c b/x11/xdm3d/patches/patch-rpcauth_c new file mode 100644 index 00000000000..3feccc76087 --- /dev/null +++ b/x11/xdm3d/patches/patch-rpcauth_c @@ -0,0 +1,24 @@ +$NetBSD: patch-rpcauth_c,v 1.1 2011/12/13 04:40:31 dholland Exp $ + +When imake works properly, this file isn't built unless Secure RPC is +present. When it doesn't work properly, we have to resort to buildlink +hacks and it gets built whether we like it or not, so make it come out +empty in that case. + +--- rpcauth.c~ 1997-08-22 09:41:57.000000000 +0000 ++++ rpcauth.c +@@ -38,6 +38,8 @@ from the X Consortium. + * generate SecureRPC authorization records + */ + ++#ifdef SECURE_RPC ++ + # include <X11/Xos.h> + # include <rpc/rpc.h> + # include <rpc/key_prot.h> +@@ -88,3 +90,5 @@ SecureRPCGetAuth (namelen, name) + memmove( new->data, key, new->data_length); + return new; + } ++ ++#endif /* SECURE_RPC */ |