emacs-current (Re: modular-xorg-server <- gl and dri + MesaLib 7.8.2 or higher

[Makoto Fujiwara <makoto%ki.nu@localhost>]

Related to modular-xorg-server, I think we need 
following changes on emacs-current.

Some conditional logic on MesaLib and gl are migration
work around, and I don't belive it needs permanently.

Welcome any comments, thanks,
---
Makoto Fujiwara, 
Chiba, Japan, Narita Airport and Disneyland prefecture.

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/emacs-current/Makefile,v
retrieving revision 1.58
diff -u -r1.58 Makefile
--- Makefile    5 Mar 2012 14:08:16 -0000       1.58
+++ Makefile    20 Mar 2012 23:12:08 -0000
@@ -56,19 +56,42 @@
 
 FILESDIR=      ${.CURDIR}/../../editors/emacs/files
 
+# Check some related libraries for inclusion.
+MESALIB_VERSION!=      \
+       (${PKG_INFO} -e MesaLib || ${ECHO} "0") | \
+       ${SED} -e 's/MesaLib-//' 
+
+GL_VERSION!=   \
+       (${PKG_INFO} -e gl || ${ECHO} "0") | \
+       ${SED} -e 's/gl-//' 
+
 post-extract:
+       # set auto-load for send-pr library
        cp ${FILESDIR}/site-init.el ${WRKSRC}/lisp
+# Uncomment for debug.
+#.if ${MESALIB_VERSION:R} >= 7.8
+#      @echo '  ** MesaLib version 7.8.2 or later installed.'
+#.endif
 
 pre-configure:
        (cd ${WRKSRC}; ./autogen.sh)
 
 .include "../../wip/mk/git-package.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../wip/gl/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
 
+.if ${MESALIB_VERSION:R} >= 7.8 || ${GL_VERSION:R} >= 7.8
+.include "../../wip/gl/buildlink3.mk"
+.include "../../x11/glproto/buildlink3.mk"
+.include "../../wip/MesaLib/buildlink3.mk"
+.include "../../graphics/librsvg/buildlink3.mk"
+.include "../../x11/libdrm/buildlink3.mk"
+.include "../../x11/dri2proto/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
+.include "../../x11/damageproto/buildlink3.mk"
+.include "../../x11/libXdamage/buildlink3.mk"
+.include "../../x11/libXxf86vm/buildlink3.mk"
+.endif
 
-#PKG_DEBUG_LEVEL?=       1
-#_PKG_SILENT=            # was @ here
+.include "../../mk/oss.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"

------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here 
http://p.sf.net/sfu/sfd2d-msazure
_______________________________________________
pkgsrc-wip-discuss mailing list
pkgsrc-wip-discuss%lists.sourceforge.net@localhost
https://lists.sourceforge.net/lists/listinfo/pkgsrc-wip-discuss