tech-pkg archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: sysutils/strigi cannot find textproc/libxml2 in bootstrap pkgsrc
Thomas Klausner writes:
> This patch looks good.
> When you commit it, please bump PKGREVISION.
Below is a full patch against HEAD with the bump included. I would
appreciate any additional comments as I have a couple of questions
still:
- Should I be using @PREFIX@ or @LOCALBASE@? What gets substituted
here will be used by other packages when they try to use cmake in
their own build process. Thus, the point is to locate pkgsrc stuff
that has already been installed as dependencies. However, I am not
entirely sure I understand the distinction between these two
variables.
- While I was at it, I also made sure that references to X11R* were
preceded by @X11BASE@ things as a means of anticipating similar
problems in the future with X11. Thoughts on this?
Thanks for taking a look at this stuff.
Cheers,
Brook
===========================================================================
? devel/cmake/patches/patch-Modules_FindX11.cmake
Index: chat/spectrum/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/chat/spectrum/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- chat/spectrum/Makefile 10 Jun 2011 09:39:49 -0000 1.6
+++ chat/spectrum/Makefile 1 Sep 2011 04:18:53 -0000
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.6 2011/06/10 09:39:49 obache Exp $
DISTNAME= spectrum-1.4.7
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= chat
MASTER_SITES= http://spectrum.im/attachments/download/37/
Index: devel/cmake/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/cmake/Makefile,v
retrieving revision 1.58
diff -u -r1.58 Makefile
--- devel/cmake/Makefile 31 Jul 2011 22:04:03 -0000 1.58
+++ devel/cmake/Makefile 1 Sep 2011 04:19:02 -0000
@@ -1,6 +1,7 @@
# $NetBSD: Makefile,v 1.58 2011/07/31 22:04:03 adam Exp $
DISTNAME= cmake-${CMAKE_API}.5
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://www.cmake.org/files/v2.8/
@@ -44,9 +45,10 @@
SUBST_CLASSES+= cmake
SUBST_STAGE.cmake= pre-configure
-SUBST_MESSAGE.cmake= Fixing X11 prefix.
-SUBST_FILES.cmake= Modules/Platform/UnixPaths.cmake
-SUBST_VARS.cmake= X11BASE
+SUBST_MESSAGE.cmake= Fixing PREFIX and X11 paths.
+SUBST_FILES.cmake+= Modules/FindX11.cmake
+SUBST_FILES.cmake+= Modules/Platform/UnixPaths.cmake
+SUBST_VARS.cmake= PREFIX X11BASE
SUBST_CLASSES+= flags
SUBST_STAGE.flags= pre-configure
Index: devel/cmake/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/cmake/buildlink3.mk,v
retrieving revision 1.10
diff -u -r1.10 buildlink3.mk
--- devel/cmake/buildlink3.mk 20 Mar 2009 19:24:11 -0000 1.10
+++ devel/cmake/buildlink3.mk 1 Sep 2011 04:19:02 -0000
@@ -6,6 +6,7 @@
CMAKE_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.cmake+= cmake>=2.4.6nb3
+BUILDLINK_ABI_DEPENDS.cmake?= cmake>=2.8.5nb1
BUILDLINK_PKGSRCDIR.cmake?= ../../devel/cmake
BUILDLINK_DEPMETHOD.cmake?= build
BUILDLINK_FILES.cmake+= share/cmake-*/include/*
Index: devel/cmake/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/devel/cmake/distinfo,v
retrieving revision 1.30
diff -u -r1.30 distinfo
--- devel/cmake/distinfo 31 Jul 2011 22:04:03 -0000 1.30
+++ devel/cmake/distinfo 1 Sep 2011 04:19:02 -0000
@@ -3,6 +3,7 @@
SHA1 (cmake-2.8.5.tar.gz) = 8dd4c31cbccf1a297829a476a0ef79d1614ca368
RMD160 (cmake-2.8.5.tar.gz) = e4767dc0ea3e53da3ab14cc6af5d42dd190eda76
Size (cmake-2.8.5.tar.gz) = 5517977 bytes
-SHA1 (patch-aa) = c16ba8be422ec243995cd5d475324d469d08c37a
+SHA1 (patch-Modules_FindX11.cmake) = ce3ddc82fdc5916f39abdd0f0291c7ce220f1bb2
+SHA1 (patch-aa) = 6b6a2da6a73c139d3bc99b13329beddf910808d6
SHA1 (patch-ab) = c3bb671d98e0d91e32e94f8d8b8203e647559543
SHA1 (patch-ac) = 1f11e98d50127fae12286708215a90f118b2d2bc
Index: devel/cmake/patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/devel/cmake/patches/patch-aa,v
retrieving revision 1.7
diff -u -r1.7 patch-aa
--- devel/cmake/patches/patch-aa 11 Nov 2010 08:34:02 -0000 1.7
+++ devel/cmake/patches/patch-aa 1 Sep 2011 04:19:02 -0000
@@ -2,7 +2,7 @@
--- Modules/Platform/UnixPaths.cmake.orig 2010-11-03 19:58:27.000000000
+0000
+++ Modules/Platform/UnixPaths.cmake
-@@ -48,7 +48,7 @@ LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH
+@@ -48,10 +48,10 @@
/usr/include/w32api
# X11
@@ -10,8 +10,12 @@
+ @X11BASE@/include /usr/X11R6/include /usr/include/X11
# Other
- /usr/pkg/include
-@@ -61,7 +61,7 @@ LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH
+- /usr/pkg/include
++ @PREFIX@/include
+ /opt/csw/include /opt/include
+ /usr/openwin/include
+ )
+@@ -61,16 +61,16 @@
/usr/lib/w32api
# X11
@@ -19,4 +23,15 @@
+ @X11BASE@/lib /usr/X11R6/lib /usr/lib/X11
# Other
- /usr/pkg/lib
+- /usr/pkg/lib
++ @PREFIX@/lib
+ /opt/csw/lib /opt/lib
+ /usr/openwin/lib
+ )
+
+ LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH
+- /usr/pkg/bin
++ @PREFIX@/bin
+ )
+
+ LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
Index: geography/qlandkartegt/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/geography/qlandkartegt/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- geography/qlandkartegt/Makefile 22 Apr 2011 13:43:41 -0000 1.12
+++ geography/qlandkartegt/Makefile 1 Sep 2011 04:19:19 -0000
@@ -2,7 +2,7 @@
#
DISTNAME= qlandkartegt-1.0.0
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= geography
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qlandkartegt/}
Index: geography/qlandkartem/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/geography/qlandkartem/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- geography/qlandkartem/Makefile 22 Apr 2011 13:43:41 -0000 1.9
+++ geography/qlandkartem/Makefile 1 Sep 2011 04:19:19 -0000
@@ -3,7 +3,7 @@
DISTNAME= QLandkarteM.0.2.0
PKGNAME= qlandkartem-0.2.0
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= geography
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qlandkartegt/}
Index: graphics/vtk/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/vtk/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- graphics/vtk/Makefile 14 Jul 2008 12:56:05 -0000 1.11
+++ graphics/vtk/Makefile 1 Sep 2011 04:19:23 -0000
@@ -2,7 +2,7 @@
#
PKGNAME= vtk-${VTKDIST_VERSION}
-PKGREVISION= 5
+PKGREVISION= 6
PKG_DESTDIR_SUPPORT= user-destdir
Index: net/libnipper/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/libnipper/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- net/libnipper/Makefile 11 Feb 2010 22:06:14 -0000 1.3
+++ net/libnipper/Makefile 1 Sep 2011 04:19:40 -0000
@@ -2,6 +2,7 @@
#
DISTNAME= libnipper-0.12.1
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nipper/}
EXTRACT_SUFX= .tgz
Index: net/nipper/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/nipper/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- net/nipper/Makefile 11 Feb 2010 22:19:49 -0000 1.4
+++ net/nipper/Makefile 1 Sep 2011 04:19:40 -0000
@@ -3,6 +3,7 @@
DISTNAME= nipper-cli-0.12.0
PKGNAME= ${DISTNAME:S/-cli//}
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nipper/}
EXTRACT_SUFX= .tgz
Index: net/synergy/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/synergy/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- net/synergy/Makefile 23 Jun 2011 03:16:50 -0000 1.13
+++ net/synergy/Makefile 1 Sep 2011 04:19:42 -0000
@@ -3,6 +3,7 @@
DISTNAME= synergy-1.3.7-Source
PKGNAME= ${DISTNAME:S/-Source//}
+PKGREVISION= 1
CATEGORIES= net x11
MASTER_SITES= http://synergy.googlecode.com/files/
Index: textproc/ebook-tools/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/ebook-tools/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- textproc/ebook-tools/Makefile 18 Mar 2011 13:49:38 -0000 1.4
+++ textproc/ebook-tools/Makefile 1 Sep 2011 04:20:00 -0000
@@ -3,7 +3,7 @@
# also update lit2epub if you update this package.
DISTNAME= ebook-tools-0.1.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ebook-tools/}
Index: x11/tint2/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/tint2/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- x11/tint2/Makefile 22 Apr 2011 13:45:15 -0000 1.11
+++ x11/tint2/Makefile 1 Sep 2011 04:20:15 -0000
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.11 2011/04/22 13:45:15 obache Exp $
DISTNAME= tint2-0.11
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= x11
MASTER_SITES= http://tint2.googlecode.com/files/
EXTRACT_SUFX= .tar.bz2
===========================================================================
And this is the newly added patch file:
$NetBSD$
--- Modules/FindX11.cmake.orig 2011-07-08 12:21:44.000000000 +0000
+++ Modules/FindX11.cmake
@@ -56,7 +56,8 @@ IF (UNIX)
SET(CMAKE_FIND_FRAMEWORK_SAVE ${CMAKE_FIND_FRAMEWORK})
SET(CMAKE_FIND_FRAMEWORK NEVER)
SET(X11_INC_SEARCH_PATH
- /usr/pkg/xorg/include
+ @PREFIX@/xorg/include
+ @X11BASE@/include
/usr/X11R6/include
/usr/X11R7/include
/usr/include/X11
@@ -66,7 +67,8 @@ IF (UNIX)
)
SET(X11_LIB_SEARCH_PATH
- /usr/pkg/xorg/lib
+ @PREFIX@/xorg/lib
+ @X11BASE@/lib
/usr/X11R6/lib
/usr/X11R7/lib
/usr/openwin/lib
Home |
Main Index |
Thread Index |
Old Index