diff options
| author | fjoe <fjoe@FreeBSD.org> | 2005-02-09 00:17:27 +0800 |
|---|---|---|
| committer | fjoe <fjoe@FreeBSD.org> | 2005-02-09 00:17:27 +0800 |
| commit | e295cc70ef1a678ddcce475831011eec0e6210ac (patch) | |
| tree | 1518905940f5e476589812ba43f1a7ebb6770a04 /devel/cvsnt | |
| parent | 5559cd3f69d00f1873a794d0b08fafd45247d041 (diff) | |
| download | freebsd-ports-gnome-e295cc70ef1a678ddcce475831011eec0e6210ac.tar.gz freebsd-ports-gnome-e295cc70ef1a678ddcce475831011eec0e6210ac.tar.zst freebsd-ports-gnome-e295cc70ef1a678ddcce475831011eec0e6210ac.zip | |
- Fix build with gcc 2.95.x (with old STL).
- Bump PORTREVISION.
Diffstat (limited to 'devel/cvsnt')
| -rw-r--r-- | devel/cvsnt/Makefile | 3 | ||||
| -rw-r--r-- | devel/cvsnt/files/patch-src-cvs.h | 27 | ||||
| -rw-r--r-- | devel/cvsnt/files/patch-xmlapi-xmlapi.cpp | 32 |
3 files changed, 61 insertions, 1 deletions
diff --git a/devel/cvsnt/Makefile b/devel/cvsnt/Makefile index 25d45c652a8f..00edb765a36c 100644 --- a/devel/cvsnt/Makefile +++ b/devel/cvsnt/Makefile @@ -7,7 +7,7 @@ PORTNAME= cvsnt PORTVERSION= 2.0.58d -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= http://www.cvsnt.org/archive/ @@ -26,6 +26,7 @@ USE_ICONV= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" +LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2 MAN1= cvs.1 MAN5= cvs.5 diff --git a/devel/cvsnt/files/patch-src-cvs.h b/devel/cvsnt/files/patch-src-cvs.h new file mode 100644 index 000000000000..824fb8428435 --- /dev/null +++ b/devel/cvsnt/files/patch-src-cvs.h @@ -0,0 +1,27 @@ +--- src/cvs.h.orig Tue Feb 8 21:53:19 2005 ++++ src/cvs.h Tue Feb 8 21:59:05 2005 +@@ -1159,8 +1159,14 @@ + + namespace cvs + { ++#if defined(__GNUC__) && (__GNUC__ < 3) ++typedef string_char_traits<char> char_traits_base; ++#else ++typedef std::char_traits<char> char_traits_base; ++#endif ++ + /* Define traits for the filenames and usernames in c++ */ +- struct filename_char_traits : public std::char_traits<char> ++ struct filename_char_traits : public char_traits_base + { + static bool eq( char c1, char c2 ) { return FOLD_FN_CHAR(c1) == FOLD_FN_CHAR(c2); } + static bool ne( char c1, char c2 ) { return FOLD_FN_CHAR(c1) != FOLD_FN_CHAR(c2); } +@@ -1169,7 +1175,7 @@ + static const char*find( const char* s, int n, char a ) { while( n-- > 0 && FOLD_FN_CHAR(*s) != FOLD_FN_CHAR(a) ) { ++s; } return s; } + }; + +- struct username_char_traits : public std::char_traits<char> ++ struct username_char_traits : public char_traits_base + { + static bool eq( char c1, char c2 ) { return FOLD_UN_CHAR(c1) == FOLD_UN_CHAR(c2); } + static bool ne( char c1, char c2 ) { return FOLD_UN_CHAR(c1) != FOLD_UN_CHAR(c2); } diff --git a/devel/cvsnt/files/patch-xmlapi-xmlapi.cpp b/devel/cvsnt/files/patch-xmlapi-xmlapi.cpp new file mode 100644 index 000000000000..4b5280eb37a2 --- /dev/null +++ b/devel/cvsnt/files/patch-xmlapi-xmlapi.cpp @@ -0,0 +1,32 @@ +--- xmlapi/xmlapi.cpp.orig Tue Feb 8 21:27:08 2005 ++++ xmlapi/xmlapi.cpp Tue Feb 8 21:26:30 2005 +@@ -41,7 +41,7 @@ + else n->value=""; + n->Parent=this; + if(n->XmlType==XmlTypeNode) +- n->Parent->value.clear(); /* We don't support mixing trees and labels... this also papers over a small quirk in the loading routine */ ++ n->Parent->value.erase(); /* We don't support mixing trees and labels... this also papers over a small quirk in the loading routine */ + return n; + } + +@@ -365,7 +365,7 @@ + + bool XmlNode::BatchDelete() + { +- name.clear(); /* Having no name marks the tag for deletion */ ++ name.erase(); /* Having no name marks the tag for deletion */ + return true; + } + +@@ -374,6 +374,11 @@ + static bool operator==(std::pair<const std::string,XmlNode>& a,XmlNode *b) + { + return &a.second == b; ++} ++ ++static bool operator!=(std::pair<const std::string,XmlNode>& a,XmlNode *b) ++{ ++ return &a.second != b; + } + + XmlNode::ChildArray_t::iterator XmlNode::FindIterator(XmlNode *node) |