diff options
| author | joerg <joerg@pkgsrc.org> | 2007-01-29 18:36:29 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2007-01-29 18:36:29 +0000 |
| commit | 3f4c3ca232140889571859deb9f8c6a0b1959859 (patch) | |
| tree | a5550a58a78a99a9528c85a9e8be58d3a5aa426e /x11/Xaw-Xpm | |
| parent | 8b56306f984989362300b97f59a664529dabdeb2 (diff) | |
| download | pkgsrc-3f4c3ca232140889571859deb9f8c6a0b1959859.tar.gz | |
Modular Xorg support. Don't use stdin or stdout in file scope since
they can be macros evaluation to evaluating to non-constant expressions.
This affects e.g. DragonFly. Fix inspired by flex. Bump revision.
Diffstat (limited to 'x11/Xaw-Xpm')
| -rw-r--r-- | x11/Xaw-Xpm/Makefile | 8 | ||||
| -rw-r--r-- | x11/Xaw-Xpm/distinfo | 3 | ||||
| -rw-r--r-- | x11/Xaw-Xpm/patches/patch-ag | 30 |
3 files changed, 38 insertions, 3 deletions
diff --git a/x11/Xaw-Xpm/Makefile b/x11/Xaw-Xpm/Makefile index b7024ee3468..73c2cd1f8f9 100644 --- a/x11/Xaw-Xpm/Makefile +++ b/x11/Xaw-Xpm/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.24 2006/12/15 20:33:03 joerg Exp $ +# $NetBSD: Makefile,v 1.25 2007/01/29 18:36:29 joerg Exp $ # DISTNAME= Xaw-XPM-1.1 PKGNAME= Xaw-Xpm-1.1 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_SUNSITE:=libs/X/} @@ -27,5 +27,9 @@ post-install: ${CP} ${PKGDIR}/PLIST ${PLIST_SRC} cd ${PREFIX} && ${LS} lib/libXaw3d* >> ${PLIST_SRC} +.include "../../x11/libXext/buildlink3.mk" +.include "../../x11/libXmu/buildlink3.mk" +.include "../../x11/libXp/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" +.include "../../x11/xextproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/Xaw-Xpm/distinfo b/x11/Xaw-Xpm/distinfo index a04fc696efd..073e3a6c3a4 100644 --- a/x11/Xaw-Xpm/distinfo +++ b/x11/Xaw-Xpm/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2005/02/23 17:36:09 wiz Exp $ +$NetBSD: distinfo,v 1.5 2007/01/29 18:36:29 joerg Exp $ SHA1 (Xaw-XPM-1.1.tar.gz) = 8d85d0a96c86f46da9dcf21eef8daf3a7dd64c7f RMD160 (Xaw-XPM-1.1.tar.gz) = a97a08af7459ada39c7b97a69cf1b05d3e570343 @@ -9,3 +9,4 @@ SHA1 (patch-ac) = 4bf9c4870a2b1fcc32a5a2809763da8c14a55d19 SHA1 (patch-ad) = b1de4e1008c0b5791df3c32e5520b7823d203237 SHA1 (patch-ae) = 9e163e8daa63099f732292a00449202dd54b7ddd SHA1 (patch-af) = 993be70d46216dff66b6710f001351e2e0ccf929 +SHA1 (patch-ag) = da8c9e1348ae7b1bf97cf47cca6fb9e1a8c8cf6d diff --git a/x11/Xaw-Xpm/patches/patch-ag b/x11/Xaw-Xpm/patches/patch-ag new file mode 100644 index 00000000000..6a587163920 --- /dev/null +++ b/x11/Xaw-Xpm/patches/patch-ag @@ -0,0 +1,30 @@ +$NetBSD: patch-ag,v 1.1 2007/01/29 18:36:29 joerg Exp $ + +--- laylex.c.orig 1995-03-30 22:14:39.000000000 +0000 ++++ laylex.c +@@ -42,7 +42,7 @@ int LayYYleng; extern char LayYYtext[]; + int LayYYmorfg; + extern char *LayYYsptr, LayYYsbuf[]; + int LayYYtchar; +-FILE *LayYYin = {stdin}, *LayYYout = {stdout}; ++FILE *LayYYin, *LayYYout; + extern int LayYYlineno; + struct LayYYsvf { + struct LayYYwork *LayYYstoff; +@@ -68,6 +68,16 @@ static char *LayYYsourcebase, *LayYYsour + # define YYNEWLINE 10 + LayYYlex(){ + int nstr; extern int LayYYprevious; ++static initialised; ++ ++ if (!initialised) { ++ if (LayYYin == NULL) ++ LayYYin = stdin; ++ if (LayYYout == NULL) ++ LayYYout = stdout; ++ initialised = 1; ++ } ++ + while((nstr = LayYYlook()) >= 0) + LayYYfussy: switch(nstr){ + case 0: |