diff options
| author | kevlo <kevlo@FreeBSD.org> | 2016-03-09 23:24:48 +0800 |
|---|---|---|
| committer | kevlo <kevlo@FreeBSD.org> | 2016-03-09 23:24:48 +0800 |
| commit | 14650ac948837ccd1494bfc17fa7833ce683f5c5 (patch) | |
| tree | cefe4082466befddf5cc01f7863128d9ef554c25 /sysutils | |
| parent | 3984aee4dcceb2076f68334e89b90019feb11441 (diff) | |
| download | freebsd-ports-gnome-14650ac948837ccd1494bfc17fa7833ce683f5c5.tar.gz freebsd-ports-gnome-14650ac948837ccd1494bfc17fa7833ce683f5c5.tar.zst freebsd-ports-gnome-14650ac948837ccd1494bfc17fa7833ce683f5c5.zip | |
- Add compiler:c++11-lang knob
- Clean up wx-config and g++ in the patch-Makefile
Spotted by: danfe
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/freefilesync/Makefile | 7 | ||||
| -rw-r--r-- | sysutils/freefilesync/files/patch-Makefile | 18 |
2 files changed, 12 insertions, 13 deletions
diff --git a/sysutils/freefilesync/Makefile b/sysutils/freefilesync/Makefile index dd9352934818..ca18a0986d0a 100644 --- a/sysutils/freefilesync/Makefile +++ b/sysutils/freefilesync/Makefile @@ -18,14 +18,13 @@ LIB_DEPENDS= libboost_system.so:${PORTSDIR}/devel/boost-libs \ WRKSRC= ${WRKDIR}/FreeFileSync/Source -USES= dos2unix gmake pkgconfig zip +USES= compiler:c++11-lang dos2unix gmake pkgconfig zip USE_LDCONFIG= yes USE_WX= 3.0+ -WX_UNICODE= yes post-patch: - @${REINPLACE_CMD} -e 's/wx-config/${WX_CONFIG:T}/' \ - -e 's,g++,${CXX},' ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e 's/wx-config/$${WX_CONFIG:T}/' \ + -e 's,g++,$${CXX},' ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's|<sys/vfs.h>|<sys/mount.h>|' \ ${WRKDIR}/zen/file_access.cpp @${REINPLACE_CMD} -e 's|WEXITSTATUS||' ${WRKDIR}/zen/shell_execute.h diff --git a/sysutils/freefilesync/files/patch-Makefile b/sysutils/freefilesync/files/patch-Makefile index cdee15d6f74c..9aa34e193118 100644 --- a/sysutils/freefilesync/files/patch-Makefile +++ b/sysutils/freefilesync/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig 2016-03-09 02:07:44 UTC -+++ Makefile +--- Makefile.orig 2016-03-09 22:42:49.363968000 +0800 ++++ Makefile 2016-03-09 22:51:51.270475000 +0800 @@ -1,14 +1,14 @@ APPNAME = FreeFileSync -prefix = /usr @@ -11,27 +11,27 @@ 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 ++-DNDEBUG `${WX_CONFIG} --cxxflags --debug=no` -DZEN_LINUX -pthread -LINKFLAGS = -s `wx-config --libs std, aui --debug=no` -lboost_thread -lboost_chrono -lboost_system -lz -pthread -+LINKFLAGS = -s `wxgtk2u-3.0-config --libs std, aui --debug=no` -lboost_thread -lboost_chrono -lboost_system -lz -pthread ++LINKFLAGS = -s `${WX_CONFIG} --libs std, aui --debug=no` -lboost_thread -lboost_chrono -lboost_system -lz -pthread #Gtk - support recycler/icon loading/no button border/grid scrolling CXXFLAGS += `pkg-config --cflags gtk+-2.0` -@@ -96,10 +96,10 @@ launchpad: FreeFileSync +@@ -96,10 +96,10 @@ ../Obj/FFS_GCC_Make_Release/ffs/src/%.o : %.cpp mkdir -p $(dir $@) - g++ $(CXXFLAGS) -c $< -o $@ -+ c++ $(CXXFLAGS) -c $< -o $@ ++ ${CXX} $(CXXFLAGS) -c $< -o $@ FreeFileSync: $(OBJECT_LIST) - g++ -o ../Build/$(APPNAME) $(OBJECT_LIST) $(LINKFLAGS) -+ c++ -o ../Build/$(APPNAME) $(OBJECT_LIST) $(LINKFLAGS) ++ ${CXX} -o ../Build/$(APPNAME) $(OBJECT_LIST) $(LINKFLAGS) clean: rm -rf ../Obj/FFS_GCC_Make_Release -@@ -108,16 +108,11 @@ clean: +@@ -108,16 +108,12 @@ install: mkdir -p $(BINDIR) @@ -45,7 +45,7 @@ ../Build/Resources.zip \ ../Build/styles.gtk_rc \ $(APPSHAREDIR) -- + - mkdir -p $(DOCSHAREDIR) - cp ../Build/Changelog.txt $(DOCSHAREDIR)/changelog - gzip $(DOCSHAREDIR)/changelog |