Re: pkgsrc-wip NetBSD 3.99.23/i386 bulk build results 20060805.0046

["Jeremy C. Reed" <reed%reedmedia.net@localhost>]

> No, there is no difference.  But I am not sure how your patch is
> supposed to fix the problem...  The bulk build is done using the
> default parameters, so
> 
>     # make show-var VARNAME=X11BASE
>     /usr/X11R6
>     # make show-var VARNAME=LOCALBASE
>     /usr/pkg
> 
> i.e. the new test is always true...

Thanks. I have another patch that I should have provided too! It creates a 
pkgconfig file if needed.

Index: x11/xproto/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xproto/builtin.mk,v
retrieving revision 1.1
diff -u -r1.1 builtin.mk
--- x11/xproto/builtin.mk       19 Apr 2006 12:19:47 -0000      1.1
+++ x11/xproto/builtin.mk       9 Aug 2006 16:16:25 -0000
@@ -13,7 +13,7 @@
 ###
 .if !defined(IS_BUILTIN.xproto)
 IS_BUILTIN.xproto=     no
-.  if empty(H_XFUNCPROTO:M__nonexistent__)
+.  if empty(H_XFUNCPROTO:M__nonexistent__) && (${X11BASE} != ${LOCALBASE})
 IS_BUILTIN.xproto=     yes
 .  endif
 .endif
@@ -45,3 +45,29 @@
 .  endif  # PREFER.xproto
 .endif
 MAKEVARS+=     USE_BUILTIN.xproto
+
+CHECK_BUILTIN.xproto?= no
+.if !empty(CHECK_BUILTIN.xproto:M[nN][oO])
+
+# If we are using the builtin version, check whether it has a xproto.pc
+# file or not.  If the latter, generate a fake one.
+.  if !empty(USE_BUILTIN.xproto:M[Yy][Ee][Ss])
+BUILDLINK_TARGETS+=    xproto-fake-pc
+
+xproto-fake-pc:
+       ${_PKG_SILENT}${_PKG_DEBUG} \
+       src=${BUILDLINK_PREFIX.xproto}/lib/pkgconfig/xproto.pc \
+       dst=${BUILDLINK_DIR}/lib/pkgconfig/xproto.pc; \
+       ${MKDIR} ${BUILDLINK_DIR}/lib/pkgconfig; \
+       if ${TEST} -f $${src}; then \
+               ${LN} -sf $${src} $${dst}; \
+       else \
+               { ${ECHO} "Name: Xproto"; \
+               ${ECHO} "Description: Xproto headers"; \
+               ${ECHO} "Version: 7.0.4"; \
+               ${ECHO} "Cflags: -I${BUILDLINK_PREFIX.xproto}/include"; \
+               } >$${dst}; \
+       fi
+.  endif
+
+.endif # CHECK_BUILTIN.xproto

-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
pkgsrc-wip-discuss mailing list
pkgsrc-wip-discuss%lists.sourceforge.net@localhost
https://lists.sourceforge.net/lists/listinfo/pkgsrc-wip-discuss