Bug 185691 - net/sobby: Fix build with clang
Summary: net/sobby: Fix build with clang
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Antoine Brodin
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-01-12 18:40 UTC by tkato432
Modified: 2014-01-14 20:00 UTC (History)
0 users

See Also:


Attachments
file.diff (2.75 KB, patch)
2014-01-12 18:40 UTC, tkato432
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description tkato432 2014-01-12 18:40:00 UTC
- Fix build with clang

New file:
files/patch-inc__config.hpp
Comment 1 Antoine Brodin freebsd_committer freebsd_triage 2014-01-14 19:18:06 UTC
Responsible Changed
From-To: freebsd-ports-bugs->antoine

Take
Comment 2 dfilter service freebsd_committer freebsd_triage 2014-01-14 19:51:06 UTC
Author: antoine
Date: Tue Jan 14 19:50:57 2014
New Revision: 339710
URL: http://svnweb.freebsd.org/changeset/ports/339710
QAT: https://qat.redports.org/buildarchive/r339710/

Log:
  - Fix build with clang
  - Stage support
  
  PR:		ports/185691
  Submitted by:	KATO Tsuguru

Added:
  head/net/sobby/files/
  head/net/sobby/files/patch-inc__config.hpp   (contents, props changed)
Modified:
  head/net/sobby/Makefile

Modified: head/net/sobby/Makefile
==============================================================================
--- head/net/sobby/Makefile	Tue Jan 14 19:00:09 2014	(r339709)
+++ head/net/sobby/Makefile	Tue Jan 14 19:50:57 2014	(r339710)
@@ -7,30 +7,23 @@ CATEGORIES=	net
 MASTER_SITES=	http://releases.0x539.de/sobby/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A standalone obby server
+COMMENT=	Standalone obby server
 
 LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	sigc-2.0.0:${PORTSDIR}/devel/libsigc++20 \
-		obby-0.4.1:${PORTSDIR}/devel/obby \
-		net6-1.3.0:${PORTSDIR}/net/net6 \
-		xml++-2.6.2:${PORTSDIR}/textproc/libxml++26 \
-		glibmm-2.4.1:${PORTSDIR}/devel/glibmm
+LIB_DEPENDS=	libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20 \
+		libobby-0.4.so:${PORTSDIR}/devel/obby \
+		libnet6-1.3.so:${PORTSDIR}/net/net6 \
+		libxml++-2.6.so:${PORTSDIR}/textproc/libxml++26
 
 USES=		pkgconfig
+USE_GNOME=	glibmm
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-zeroconf
 
-MAN1=		${PORTNAME}.1
-PLIST_FILES=	bin/${PORTNAME}
-
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-NO_STAGE=	yes
-do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MANPREFIX}/man/man1
+PLIST_FILES=	bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
 
 .include <bsd.port.mk>

Added: head/net/sobby/files/patch-inc__config.hpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/sobby/files/patch-inc__config.hpp	Tue Jan 14 19:50:57 2014	(r339710)
@@ -0,0 +1,62 @@
+--- inc/config.hpp.orig
++++ inc/config.hpp
+@@ -30,6 +30,30 @@
+ #include <libxml++/nodes/element.h>
+ #include <libxml++/nodes/textnode.h>
+ 
++namespace serialise
++{
++
++template<>
++class default_context_to<Glib::ustring>: public context_base_to<Glib::ustring>
++{
++public:
++	typedef Glib::ustring data_type;
++
++	virtual std::string to_string(const data_type& from) const;
++};
++
++template<>
++class default_context_from<Glib::ustring>:
++	public context_base_from<Glib::ustring>
++{
++public:
++	typedef Glib::ustring data_type;
++
++	virtual data_type from_string(const std::string& from) const;
++};
++
++} // namespace serialise
++
+ namespace Sobby
+ {
+ 
+@@ -434,28 +458,4 @@
+ 
+ } // namespace Sobby
+ 
+-namespace serialise
+-{
+-
+-template<>
+-class default_context_to<Glib::ustring>: public context_base_to<Glib::ustring>
+-{
+-public:
+-	typedef Glib::ustring data_type;
+-
+-	virtual std::string to_string(const data_type& from) const;
+-};
+-
+-template<>
+-class default_context_from<Glib::ustring>:
+-	public context_base_from<Glib::ustring>
+-{
+-public:
+-	typedef Glib::ustring data_type;
+-
+-	virtual data_type from_string(const std::string& from) const;
+-};
+-
+-} // namespace serialise
+-
+ #endif // _SOBBY_CONFIG_HPP_
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 3 dfilter service freebsd_committer freebsd_triage 2014-01-14 19:52:54 UTC
Author: antoine
Date: Tue Jan 14 19:52:42 2014
New Revision: 339711
URL: http://svnweb.freebsd.org/changeset/ports/339711
QAT: https://qat.redports.org/buildarchive/r339711/

Log:
  MFH: r339710
  
  - Fix build with clang
  - Stage support
  
  PR:		ports/185691
  Submitted by:	KATO Tsuguru
  Approved by:	portmgr (implicit)

Added:
  branches/2014Q1/net/sobby/files/
     - copied from r339710, head/net/sobby/files/
Modified:
  branches/2014Q1/net/sobby/Makefile
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/net/sobby/Makefile
==============================================================================
--- branches/2014Q1/net/sobby/Makefile	Tue Jan 14 19:50:57 2014	(r339710)
+++ branches/2014Q1/net/sobby/Makefile	Tue Jan 14 19:52:42 2014	(r339711)
@@ -7,30 +7,23 @@ CATEGORIES=	net
 MASTER_SITES=	http://releases.0x539.de/sobby/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A standalone obby server
+COMMENT=	Standalone obby server
 
 LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	sigc-2.0.0:${PORTSDIR}/devel/libsigc++20 \
-		obby-0.4.1:${PORTSDIR}/devel/obby \
-		net6-1.3.0:${PORTSDIR}/net/net6 \
-		xml++-2.6.2:${PORTSDIR}/textproc/libxml++26 \
-		glibmm-2.4.1:${PORTSDIR}/devel/glibmm
+LIB_DEPENDS=	libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20 \
+		libobby-0.4.so:${PORTSDIR}/devel/obby \
+		libnet6-1.3.so:${PORTSDIR}/net/net6 \
+		libxml++-2.6.so:${PORTSDIR}/textproc/libxml++26
 
 USES=		pkgconfig
+USE_GNOME=	glibmm
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-zeroconf
 
-MAN1=		${PORTNAME}.1
-PLIST_FILES=	bin/${PORTNAME}
-
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-NO_STAGE=	yes
-do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MANPREFIX}/man/man1
+PLIST_FILES=	bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
 
 .include <bsd.port.mk>
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 4 Antoine Brodin freebsd_committer freebsd_triage 2014-01-14 19:52:57 UTC
State Changed
From-To: open->closed

Patch committed to head and 2014Q1 branch, thanks!