svn commit: r460812 - in head/textproc/opensp: . files
Guido Falsi
madpilot at FreeBSD.org
Sat Feb 3 13:36:45 UTC 2018
Author: madpilot
Date: Sat Feb 3 13:36:44 2018
New Revision: 460812
URL: https://svnweb.freebsd.org/changeset/ports/460812
Log:
- Fix opensp build with clang 6
- While here convert to USES=localbase
PR: 225307
Submitted by: me
Approved by: Maintainer timeout
Added:
head/textproc/opensp/files/patch-include_IList.h (contents, props changed)
head/textproc/opensp/files/patch-include_IListIter.h (contents, props changed)
head/textproc/opensp/files/patch-include_Ptr.h (contents, props changed)
head/textproc/opensp/files/patch-lib_Parser.h (contents, props changed)
Modified:
head/textproc/opensp/Makefile
head/textproc/opensp/files/patch-configure
Modified: head/textproc/opensp/Makefile
==============================================================================
--- head/textproc/opensp/Makefile Sat Feb 3 13:35:04 2018 (r460811)
+++ head/textproc/opensp/Makefile Sat Feb 3 13:36:44 2018 (r460812)
@@ -15,14 +15,12 @@ LICENSE_NAME= License of James Clark's Software
LICENSE_FILE= ${WRKSRC}/COPYING
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-USES= gmake iconv libtool perl5
+USES= gmake iconv libtool localbase perl5
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-default-catalog=${PREFIX}/share/sgml/catalog \
--datadir=${PREFIX}/share/sgml/openjade \
--disable-doc-build
-LDFLAGS+= -L${LOCALBASE}/lib
-CFLAGS+= -I${LOCALBASE}/include
OPTIONS_DEFINE= DOCS NLS
OPTIONS_SUB= yes
Modified: head/textproc/opensp/files/patch-configure
==============================================================================
--- head/textproc/opensp/files/patch-configure Sat Feb 3 13:35:04 2018 (r460811)
+++ head/textproc/opensp/files/patch-configure Sat Feb 3 13:36:44 2018 (r460812)
@@ -1,6 +1,269 @@
--- configure.orig 2005-12-23 14:15:56 UTC
+++ configure
-@@ -26441,12 +26441,12 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -2885,149 +2885,6 @@ echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+ CC="$CC $ac_cv_prog_cc_stdc" ;;
+ esac
+
+-# Some people use a C++ compiler to compile C. Since we use `exit',
+-# in C++ we need to declare it. In case someone uses the same compiler
+-# for both compiling C and C++ we need to have the C++ compiler decide
+-# the declaration of exit, since it's the most demanding environment.
+-cat >conftest.$ac_ext <<_ACEOF
+-#ifndef __cplusplus
+- choke me
+-#endif
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- for ac_declaration in \
+- '' \
+- 'extern "C" void std::exit (int) throw (); using std::exit;' \
+- 'extern "C" void std::exit (int); using std::exit;' \
+- 'extern "C" void exit (int) throw ();' \
+- 'extern "C" void exit (int);' \
+- 'void exit (int);'
+-do
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_declaration
+-#include <stdlib.h>
+-int
+-main ()
+-{
+-exit (42);
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- :
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-continue
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_declaration
+-int
+-main ()
+-{
+-exit (42);
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- break
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-done
+-rm -f conftest*
+-if test -n "$ac_declaration"; then
+- echo '#ifdef __cplusplus' >>confdefs.h
+- echo $ac_declaration >>confdefs.h
+- echo '#endif' >>confdefs.h
+-fi
+-
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -3685,112 +3542,7 @@ else
+ CXXFLAGS=
+ fi
+ fi
+-for ac_declaration in \
+- '' \
+- 'extern "C" void std::exit (int) throw (); using std::exit;' \
+- 'extern "C" void std::exit (int); using std::exit;' \
+- 'extern "C" void exit (int) throw ();' \
+- 'extern "C" void exit (int);' \
+- 'void exit (int);'
+-do
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_declaration
+-#include <stdlib.h>
+-int
+-main ()
+-{
+-exit (42);
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- :
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+
+-continue
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_declaration
+-int
+-main ()
+-{
+-exit (42);
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- break
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-done
+-rm -f conftest*
+-if test -n "$ac_declaration"; then
+- echo '#ifdef __cplusplus' >>confdefs.h
+- echo $ac_declaration >>confdefs.h
+- echo '#endif' >>confdefs.h
+-fi
+-
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -26441,12 +26193,12 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <libintl.h>
extern int _nl_msg_cat_cntr;
Added: head/textproc/opensp/files/patch-include_IList.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/textproc/opensp/files/patch-include_IList.h Sat Feb 3 13:36:44 2018 (r460812)
@@ -0,0 +1,13 @@
+--- include/IList.h.orig 2005-07-21 14:04:38 UTC
++++ include/IList.h
+@@ -26,8 +26,8 @@ class IList : private IListBase { (public)
+ void swap(IList<T> &list) { IListBase::swap(list); }
+ T *head() const { return (T *)IListBase::head(); }
+ T *get() { return (T *)IListBase::get(); }
+- IListBase::clear;
+- IListBase::empty;
++ using IListBase::clear;
++ using IListBase::empty;
+ friend class IListIter<T>;
+ private:
+ IList(const IList<T> &); // undefined
Added: head/textproc/opensp/files/patch-include_IListIter.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/textproc/opensp/files/patch-include_IListIter.h Sat Feb 3 13:36:44 2018 (r460812)
@@ -0,0 +1,13 @@
+--- include/IListIter.h.orig 2005-07-21 14:04:38 UTC
++++ include/IListIter.h
+@@ -17,8 +17,8 @@ class IListIter : private IListIterBase { (public)
+ IListIter(const IList<T> &list) : IListIterBase(list) { }
+ T *cur() const { return (T *)IListIterBase::cur(); }
+
+- IListIterBase::next;
+- IListIterBase::done;
++ using IListIterBase::next;
++ using IListIterBase::done;
+ };
+
+ #ifdef SP_NAMESPACE
Added: head/textproc/opensp/files/patch-include_Ptr.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/textproc/opensp/files/patch-include_Ptr.h Sat Feb 3 13:36:44 2018 (r460812)
@@ -0,0 +1,13 @@
+--- include/Ptr.h.orig 2005-07-21 14:04:39 UTC
++++ include/Ptr.h
+@@ -69,8 +69,8 @@ class ConstPtr : private Ptr<T> { (public)
+ const T *operator->() const { return Ptr<T>::pointer(); }
+ const T &operator*() const { return *Ptr<T>::pointer(); }
+ void swap(ConstPtr<T> &p) { Ptr<T>::swap(p); }
+- Ptr<T>::isNull;
+- Ptr<T>::clear;
++ using Ptr<T>::isNull;
++ using Ptr<T>::clear;
+ Boolean operator==(const Ptr<T> &p) const { return Ptr<T>::operator==(p); }
+ Boolean operator!=(const Ptr<T> &p) const { return Ptr<T>::operator!=(p); }
+ Boolean operator==(const ConstPtr<T> &p) const {
Added: head/textproc/opensp/files/patch-lib_Parser.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/textproc/opensp/files/patch-lib_Parser.h Sat Feb 3 13:36:44 2018 (r460812)
@@ -0,0 +1,29 @@
+--- lib/Parser.h.orig 2005-07-21 14:05:17 UTC
++++ lib/Parser.h
+@@ -62,16 +62,16 @@ class Parser : private ParserState { (public)
+ Parser(const SgmlParser::Params &);
+ Event *nextEvent();
+ void parseAll(EventHandler &, const volatile sig_atomic_t *cancelPtr);
+- ParserState::sdPointer;
+- ParserState::instanceSyntaxPointer;
+- ParserState::prologSyntaxPointer;
+- ParserState::activateLinkType;
+- ParserState::allLinkTypesActivated;
+- ParserState::entityManager;
+- ParserState::entityCatalog;
+- ParserState::baseDtd;
+- ParserState::options;
+- ParserState::instantiateDtd;
++ using ParserState::sdPointer;
++ using ParserState::instanceSyntaxPointer;
++ using ParserState::prologSyntaxPointer;
++ using ParserState::activateLinkType;
++ using ParserState::allLinkTypesActivated;
++ using ParserState::entityManager;
++ using ParserState::entityCatalog;
++ using ParserState::baseDtd;
++ using ParserState::options;
++ using ParserState::instantiateDtd;
+ friend class PiAttspecParser;
+ private:
+ Parser(const Parser &); // undefined
More information about the svn-ports-head
mailing list