View | Details | Raw Unified | Return to bug 145744
Collapse All | Expand All

(-)/usr/ports/sunpoet/apr/Makefile (-25 / +25 lines)
Lines 19-33 Link Here
19
19
20
MAKE_JOBS_SAFE=	yes
20
MAKE_JOBS_SAFE=	yes
21
21
22
OPTIONS=	THREADS "Enable Threads in apr"						on  \
22
OPTIONS=	THREADS "Enable Threads in apr"				on \
23
			IPV6	"Enable IPV6 Support in apr"				on	\
23
		IPV6	"Enable IPV6 Support in apr"			on \
24
			GDBM	"Enable GNU dbm support in apr-util"		on  \
24
		BDB	"Enable Berkley BDB support in apr-util"	on \
25
			BDB		"Enable Berkley BDB support in apr-util"	on  \
25
		GDBM	"Enable GNU dbm support in apr-util"		on \
26
			NDBM	"Enable NDBM support in apr-util"			off \
26
		LDAP	"Enable LDAP support in apr-util"		off \
27
			LDAP	"Enable LDAP support in apr-util"			off \
27
		MYSQL	"Enable MySQL suport in apr-util"		off \
28
			MYSQL	"Enable MySQL suport in apr-util"			off \
28
		NDBM	"Enable NDBM support in apr-util"		off \
29
			PGSQL	"Enable Postgresql suport in apr-util"		off \
29
		PGSQL	"Enable Postgresql suport in apr-util"		off \
30
			SQLITE  "Enable SQLite3 support in apr-util"			off
30
		SQLITE  "Enable SQLite3 support in apr-util"		off
31
31
32
APR_VERSION=	1.3.9
32
APR_VERSION=	1.3.9
33
APU_VERSION=	1.3.9
33
APU_VERSION=	1.3.9
Lines 39-45 Link Here
39
USE_LDCONFIG=		yes
39
USE_LDCONFIG=		yes
40
GNU_CONFIGURE=		yes
40
GNU_CONFIGURE=		yes
41
41
42
CONFIGURE_ENV=	CC="${CC}" CFLAGS="${CFLAGS}"
42
CONFIGURE_ENV=	CC="${CC}"
43
43
44
NO_WRKSUBDIR=	yes
44
NO_WRKSUBDIR=	yes
45
APR_WRKDIR=	${WRKDIR}/apr-${APR_VERSION}
45
APR_WRKDIR=	${WRKDIR}/apr-${APR_VERSION}
Lines 50-57 Link Here
50
50
51
APR_CONF_ARGS=	--with-installbuilddir=${DATADIR}/build-1
51
APR_CONF_ARGS=	--with-installbuilddir=${DATADIR}/build-1
52
APU_CONF_ARGS=	--with-apr=${APR_WRKDIR} \
52
APU_CONF_ARGS=	--with-apr=${APR_WRKDIR} \
53
			--with-expat=${LOCALBASE} \
53
		--with-expat=${LOCALBASE} \
54
			--with-iconv=${LOCALBASE}
54
		--with-iconv=${LOCALBASE}
55
55
56
.include <bsd.port.options.mk>
56
.include <bsd.port.options.mk>
57
57
Lines 82-88 Link Here
82
.if defined(WITHOUT_GDBM)
82
.if defined(WITHOUT_GDBM)
83
PLIST_SUB+=	GDBM="@comment "
83
PLIST_SUB+=	GDBM="@comment "
84
APU_CONF_ARGS+=	--without-gdbm
84
APU_CONF_ARGS+=	--without-gdbm
85
.elif defined(WITH_GDBM)
85
.else
86
PLIST_SUB+=	GDBM=""
86
PLIST_SUB+=	GDBM=""
87
APU_EXTRAS=	yes
87
APU_EXTRAS=	yes
88
LIB_DEPENDS+=	gdbm.3:${PORTSDIR}/databases/gdbm
88
LIB_DEPENDS+=	gdbm.3:${PORTSDIR}/databases/gdbm
Lines 92-106 Link Here
92
.else
92
.else
93
PKGNAMESUFFIX=	-gdbm
93
PKGNAMESUFFIX=	-gdbm
94
.endif
94
.endif
95
.else
96
PLIST_SUB+=	GDBM="@comment "
97
APR_UTIL_CONF_ARGS+=	--without-gdbm
98
.endif
95
.endif
99
96
100
.if defined(WITHOUT_BDB)
97
.if defined(WITHOUT_BDB)
101
PLIST_SUB+=	BDB="@comment "
98
PLIST_SUB+=	BDB="@comment "
102
APU_CONF_ARGS+=	--without-berkeley-db
99
APU_CONF_ARGS+=	--without-berkeley-db
103
.elif defined(WITH_BDB)
100
.else
104
APU_EXTRAS=	yes
101
APU_EXTRAS=	yes
105
PLIST_SUB+=	BDB=""
102
PLIST_SUB+=	BDB=""
106
USE_BDB=	42+
103
USE_BDB=	42+
Lines 112-121 Link Here
112
.endif
109
.endif
113
.endif
110
.endif
114
111
115
.if defined(WITHOUT_NDBM)
112
.if defined(WITH_NDBM)
116
PLIST_SUB+=	NDBM="@comment "
117
APU_CONF_ARGS+=	--without-ndbm
118
.elif defined(WITH_NDBM)
119
APU_EXTRAS=	yes
113
APU_EXTRAS=	yes
120
PLIST_SUB+=	NDBM=""
114
PLIST_SUB+=	NDBM=""
121
APU_CONF_ARGS+=	--with-ndbm=/usr
115
APU_CONF_ARGS+=	--with-ndbm=/usr
Lines 124-129 Link Here
124
.else
118
.else
125
PKGNAMESUFFIX=	-ndbm
119
PKGNAMESUFFIX=	-ndbm
126
.endif
120
.endif
121
.else
122
PLIST_SUB+=	NDBM="@comment "
123
APU_CONF_ARGS+=	--without-ndbm
127
.endif
124
.endif
128
125
129
.if defined(WITH_LDAP)
126
.if defined(WITH_LDAP)
Lines 139-144 Link Here
139
.endif
136
.endif
140
.else
137
.else
141
PLIST_SUB+=	LDAP="@comment "
138
PLIST_SUB+=	LDAP="@comment "
139
APU_CONF_ARGS+=	--without-ldap
142
.endif
140
.endif
143
141
144
.if defined(WITH_MYSQL)
142
.if defined(WITH_MYSQL)
Lines 156-161 Link Here
156
.endif
154
.endif
157
.else
155
.else
158
PLIST_SUB+=	MYSQL="@comment "
156
PLIST_SUB+=	MYSQL="@comment "
157
APU_CONF_ARGS+=	--without-mysql
159
.endif
158
.endif
160
159
161
.if defined(WITH_PGSQL)
160
.if defined(WITH_PGSQL)
Lines 171-191 Link Here
171
.endif
170
.endif
172
.else
171
.else
173
PLIST_SUB+=	PGSQL="@comment "
172
PLIST_SUB+=	PGSQL="@comment "
173
APU_CONF_ARGS+=	--without-pgsql
174
.endif
174
.endif
175
175
176
.if defined(WITH_SQLITE)
176
.if defined(WITH_SQLITE)
177
APU_EXTRAS=	yes
177
APU_EXTRAS=	yes
178
PLIST_SUB+=	SQLITE3=""
178
PLIST_SUB+=	SQLITE3=""
179
USE_SQLITE=	YES
179
USE_SQLITE=	YES
180
CONFIGURE_ARGS+= --with-sqlite3=${LOCALBASE}
180
APU_CONF_ARGS+=	--with-sqlite3=${LOCALBASE}
181
.if defined(PKGNAMESUFFIX)
181
.if defined(PKGNAMESUFFIX)
182
PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-sqlite3
182
PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-sqlite3
183
.else
183
.else
184
PKGNAMESUFFIX=	-sqlite3
184
PKGNAMESUFFIX=	-sqlite3
185
.endif
185
.endif
186
.else
186
.else
187
CONFIGURE_ARGS+= --without-sqlite3
188
PLIST_SUB+=	SQLITE3="@comment "
187
PLIST_SUB+=	SQLITE3="@comment "
188
APU_CONF_ARGS+=	--without-sqlite3
189
.endif
189
.endif
190
190
191
.if defined(APU_EXTRAS)
191
.if defined(APU_EXTRAS)
Lines 195-207 Link Here
195
.endif
195
.endif
196
196
197
post-patch:
197
post-patch:
198
	${REINPLACE_CMD} -e 's/OSVERSION/'${OSVERSION}'/g' \
198
	${REINPLACE_CMD} -e 's/OSVERSION/${OSVERSION}/g' \
199
		${APR_WRKDIR}/build/apr_hints.m4
199
		${APR_WRKDIR}/build/apr_hints.m4
200
	${FIND} ${APR_WRKDIR} ${APU_WRKDIR} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \
200
	${FIND} ${APR_WRKDIR} ${APU_WRKDIR} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \
201
		's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g'
201
		's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g'
202
	${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},g' \
202
	${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},g' \
203
		${APR_WRKDIR}/build/apr_threads.m4 ${APR_WRKDIR}/build/apr_hints.m4 \
203
		${APR_WRKDIR}/build/apr_threads.m4 ${APR_WRKDIR}/build/apr_hints.m4 \
204
		${APU_WRKDIR}/build/apu-conf.m4 
204
		${APU_WRKDIR}/build/apu-conf.m4
205
205
206
run-autotools::
206
run-autotools::
207
	cd ${APR_WRKDIR} ; \
207
	cd ${APR_WRKDIR} ; \

Return to bug 145744