svn commit: r410679 - in head/sysutils: . freefilesync freefilesync/files
Kevin Lo
kevlo at FreeBSD.org
Wed Mar 9 15:27:19 UTC 2016
On Wed, Mar 09, 2016 at 06:18:23AM +0000, Alexey Dokuchaev wrote:
>
> On Wed, Mar 09, 2016 at 02:21:21AM +0000, Kevin Lo wrote:
> > New Revision: 410679
> > URL: https://svnweb.freebsd.org/changeset/ports/410679
> >
> > Log:
> > Import freefilesync 7.9.
>
> It was proposed earlier, but dropped due to several reasons, you might be
> interested: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=198512.
Thanks. I didn't notice that Yuri had attempted to create this port.
> > [...]
> > +USE_WX= 3.0+
> > +WX_UNICODE= yes
>
> Isn't WX_UNICODE=yes default now with 3.0+?
Yes.
> > +post-patch:
> > + @${REINPLACE_CMD} -e 's/wx-config/${WX_CONFIG:T}/' \
> > + -e 's,g++,${CXX},' ${WRKSRC}/Makefile
> > ...
> > Added: head/sysutils/freefilesync/files/patch-Makefile
> > ==============================================================================
> > --- /dev/null 00:00:00 1970 (empty, because file is newly added)
> > +++ head/sysutils/freefilesync/files/patch-Makefile Wed Mar 9 02:21:21 2016 (r410679)
> > @@ -0,0 +1,51 @@
> > +--- Makefile.orig 2016-03-09 02:07:44 UTC
> > ++++ Makefile
> > +@@ -1,14 +1,14 @@
> > + APPNAME = FreeFileSync
> > +-prefix = /usr
> > ++prefix = $(PREFIX)
> > + BINDIR = $(DESTDIR)$(prefix)/bin
> > + SHAREDIR = $(DESTDIR)$(prefix)/share
> > + APPSHAREDIR = $(SHAREDIR)/$(APPNAME)
> > + DOCSHAREDIR = $(SHAREDIR)/doc/$(APPNAME)
> > +
> > + CXXFLAGS = -std=c++14 -pipe -DWXINTL_NO_GETTEXT_MACRO -I../.. -I../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" -Wall \
> > +--O3 -DNDEBUG `wx-config --cxxflags --debug=no` -DZEN_LINUX -pthread
> > ++-O3 -DNDEBUG `wxgtk2u-3.0-config --cxxflags --debug=no` -DZEN_LINUX -pthread
>
> Something got wrong here: wx-config is patched via above sed(1) command, but
> somehow it got sneaked into the patch. Also -O3 should've been removed from
> CXXFLAGS.
Fixed.
> The port is also missing compiler:c++1[14]-lang/USE_CXXSTD=c++1[14] knobs as
> suggested by the above line (and typically required for all wx-3.0 based
> software), and thus might be broken on e.g. FreeBSD 9.3.
Fixed.
> > + ../Obj/FFS_GCC_Make_Release/ffs/src/%.o : %.cpp
> > + mkdir -p $(dir $@)
> > +- g++ $(CXXFLAGS) -c $< -o $@
> > ++ c++ $(CXXFLAGS) -c $< -o $@
>
> Same here (c.f. "'s,g++,${CXX},' ${WRKSRC}/Makefile" above).
Fixed.
> > + #elif defined ZEN_LINUX
> > +- #include <sys/vfs.h> //statfs
> > ++ #include <sys/mount.h> //statfs
>
> In the following commit, you add another sed(1) command to patch these as
> well if I recall correctly.
>
> > + int rv = ::system(command.c_str()); //do NOT use std::system as its documentation says nothing about "WEXITSTATUS(rv)", ect...
> > +- if (rv == -1 || WEXITSTATUS(rv) == 127) //http://linux.die.net/man/3/system "In case /bin/sh could not be executed, the exit status will be that of a command that does exit(127)"
> > ++ if (rv == -1 ) //http://linux.die.net/man/3/system "In case /bin/sh could not be executed, the exit status will be that of a command that does exit(127)"
>
> Ditto.
>
> > +- if (::clock_gettime(CLOCK_MONOTONIC_RAW, &now) != 0) //CLOCK_MONOTONIC measures time reliably across processors!
> > ++ if (::clock_gettime(CLOCK_MONOTONIC, &now) != 0) //CLOCK_MONOTONIC measures time reliably across processors!
>
> Ditto.
>
> ./danfe
Kevin
More information about the svn-ports-head
mailing list