Date: Tue, 30 Apr 2013 02:24:09 +0000 (UTC) From: Martin Wilke <miwi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r316868 - in head/net-p2p/solidcoin: . files Message-ID: <201304300224.r3U2O9NP004821@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: miwi Date: Tue Apr 30 02:24:08 2013 New Revision: 316868 URL: http://svnweb.freebsd.org/changeset/ports/316868 Log: - Fix build PR: 177925 Submitted by: Ports Fury Added: head/net-p2p/solidcoin/files/ head/net-p2p/solidcoin/files/patch-uibase.cpp (contents, props changed) Modified: head/net-p2p/solidcoin/Makefile Modified: head/net-p2p/solidcoin/Makefile ============================================================================== --- head/net-p2p/solidcoin/Makefile Tue Apr 30 02:22:56 2013 (r316867) +++ head/net-p2p/solidcoin/Makefile Tue Apr 30 02:24:08 2013 (r316868) @@ -3,74 +3,83 @@ PORTNAME= solidcoin PORTVERSION= 2.041 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-p2p finance -MASTER_SITES= http://solidcoin.info/downloads/ \ +MASTER_SITES= http://downloads.solidcoin.info/ \ http://dl.dropbox.com/u/47582909/ -DISTNAME= ${PORTNAME}-source-2041 +DISTNAME= ${PORTNAME}-source-${PORTVERSION:S/.//g} MAINTAINER= ports@FreeBSD.org COMMENT= Alternative Bitcoin peer-to-peer currency client -BROKEN= Does not build +LICENSE= MIT BUILD_DEPENDS= ${LOCALBASE}/include/boost/graph/parallel/algorithm.hpp:${PORTSDIR}/devel/boost-libs LIB_DEPENDS= boost_date_time:${PORTSDIR}/devel/boost-libs -OPTIONS_DEFINE= WXGTK X11 -OPTIONS_DEFAULT= WXGTK X11 +OPTIONS_DEFINE= WXGTK +OPTIONS_DEFAULT= WXGTK + +WRKSRC= ${WRKDIR}/src USE_ZIP= yes -USE_GMAKE= yes +USE_DOS2UNIX= yes +USE_GNOME= glib20 USE_OPENSSL= yes USE_BDB= yes WANT_BDB_VER= 47 +USE_GCC= any +USE_GMAKE= yes +ALL_TARGET= ${BINARY} MAKE_JOBS_SAFE= yes -CXXFLAGS+= -I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} -CXXFLAGS+= -L${LOCALBASE}/lib -L${BDB_LIB_DIR} CXXFLAGS+= -Wno-invalid-offsetof +CPPFLAGS+= -I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include +LDFLAGS+= -L${BDB_LIB_DIR} -L${LOCALBASE}/lib -WRKSRC= ${WRKDIR}/src +PLIST_FILES= bin/${BINARY} .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MWXGTK} && ${PORT_OPTIONS:MX11} +.if ${PORT_OPTIONS:MWXGTK} USE_WX= 2.9 -DESKTOP_ENTRIES="Solidcoin" "${COMMENT}" "" "${PORTNAME}" "" "true" - -WX_CONFIG= ${LOCALBASE}/bin/wxgtk2u-2.9-config +WX_UNICODE= yes +PLIST_FILES+= share/pixmaps/solidcoin48.xpm +DESKTOP_ENTRIES="SolidCoin" "" "${PREFIX}/share/pixmaps/solidcoin48.xpm" \ + "${PORTNAME}" "" true BINARY= solidcoin .else -USE_GNOME= glib20 - BINARY= solidcoind -ALL_TARGET= ${BINARY} .endif -PLIST_FILES= bin/${BINARY} - -post-extract: - @${CP} ${WRKSRC}/../build/makefile.unix ${WRKSRC}/Makefile - post-patch: .for i in crypto gui nogui - @${MKDIR} ${WRKSRC}/../obj/$i + @${MKDIR} ${WRKSRC}/../obj/${i} .endfor - @echo '18i\' > ${WRKSRC}/sed.in - @echo '#ifndef __STDC_LIMIT_MACROS' >> ${WRKSRC}/sed.in - @echo '19i\' >> ${WRKSRC}/sed.in - @echo '#endif' >> ${WRKSRC}/sed.in + @${ECHO_CMD} '18i\' > ${WRKDIR}/sed.in + @${ECHO_CMD} '#ifndef __STDC_LIMIT_MACROS' >> ${WRKDIR}/sed.in + @${ECHO_CMD} '19i\' >> ${WRKDIR}/sed.in + @${ECHO_CMD} '#endif' >> ${WRKDIR}/sed.in @${REINPLACE_CMD} \ - -f ${WRKSRC}/sed.in \ + -f ${WRKDIR}/sed.in \ ${WRKSRC}/headers.h - @${REINPLACE_CMD} \ - -e 's|^CXXFLAGS=.*$$|CXXFLAGS += $$(DEFS)|' \ - -e '/-l dl/d' \ - -e 's|../../wxWidgets-2.9.2/wx-config|${WX_CONFIG}|' \ - ${WRKSRC}/Makefile + +do-configure: + @cd ${WRKSRC} && ${SED} -e \ + 's|^CXX=|CXX?=| ; \ + s|shell .* |shell $$(WX_CONFIG) | ; \ + s|-Wl,-Bstatic|| ; ; \ + s|-Wl,-Bdynamic|| ; \ + /-l dl/d ; \ + s|-l pthread|$$(LDFLAGS)|; \ + s|^CXXFLAGS=-O2|CXXFLAGS+=$$(CPPFLAGS)|' \ + < ../build/makefile.unix > Makefile + do-install: - @${MKDIR} ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/${BINARY} ${PREFIX}/bin/ + (cd ${WRKSRC} && ${INSTALL_PROGRAM} ${BINARY} ${PREFIX}/bin) +.if ${PORT_OPTIONS:MWXGTK} + (cd ${WRKSRC}/../share/xpm && ${INSTALL_DATA} solidcoin48.xpm \ + ${PREFIX}/share/pixmaps) +.endif .include <bsd.port.mk> Added: head/net-p2p/solidcoin/files/patch-uibase.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/solidcoin/files/patch-uibase.cpp Tue Apr 30 02:24:08 2013 (r316868) @@ -0,0 +1,20 @@ +--- uibase.cpp.orig ++++ uibase.cpp +@@ -139,7 +139,7 @@ + + m_WalletSelect = new wxComboBox(this, wxID_ANY, wxEmptyString,wxDefaultPosition,wxDefaultSize,0,0,wxCB_READONLY); + m_WalletSelect->SetToolTip(wxT("Change your wallet to view other transactions and address books")); +- wxFont font2(15, wxFONTFAMILY_TELETYPE, wxNORMAL, wxBOLD); ++ wxFont font2(15, wxFONTFAMILY_TELETYPE, wxNORMAL, wxBOLD, false, wxEmptyString, wxFONTENCODING_DEFAULT); + m_WalletSelect->SetFont(font2); + + +@@ -162,7 +162,7 @@ + wxBoxSizer* bSizer66; + bSizer66 = new wxBoxSizer( wxHORIZONTAL ); + +- wxFont font3(12, wxFONTFAMILY_DEFAULT, wxNORMAL, wxNORMAL); ++ wxFont font3(12, wxFONTFAMILY_DEFAULT, wxNORMAL, wxNORMAL, false, wxEmptyString, wxFONTENCODING_DEFAULT); + m_toolBar = new wxToolBar(this, wxID_ANY ,wxDefaultPosition,wxDefaultSize,wxTB_TEXT|wxTB_HORZ_LAYOUT |wxTB_FLAT ); + + m_toolBar->SetToolBitmapSize( wxSize( 20,20 ) );
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304300224.r3U2O9NP004821>