Sun May 8 19:29:02 2011 UTC ()
Adjust installed version auto-detection


(adam)
diff -r1.30 -r1.31 pkgsrc/mk/pgsql.buildlink3.mk
cvs diff -r1.30 -r1.31 pkgsrc/mk/pgsql.buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/mk/pgsql.buildlink3.mk 2010/10/12 16:44:19 1.30
+++ pkgsrc/mk/pgsql.buildlink3.mk 2011/05/08 19:29:02 1.31
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: pgsql.buildlink3.mk,v 1.30 2010/10/12 16:44:19 joerg Exp $ 1# $NetBSD: pgsql.buildlink3.mk,v 1.31 2011/05/08 19:29:02 adam Exp $
2# 2#
3# User-settable variables: 3# User-settable variables:
4# 4#
5# PGSQL_VERSION_DEFAULT 5# PGSQL_VERSION_DEFAULT
6# 6#
7# Package-settable variables: 7# Package-settable variables:
8# 8#
9# PGSQL_VERSIONS_ACCEPTED 9# PGSQL_VERSIONS_ACCEPTED
10# 10#
11# Variables set by this file: 11# Variables set by this file:
12# 12#
13# PG_LIB_EXT 13# PG_LIB_EXT
14# PGSQL_TYPE 14# PGSQL_TYPE
@@ -31,45 +31,45 @@ PGSQL_VERSIONS_ACCEPTED?= 90 84 83 @@ -31,45 +31,45 @@ PGSQL_VERSIONS_ACCEPTED?= 90 84 83
31# transform the list into individual variables 31# transform the list into individual variables
32.for pv in ${PGSQL_VERSIONS_ACCEPTED} 32.for pv in ${PGSQL_VERSIONS_ACCEPTED}
33_PGSQL_VERSION_${pv}_OK= yes 33_PGSQL_VERSION_${pv}_OK= yes
34.endfor 34.endfor
35 35
36.if ${_OPSYS_SHLIB_TYPE} == "dylib" 36.if ${_OPSYS_SHLIB_TYPE} == "dylib"
37PG_LIB_EXT=dylib 37PG_LIB_EXT=dylib
38.else 38.else
39PG_LIB_EXT=so 39PG_LIB_EXT=so
40.endif 40.endif
41 41
42# check what is installed 42# check what is installed
43.if ${OPSYS} == "Darwin" 43.if ${OPSYS} == "Darwin"
44.if exists(${LOCALBASE}/lib/libecpg.6.0.2.dylib) 44. if exists(${LOCALBASE}/lib/libecpg.6.2.dylib)
45_PGSQL_VERSION_90_INSTALLED= yes 45_PGSQL_VERSION_90_INSTALLED= yes
46.endif 46. endif
47.if exists(${LOCALBASE}/lib/libecpg.6.0.1.dylib) 47. if exists(${LOCALBASE}/lib/libecpg.6.1.dylib)
48_PGSQL_VERSION_84_INSTALLED= yes 48_PGSQL_VERSION_84_INSTALLED= yes
49.endif 49. endif
50.if exists(${LOCALBASE}/lib/libecpg.6.0.0.dylib) 50. if exists(${LOCALBASE}/lib/libecpg.6.0.dylib)
51_PGSQL_VERSION_83_INSTALLED= yes 51_PGSQL_VERSION_83_INSTALLED= yes
52.endif 52. endif
53.else 53.else
54.if exists(${LOCALBASE}/lib/libecpg.so.6.0.2) 54. if exists(${LOCALBASE}/lib/libecpg.so.6.2)
55_PGSQL_VERSION_90_INSTALLED= yes 55_PGSQL_VERSION_90_INSTALLED= yes
56.endif 56. endif
57.if exists(${LOCALBASE}/lib/libecpg.so.6.0.1) 57. if exists(${LOCALBASE}/lib/libecpg.so.6.1)
58_PGSQL_VERSION_84_INSTALLED= yes 58_PGSQL_VERSION_84_INSTALLED= yes
59.endif 59. endif
60.if exists(${LOCALBASE}/lib/libecpg.so.6.0.0) 60. if exists(${LOCALBASE}/lib/libecpg.so.6.0)
61_PGSQL_VERSION_83_INSTALLED= yes 61_PGSQL_VERSION_83_INSTALLED= yes
62.endif 62. endif
63.endif 63.endif
64 64
65# if a version is explicitely required, take it 65# if a version is explicitely required, take it
66.if defined(PGSQL_VERSION_REQD) 66.if defined(PGSQL_VERSION_REQD)
67_PGSQL_VERSION= ${PGSQL_VERSION_REQD} 67_PGSQL_VERSION= ${PGSQL_VERSION_REQD}
68.endif 68.endif
69# if the default is already installed, it is first choice 69# if the default is already installed, it is first choice
70.if !defined(_PGSQL_VERSION) 70.if !defined(_PGSQL_VERSION)
71.if defined(_PGSQL_VERSION_${PGSQL_VERSION_DEFAULT}_OK) 71.if defined(_PGSQL_VERSION_${PGSQL_VERSION_DEFAULT}_OK)
72.if defined(_PGSQL_VERSION_${PGSQL_VERSION_DEFAULT}_INSTALLED) 72.if defined(_PGSQL_VERSION_${PGSQL_VERSION_DEFAULT}_INSTALLED)
73_PGSQL_VERSION= ${PGSQL_VERSION_DEFAULT} 73_PGSQL_VERSION= ${PGSQL_VERSION_DEFAULT}
74.endif 74.endif
75.endif 75.endif