diff options
| author | joerg <joerg@pkgsrc.org> | 2006-12-15 19:13:22 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-12-15 19:13:22 +0000 |
| commit | fa0ec919a89b400ef5a272c2c5c2a2c813dba796 (patch) | |
| tree | 5a781fd7a5f86ad83a4253a67f4198a538516a23 /x11 | |
| parent | f46d53621ab35c1add8aa2fe103006751c03a8d5 (diff) | |
| download | pkgsrc-fa0ec919a89b400ef5a272c2c5c2a2c813dba796.tar.gz | |
Stop messing with X11/Xmos_r.h, just replace it with a direct include
of X11/Xos_r.h and assume that has all the magic. If it is really
necessary to hack around limitations of other platforms, we can do
that later in a more specialised fashion. Bump revision.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/openmotif/Makefile | 5 | ||||
| -rw-r--r-- | x11/openmotif/distinfo | 3 | ||||
| -rw-r--r-- | x11/openmotif/patches/patch-ab | 13 |
3 files changed, 4 insertions, 17 deletions
diff --git a/x11/openmotif/Makefile b/x11/openmotif/Makefile index 15e5aff8632..1572c87edad 100644 --- a/x11/openmotif/Makefile +++ b/x11/openmotif/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.50 2006/11/06 10:32:18 joerg Exp $ +# $NetBSD: Makefile,v 1.51 2006/12/15 19:13:22 joerg Exp $ PKGVER= 2.2.3 DISTNAME= openMotif-${PKGVER} PKGNAME= openmotif-${PKGVER} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= x11 MASTER_SITES= http://ftp.motifzone.com/src/ @@ -79,6 +79,7 @@ post-patch: ${RM} -f $${manpage}.presubst; \ done; \ done + echo "#include <X11/Xos_r.h>" > ${WRKSRC}/lib/Xm/Xmos_r.h # Filter the manpages through tbl. post-build: diff --git a/x11/openmotif/distinfo b/x11/openmotif/distinfo index d9056b3a389..ff32709e174 100644 --- a/x11/openmotif/distinfo +++ b/x11/openmotif/distinfo @@ -1,10 +1,9 @@ -$NetBSD: distinfo,v 1.23 2006/01/09 13:13:52 joerg Exp $ +$NetBSD: distinfo,v 1.24 2006/12/15 19:13:22 joerg Exp $ SHA1 (openMotif-2.2.3.tar.gz) = c463653d9f8e24b35522c3ba6363ddf7a282eab4 RMD160 (openMotif-2.2.3.tar.gz) = b99230d508da57bca72b6920d28fce4187bf5179 Size (openMotif-2.2.3.tar.gz) = 5149785 bytes SHA1 (patch-aa) = 5c204036a831ca890b196c6f7d23be2fdb848980 -SHA1 (patch-ab) = 2243e335412b124e1ac57f57d25b5afdeacd987c SHA1 (patch-ac) = 1c14d22f888859b15365bcba7edba78a1114c6ac SHA1 (patch-ad) = 4903cbf3b9ac6e2dd2f8e327bb33f5743650787e SHA1 (patch-ae) = 00ffe019ea7a6950ed673f5a7907196b22a45f4e diff --git a/x11/openmotif/patches/patch-ab b/x11/openmotif/patches/patch-ab deleted file mode 100644 index 18e4fef9c1a..00000000000 --- a/x11/openmotif/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2005/12/12 19:55:41 joerg Exp $ - ---- lib/Xm/Xmos_r.h.orig 2005-11-25 05:31:24.000000000 +0100 -+++ lib/Xm/Xmos_r.h -@@ -248,7 +248,7 @@ typedef struct { - * fields. - */ - --#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) -+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) - __inline__ void _Xpw_copyPasswd(_Xgetpwparams p) - { - memcpy(&(p).pws, (p).pwp, sizeof(struct passwd)); |