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

(-)textproc/opensp/Makefile (-3 / +1 lines)
Lines 15-28 Link Here
15
LICENSE_FILE=	${WRKSRC}/COPYING
15
LICENSE_FILE=	${WRKSRC}/COPYING
16
LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
16
LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
17
17
18
USES=		gmake iconv libtool perl5
18
USES=		gmake iconv libtool localbase perl5
19
USE_LDCONFIG=	yes
19
USE_LDCONFIG=	yes
20
GNU_CONFIGURE=	yes
20
GNU_CONFIGURE=	yes
21
CONFIGURE_ARGS=	--enable-default-catalog=${PREFIX}/share/sgml/catalog \
21
CONFIGURE_ARGS=	--enable-default-catalog=${PREFIX}/share/sgml/catalog \
22
		--datadir=${PREFIX}/share/sgml/openjade \
22
		--datadir=${PREFIX}/share/sgml/openjade \
23
		--disable-doc-build
23
		--disable-doc-build
24
LDFLAGS+=	-L${LOCALBASE}/lib
25
CFLAGS+=	-I${LOCALBASE}/include
26
24
27
OPTIONS_DEFINE=	DOCS NLS
25
OPTIONS_DEFINE=	DOCS NLS
28
OPTIONS_SUB=	yes
26
OPTIONS_SUB=	yes
(-)textproc/opensp/files/patch-configure (-1 / +264 lines)
Lines 1-6 Link Here
1
--- configure.orig	2005-12-23 14:15:56 UTC
1
--- configure.orig	2005-12-23 14:15:56 UTC
2
+++ configure
2
+++ configure
3
@@ -26441,12 +26441,12 @@ cat >>conftest.$ac_ext <<_ACEOF
3
@@ -2885,149 +2885,6 @@ echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
4
     CC="$CC $ac_cv_prog_cc_stdc" ;;
5
 esac
6
 
7
-# Some people use a C++ compiler to compile C.  Since we use `exit',
8
-# in C++ we need to declare it.  In case someone uses the same compiler
9
-# for both compiling C and C++ we need to have the C++ compiler decide
10
-# the declaration of exit, since it's the most demanding environment.
11
-cat >conftest.$ac_ext <<_ACEOF
12
-#ifndef __cplusplus
13
-  choke me
14
-#endif
15
-_ACEOF
16
-rm -f conftest.$ac_objext
17
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
18
-  (eval $ac_compile) 2>conftest.er1
19
-  ac_status=$?
20
-  grep -v '^ *+' conftest.er1 >conftest.err
21
-  rm -f conftest.er1
22
-  cat conftest.err >&5
23
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
24
-  (exit $ac_status); } &&
25
-	 { ac_try='test -z "$ac_c_werror_flag"
26
-			 || test ! -s conftest.err'
27
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
28
-  (eval $ac_try) 2>&5
29
-  ac_status=$?
30
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
31
-  (exit $ac_status); }; } &&
32
-	 { ac_try='test -s conftest.$ac_objext'
33
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
34
-  (eval $ac_try) 2>&5
35
-  ac_status=$?
36
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
37
-  (exit $ac_status); }; }; then
38
-  for ac_declaration in \
39
-   '' \
40
-   'extern "C" void std::exit (int) throw (); using std::exit;' \
41
-   'extern "C" void std::exit (int); using std::exit;' \
42
-   'extern "C" void exit (int) throw ();' \
43
-   'extern "C" void exit (int);' \
44
-   'void exit (int);'
45
-do
46
-  cat >conftest.$ac_ext <<_ACEOF
47
-/* confdefs.h.  */
48
-_ACEOF
49
-cat confdefs.h >>conftest.$ac_ext
50
-cat >>conftest.$ac_ext <<_ACEOF
51
-/* end confdefs.h.  */
52
-$ac_declaration
53
-#include <stdlib.h>
54
-int
55
-main ()
56
-{
57
-exit (42);
58
-  ;
59
-  return 0;
60
-}
61
-_ACEOF
62
-rm -f conftest.$ac_objext
63
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
64
-  (eval $ac_compile) 2>conftest.er1
65
-  ac_status=$?
66
-  grep -v '^ *+' conftest.er1 >conftest.err
67
-  rm -f conftest.er1
68
-  cat conftest.err >&5
69
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
70
-  (exit $ac_status); } &&
71
-	 { ac_try='test -z "$ac_c_werror_flag"
72
-			 || test ! -s conftest.err'
73
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
74
-  (eval $ac_try) 2>&5
75
-  ac_status=$?
76
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
77
-  (exit $ac_status); }; } &&
78
-	 { ac_try='test -s conftest.$ac_objext'
79
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
80
-  (eval $ac_try) 2>&5
81
-  ac_status=$?
82
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
83
-  (exit $ac_status); }; }; then
84
-  :
85
-else
86
-  echo "$as_me: failed program was:" >&5
87
-sed 's/^/| /' conftest.$ac_ext >&5
88
-
89
-continue
90
-fi
91
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
92
-  cat >conftest.$ac_ext <<_ACEOF
93
-/* confdefs.h.  */
94
-_ACEOF
95
-cat confdefs.h >>conftest.$ac_ext
96
-cat >>conftest.$ac_ext <<_ACEOF
97
-/* end confdefs.h.  */
98
-$ac_declaration
99
-int
100
-main ()
101
-{
102
-exit (42);
103
-  ;
104
-  return 0;
105
-}
106
-_ACEOF
107
-rm -f conftest.$ac_objext
108
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
109
-  (eval $ac_compile) 2>conftest.er1
110
-  ac_status=$?
111
-  grep -v '^ *+' conftest.er1 >conftest.err
112
-  rm -f conftest.er1
113
-  cat conftest.err >&5
114
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
115
-  (exit $ac_status); } &&
116
-	 { ac_try='test -z "$ac_c_werror_flag"
117
-			 || test ! -s conftest.err'
118
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
119
-  (eval $ac_try) 2>&5
120
-  ac_status=$?
121
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
122
-  (exit $ac_status); }; } &&
123
-	 { ac_try='test -s conftest.$ac_objext'
124
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
125
-  (eval $ac_try) 2>&5
126
-  ac_status=$?
127
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
128
-  (exit $ac_status); }; }; then
129
-  break
130
-else
131
-  echo "$as_me: failed program was:" >&5
132
-sed 's/^/| /' conftest.$ac_ext >&5
133
-
134
-fi
135
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
136
-done
137
-rm -f conftest*
138
-if test -n "$ac_declaration"; then
139
-  echo '#ifdef __cplusplus' >>confdefs.h
140
-  echo $ac_declaration      >>confdefs.h
141
-  echo '#endif'             >>confdefs.h
142
-fi
143
-
144
-else
145
-  echo "$as_me: failed program was:" >&5
146
-sed 's/^/| /' conftest.$ac_ext >&5
147
-
148
-fi
149
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
150
 ac_ext=c
151
 ac_cpp='$CPP $CPPFLAGS'
152
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
153
@@ -3685,112 +3542,7 @@ else
154
     CXXFLAGS=
155
   fi
156
 fi
157
-for ac_declaration in \
158
-   '' \
159
-   'extern "C" void std::exit (int) throw (); using std::exit;' \
160
-   'extern "C" void std::exit (int); using std::exit;' \
161
-   'extern "C" void exit (int) throw ();' \
162
-   'extern "C" void exit (int);' \
163
-   'void exit (int);'
164
-do
165
-  cat >conftest.$ac_ext <<_ACEOF
166
-/* confdefs.h.  */
167
-_ACEOF
168
-cat confdefs.h >>conftest.$ac_ext
169
-cat >>conftest.$ac_ext <<_ACEOF
170
-/* end confdefs.h.  */
171
-$ac_declaration
172
-#include <stdlib.h>
173
-int
174
-main ()
175
-{
176
-exit (42);
177
-  ;
178
-  return 0;
179
-}
180
-_ACEOF
181
-rm -f conftest.$ac_objext
182
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
183
-  (eval $ac_compile) 2>conftest.er1
184
-  ac_status=$?
185
-  grep -v '^ *+' conftest.er1 >conftest.err
186
-  rm -f conftest.er1
187
-  cat conftest.err >&5
188
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
189
-  (exit $ac_status); } &&
190
-	 { ac_try='test -z "$ac_cxx_werror_flag"
191
-			 || test ! -s conftest.err'
192
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
193
-  (eval $ac_try) 2>&5
194
-  ac_status=$?
195
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
196
-  (exit $ac_status); }; } &&
197
-	 { ac_try='test -s conftest.$ac_objext'
198
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
199
-  (eval $ac_try) 2>&5
200
-  ac_status=$?
201
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
202
-  (exit $ac_status); }; }; then
203
-  :
204
-else
205
-  echo "$as_me: failed program was:" >&5
206
-sed 's/^/| /' conftest.$ac_ext >&5
207
 
208
-continue
209
-fi
210
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
211
-  cat >conftest.$ac_ext <<_ACEOF
212
-/* confdefs.h.  */
213
-_ACEOF
214
-cat confdefs.h >>conftest.$ac_ext
215
-cat >>conftest.$ac_ext <<_ACEOF
216
-/* end confdefs.h.  */
217
-$ac_declaration
218
-int
219
-main ()
220
-{
221
-exit (42);
222
-  ;
223
-  return 0;
224
-}
225
-_ACEOF
226
-rm -f conftest.$ac_objext
227
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
228
-  (eval $ac_compile) 2>conftest.er1
229
-  ac_status=$?
230
-  grep -v '^ *+' conftest.er1 >conftest.err
231
-  rm -f conftest.er1
232
-  cat conftest.err >&5
233
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
234
-  (exit $ac_status); } &&
235
-	 { ac_try='test -z "$ac_cxx_werror_flag"
236
-			 || test ! -s conftest.err'
237
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
238
-  (eval $ac_try) 2>&5
239
-  ac_status=$?
240
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
241
-  (exit $ac_status); }; } &&
242
-	 { ac_try='test -s conftest.$ac_objext'
243
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
244
-  (eval $ac_try) 2>&5
245
-  ac_status=$?
246
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
247
-  (exit $ac_status); }; }; then
248
-  break
249
-else
250
-  echo "$as_me: failed program was:" >&5
251
-sed 's/^/| /' conftest.$ac_ext >&5
252
-
253
-fi
254
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
255
-done
256
-rm -f conftest*
257
-if test -n "$ac_declaration"; then
258
-  echo '#ifdef __cplusplus' >>confdefs.h
259
-  echo $ac_declaration      >>confdefs.h
260
-  echo '#endif'             >>confdefs.h
261
-fi
262
-
263
 ac_ext=c
264
 ac_cpp='$CPP $CPPFLAGS'
265
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
266
@@ -26441,12 +26193,12 @@ cat >>conftest.$ac_ext <<_ACEOF
4
 /* end confdefs.h.  */
267
 /* end confdefs.h.  */
5
 #include <libintl.h>
268
 #include <libintl.h>
6
 extern int _nl_msg_cat_cntr;
269
 extern int _nl_msg_cat_cntr;
(-)textproc/opensp/files/patch-include_IList.h (+13 lines)
Line 0 Link Here
1
--- include/IList.h.orig	2005-07-21 14:04:38 UTC
2
+++ include/IList.h
3
@@ -26,8 +26,8 @@ class IList : private IListBase { (public)
4
   void swap(IList<T> &list) { IListBase::swap(list); }
5
   T *head() const { return (T *)IListBase::head(); }
6
   T *get() { return (T *)IListBase::get(); }
7
-  IListBase::clear;
8
-  IListBase::empty;
9
+  using IListBase::clear;
10
+  using IListBase::empty;
11
 friend class IListIter<T>;
12
 private:
13
   IList(const IList<T> &);	// undefined
(-)textproc/opensp/files/patch-include_IListIter.h (+13 lines)
Line 0 Link Here
1
--- include/IListIter.h.orig	2005-07-21 14:04:38 UTC
2
+++ include/IListIter.h
3
@@ -17,8 +17,8 @@ class IListIter : private IListIterBase { (public)
4
   IListIter(const IList<T> &list) : IListIterBase(list) { }
5
   T *cur() const { return (T *)IListIterBase::cur(); }
6
   
7
-  IListIterBase::next;
8
-  IListIterBase::done;
9
+  using IListIterBase::next;
10
+  using IListIterBase::done;
11
 };
12
 
13
 #ifdef SP_NAMESPACE
(-)textproc/opensp/files/patch-include_Ptr.h (+13 lines)
Line 0 Link Here
1
--- include/Ptr.h.orig	2005-07-21 14:04:39 UTC
2
+++ include/Ptr.h
3
@@ -69,8 +69,8 @@ class ConstPtr : private Ptr<T> { (public)
4
   const T *operator->() const { return Ptr<T>::pointer(); }
5
   const T &operator*() const { return *Ptr<T>::pointer(); }
6
   void swap(ConstPtr<T> &p) { Ptr<T>::swap(p); }
7
-  Ptr<T>::isNull;
8
-  Ptr<T>::clear;
9
+  using Ptr<T>::isNull;
10
+  using Ptr<T>::clear;
11
   Boolean operator==(const Ptr<T> &p) const { return Ptr<T>::operator==(p); }
12
   Boolean operator!=(const Ptr<T> &p) const { return Ptr<T>::operator!=(p); }
13
   Boolean operator==(const ConstPtr<T> &p) const {
(-)textproc/opensp/files/patch-lib_Parser.h (+29 lines)
Line 0 Link Here
1
--- lib/Parser.h.orig	2005-07-21 14:05:17 UTC
2
+++ lib/Parser.h
3
@@ -62,16 +62,16 @@ class Parser : private ParserState {  (public)
4
   Parser(const SgmlParser::Params &);
5
   Event *nextEvent();
6
   void parseAll(EventHandler &, const volatile sig_atomic_t *cancelPtr);
7
-  ParserState::sdPointer;
8
-  ParserState::instanceSyntaxPointer;
9
-  ParserState::prologSyntaxPointer;
10
-  ParserState::activateLinkType;
11
-  ParserState::allLinkTypesActivated;
12
-  ParserState::entityManager;
13
-  ParserState::entityCatalog;
14
-  ParserState::baseDtd;
15
-  ParserState::options;
16
-  ParserState::instantiateDtd;
17
+  using ParserState::sdPointer;
18
+  using ParserState::instanceSyntaxPointer;
19
+  using ParserState::prologSyntaxPointer;
20
+  using ParserState::activateLinkType;
21
+  using ParserState::allLinkTypesActivated;
22
+  using ParserState::entityManager;
23
+  using ParserState::entityCatalog;
24
+  using ParserState::baseDtd;
25
+  using ParserState::options;
26
+  using ParserState::instantiateDtd;
27
   friend class PiAttspecParser;
28
 private:
29
   Parser(const Parser &);	// undefined

Return to bug 225307