diff options
| author | jlam <jlam@pkgsrc.org> | 2001-08-23 04:19:58 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-08-23 04:19:58 +0000 |
| commit | d3e83d55e42d22dd7a47c5b8ef9390fb7e889546 (patch) | |
| tree | 85bff1afa68fe3c48666cbd98eb23b4119c7c11d /x11/Xaw-Xpm | |
| parent | a731badbdca604194d260ec8173c33e3fef62e44 (diff) | |
| download | pkgsrc-d3e83d55e42d22dd7a47c5b8ef9390fb7e889546.tar.gz | |
Make this compile and install correctly on XFree86-4.x.
Diffstat (limited to 'x11/Xaw-Xpm')
| -rw-r--r-- | x11/Xaw-Xpm/Makefile | 7 | ||||
| -rw-r--r-- | x11/Xaw-Xpm/distinfo | 3 | ||||
| -rw-r--r-- | x11/Xaw-Xpm/patches/patch-af | 19 | ||||
| -rw-r--r-- | x11/Xaw-Xpm/pkg/PLIST | 6 |
4 files changed, 27 insertions, 8 deletions
diff --git a/x11/Xaw-Xpm/Makefile b/x11/Xaw-Xpm/Makefile index b1f4d468fdd..dfab0b32a4a 100644 --- a/x11/Xaw-Xpm/Makefile +++ b/x11/Xaw-Xpm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2001/02/25 04:18:25 hubertf Exp $ +# $NetBSD: Makefile,v 1.14 2001/08/23 04:19:58 jlam Exp $ # DISTNAME= Xaw-XPM-1.1 @@ -14,7 +14,7 @@ COMMENT= Enhanced 3-D widgets based on the Athena Widget set and Xaw3d CONFLICTS= Xaw3d-* USE_IMAKE= YES -USE_XPM= YES +PLIST_SRC= ${WRKDIR}/.PLIST_SRC post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/Xaw-Xpm @@ -22,5 +22,8 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/README-XPM ${PREFIX}/share/doc/Xaw-Xpm ${INSTALL_DATA} ${WRKSRC}/defaults-XawXpm ${PREFIX}/share/doc/Xaw-Xpm ${INSTALL_DATA} ${WRKSRC}/pixmaps/*.xpm ${PREFIX}/share/pixmaps + ${CP} ${PKGDIR}/PLIST ${PLIST_SRC} + cd ${PREFIX} && ${LS} lib/libXaw3d* >> ${PLIST_SRC} +.include "../../graphics/xpm/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/Xaw-Xpm/distinfo b/x11/Xaw-Xpm/distinfo index d48638a1884..9cad4252f7a 100644 --- a/x11/Xaw-Xpm/distinfo +++ b/x11/Xaw-Xpm/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2001/04/19 11:07:34 skrll Exp $ +$NetBSD: distinfo,v 1.3 2001/08/23 04:19:58 jlam Exp $ SHA1 (Xaw-XPM-1.1.tar.gz) = 8d85d0a96c86f46da9dcf21eef8daf3a7dd64c7f Size (Xaw-XPM-1.1.tar.gz) = 1188556 bytes @@ -7,3 +7,4 @@ SHA1 (patch-ab) = a2e4249ab6d9dce2b98452cf60c0d49e281cde7b SHA1 (patch-ac) = 4bf9c4870a2b1fcc32a5a2809763da8c14a55d19 SHA1 (patch-ad) = b1de4e1008c0b5791df3c32e5520b7823d203237 SHA1 (patch-ae) = 9e163e8daa63099f732292a00449202dd54b7ddd +SHA1 (patch-af) = 993be70d46216dff66b6710f001351e2e0ccf929 diff --git a/x11/Xaw-Xpm/patches/patch-af b/x11/Xaw-Xpm/patches/patch-af new file mode 100644 index 00000000000..b7e48511c6a --- /dev/null +++ b/x11/Xaw-Xpm/patches/patch-af @@ -0,0 +1,19 @@ +$NetBSD: patch-af,v 1.1 2001/08/23 04:19:59 jlam Exp $ + +--- XawI18n.h.orig Wed Apr 5 19:33:03 1995 ++++ XawI18n.h +@@ -29,10 +29,14 @@ + + #ifdef HAS_WCTYPE_H + #include <wctype.h> ++#ifdef HAS_WIDEC_H + #include <widec.h> ++#endif ++#if !defined(__NetBSD__) + #define wcslen(c) wslen(c) + #define wcscpy(d,s) wscpy(d,s) + #define wcsncpy(d,s,l) wsncpy(d,s,l) ++#endif + #endif + + #ifdef HAS_WCHAR_H diff --git a/x11/Xaw-Xpm/pkg/PLIST b/x11/Xaw-Xpm/pkg/PLIST index 6b206ac4808..88dfb0ce2c9 100644 --- a/x11/Xaw-Xpm/pkg/PLIST +++ b/x11/Xaw-Xpm/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2001/01/04 15:10:58 agc Exp $ +@comment $NetBSD: PLIST,v 1.4 2001/08/23 04:19:59 jlam Exp $ include/X11/Xaw3d/AllWidgets.h include/X11/Xaw3d/AsciiSink.h include/X11/Xaw3d/AsciiSinkP.h @@ -75,10 +75,6 @@ include/X11/Xaw3d/ViewportP.h include/X11/Xaw3d/XawImP.h include/X11/Xaw3d/XawInit.h include/X11/Xaw3d/Xpm.h -lib/libXaw3d.a -lib/libXaw3d.so -lib/libXaw3d.so.6 -lib/libXaw3d.so.6.1 share/doc/Xaw-Xpm/README-XPM share/doc/Xaw-Xpm/defaults-XawXpm share/pixmaps/a036.xpm |