1--- misc/apr-util-1.5.4/Library_apr-util.mk	2012-01-05 14:49:40.529219100 +0100
2+++ misc/build/apr-util-1.5.4/Library_apr-util.mk	2012-01-05 14:47:18.621102400 +0100
3@@ -1 +1,90 @@
4-dummy
5+#/**************************************************************
6+# *
7+# * Licensed to the Apache Software Foundation (ASF) under one
8+# * or more contributor license agreements.  See the NOTICE file
9+# * distributed with this work for additional information
10+# * regarding copyright ownership.  The ASF licenses this file
11+# * to you under the Apache License, Version 2.0 (the
12+# * "License"); you may not use this file except in compliance
13+# * with the License.  You may obtain a copy of the License at
14+# *
15+# *   http://www.apache.org/licenses/LICENSE-2.0
16+# *
17+# * Unless required by applicable law or agreed to in writing,
18+# * software distributed under the License is distributed on an
19+# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
20+# * KIND, either express or implied.  See the License for the
21+# * specific language governing permissions and limitations
22+# * under the License.
23+# *
24+# *************************************************************/
25+
26+$(eval $(call gb_Library_Library,apr-util))
27+
28+$(eval $(call gb_Library_add_package_headers,apr-util,apr-util_inc))
29+
30+$(eval $(call gb_Library_set_include,apr-util,\
31+	$$(INCLUDE) \
32+	-I./include \
33+	-I./include/private \
34+	-I$(OUTDIR)/inc/apr \
35+))
36+
37+$(eval $(call gb_Library_set_defs,apr-util,\
38+	$$(DEFS) \
39+	-DAPU_DECLARE_EXPORT -DWIN32 -DNDEBUG -D_WINDOWS -D_USRDLL -DWIN32_EXPORTS \
40+))
41+
42+$(eval $(call gb_Library_add_linked_libs,apr-util,\
43+	apr \
44+	expat_xmltok \
45+	expat_xmlparse \
46+    $(gb_STDLIBS) \
47+))
48+
49+$(eval $(call gb_Library_add_cobjects,apr-util,\
50+	apr-util/$(INPATH)/misc/build/apr-util-1.5.4/buckets/apr_brigade \
51+	apr-util/$(INPATH)/misc/build/apr-util-1.5.4/buckets/apr_buckets \
52+	apr-util/$(INPATH)/misc/build/apr-util-1.5.4/buckets/apr_buckets_alloc \
53+	apr-util/$(INPATH)/misc/build/apr-util-1.5.4/buckets/apr_buckets_eos \
54+	apr-util/$(INPATH)/misc/build/apr-util-1.5.4/buckets/apr_buckets_file \
55+	apr-util/$(INPATH)/misc/build/apr-util-1.5.4/buckets/apr_buckets_flush \
56+	apr-util/$(INPATH)/misc/build/apr-util-1.5.4/buckets/apr_buckets_heap \
57+	apr-util/$(INPATH)/misc/build/apr-util-1.5.4/buckets/apr_buckets_mmap \
58+	apr-util/$(INPATH)/misc/build/apr-util-1.5.4/buckets/apr_buckets_pipe \
59+	apr-util/$(INPATH)/misc/build/apr-util-1.5.4/buckets/apr_buckets_pool \
60+	apr-util/$(INPATH)/misc/build/apr-util-1.5.4/buckets/apr_buckets_refcount \
61+	apr-util/$(INPATH)/misc/build/apr-util-1.5.4/buckets/apr_buckets_simple \
62+	apr-util/$(INPATH)/misc/build/apr-util-1.5.4/buckets/apr_buckets_socket \
63+	apr-util/$(INPATH)/misc/build/apr-util-1.5.4/crypto/apr_crypto \
64+	apr-util/$(INPATH)/misc/build/apr-util-1.5.4/crypto/apr_md4 \
65+	apr-util/$(INPATH)/misc/build/apr-util-1.5.4/crypto/apr_md5 \
66+	apr-util/$(INPATH)/misc/build/apr-util-1.5.4/crypto/apr_sha1 \
67+	apr-util/$(INPATH)/misc/build/apr-util-1.5.4/crypto/getuuid \
68+	apr-util/$(INPATH)/misc/build/apr-util-1.5.4/crypto/uuid \
69+	apr-util/$(INPATH)/misc/build/apr-util-1.5.4/dbd/apr_dbd \
70+	apr-util/$(INPATH)/misc/build/apr-util-1.5.4/dbm/apr_dbm \
71+	apr-util/$(INPATH)/misc/build/apr-util-1.5.4/dbm/apr_dbm_sdbm \
72+	apr-util/$(INPATH)/misc/build/apr-util-1.5.4/dbm/sdbm/sdbm \
73+	apr-util/$(INPATH)/misc/build/apr-util-1.5.4/dbm/sdbm/sdbm_hash \
74+	apr-util/$(INPATH)/misc/build/apr-util-1.5.4/dbm/sdbm/sdbm_lock \
75+	apr-util/$(INPATH)/misc/build/apr-util-1.5.4/dbm/sdbm/sdbm_pair \
76+	apr-util/$(INPATH)/misc/build/apr-util-1.5.4/encoding/apr_base64 \
77+	apr-util/$(INPATH)/misc/build/apr-util-1.5.4/hooks/apr_hooks \
78+	apr-util/$(INPATH)/misc/build/apr-util-1.5.4/ldap/apr_ldap_stub \
79+	apr-util/$(INPATH)/misc/build/apr-util-1.5.4/ldap/apr_ldap_url \
80+	apr-util/$(INPATH)/misc/build/apr-util-1.5.4/memcache/apr_memcache \
81+	apr-util/$(INPATH)/misc/build/apr-util-1.5.4/misc/apr_date \
82+	apr-util/$(INPATH)/misc/build/apr-util-1.5.4/misc/apr_queue \
83+	apr-util/$(INPATH)/misc/build/apr-util-1.5.4/misc/apr_reslist \
84+	apr-util/$(INPATH)/misc/build/apr-util-1.5.4/misc/apr_rmm \
85+	apr-util/$(INPATH)/misc/build/apr-util-1.5.4/misc/apr_thread_pool \
86+	apr-util/$(INPATH)/misc/build/apr-util-1.5.4/misc/apu_dso \
87+	apr-util/$(INPATH)/misc/build/apr-util-1.5.4/misc/apu_version \
88+	apr-util/$(INPATH)/misc/build/apr-util-1.5.4/strmatch/apr_strmatch \
89+	apr-util/$(INPATH)/misc/build/apr-util-1.5.4/uri/apr_uri \
90+	apr-util/$(INPATH)/misc/build/apr-util-1.5.4/xlate/xlate \
91+	apr-util/$(INPATH)/misc/build/apr-util-1.5.4/xml/apr_xml \
92+))
93+
94+# vim: set noet sw=4 ts=4:
95--- misc/apr-util-1.5.4/Makefile	2012-01-05 14:49:40.420212900 +0100
96+++ misc/build/apr-util-1.5.4/Makefile	2012-01-05 14:47:07.827485100 +0100
97@@ -1 +1,32 @@
98-dummy
99+#/**************************************************************
100+# *
101+# * Licensed to the Apache Software Foundation (ASF) under one
102+# * or more contributor license agreements.  See the NOTICE file
103+# * distributed with this work for additional information
104+# * regarding copyright ownership.  The ASF licenses this file
105+# * to you under the Apache License, Version 2.0 (the
106+# * "License"); you may not use this file except in compliance
107+# * with the License.  You may obtain a copy of the License at
108+# *
109+# *   http://www.apache.org/licenses/LICENSE-2.0
110+# *
111+# * Unless required by applicable law or agreed to in writing,
112+# * software distributed under the License is distributed on an
113+# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
114+# * KIND, either express or implied.  See the License for the
115+# * specific language governing permissions and limitations
116+# * under the License.
117+# *
118+# *************************************************************/
119+
120+ifeq ($(strip $(SOLARENV)),)
121+$(error No environment set!)
122+endif
123+
124+gb_PARTIALBUILD := T
125+GBUILDDIR := $(SOLARENV)/gbuild
126+include $(GBUILDDIR)/gbuild.mk
127+
128+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
129+
130+# vim: set noet sw=4 ts=4:
131--- misc/apr-util-1.5.4/Module_apr-util.mk	2012-01-05 14:49:40.476216100 +0100
132+++ misc/build/apr-util-1.5.4/Module_apr-util.mk	2012-01-05 14:47:42.567472100 +0100
133@@ -1 +1,29 @@
134-dummy
135+#/**************************************************************
136+# *
137+# * Licensed to the Apache Software Foundation (ASF) under one
138+# * or more contributor license agreements.  See the NOTICE file
139+# * distributed with this work for additional information
140+# * regarding copyright ownership.  The ASF licenses this file
141+# * to you under the Apache License, Version 2.0 (the
142+# * "License"); you may not use this file except in compliance
143+# * with the License.  You may obtain a copy of the License at
144+# *
145+# *   http://www.apache.org/licenses/LICENSE-2.0
146+# *
147+# * Unless required by applicable law or agreed to in writing,
148+# * software distributed under the License is distributed on an
149+# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
150+# * KIND, either express or implied.  See the License for the
151+# * specific language governing permissions and limitations
152+# * under the License.
153+# *
154+# *************************************************************/
155+
156+$(eval $(call gb_Module_Module,apr-util))
157+
158+$(eval $(call gb_Module_add_targets,apr-util,\
159+	Library_apr-util \
160+	Package_inc \
161+))
162+
163+# vim: set noet ts=4 sw=4:
164--- misc/apr-util-1.5.4/Package_inc.mk	2012-01-05 14:49:40.585222300 +0100
165+++ misc/build/apr-util-1.5.4/Package_inc.mk	2012-01-05 14:47:51.616989700 +0100
166@@ -1 +1,32 @@
167-dummy
168+#/**************************************************************
169+# *
170+# * Licensed to the Apache Software Foundation (ASF) under one
171+# * or more contributor license agreements.  See the NOTICE file
172+# * distributed with this work for additional information
173+# * regarding copyright ownership.  The ASF licenses this file
174+# * to you under the Apache License, Version 2.0 (the
175+# * "License"); you may not use this file except in compliance
176+# * with the License.  You may obtain a copy of the License at
177+# *
178+# *   http://www.apache.org/licenses/LICENSE-2.0
179+# *
180+# * Unless required by applicable law or agreed to in writing,
181+# * software distributed under the License is distributed on an
182+# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
183+# * KIND, either express or implied.  See the License for the
184+# * specific language governing permissions and limitations
185+# * under the License.
186+# *
187+# *************************************************************/
188+
189+$(eval $(call gb_Package_Package,apr-util_inc,$(EXT_LIBRARIES)/apr-util/$(INPATH)/misc/build/apr-util-1.5.4/include))
190+$(eval $(call gb_Package_add_files, apr-util_inc, inc/apr-util,        \
191+       apu.h                                                           \
192+       apr_uri.h                                                       \
193+       apr_date.h                                                      \
194+       apr_uuid.h                                                      \
195+       apr_md5.h                                                       \
196+       apr_xlate.h                                                     \
197+       apr_base64.h                                                    \
198+))
199+
200