Index: user/uqs/git_conv/svn2git/src/Makefile
===================================================================
--- user/uqs/git_conv/svn2git/src/Makefile	(revision 290656)
+++ user/uqs/git_conv/svn2git/src/Makefile	(revision 290657)
@@ -1,236 +1,242 @@
 #############################################################################
 # Makefile for building: ../svn-all-fast-export
-# Generated by qmake (2.01a) (Qt 4.8.2) on: Fri Dec 7 14:04:57 2012
+# Generated by qmake (2.01a) (Qt 4.8.7) on: Tue Nov 10 14:23:11 2015
 # Project:  src.pro
 # Template: app
-# Command: /usr/local/bin/qmake-qt4 -unix -o Makefile src.pro
+# Command: /usr/local/bin/qmake-qt4 -o Makefile src.pro
 #############################################################################
 
 ####### Compiler, tools and options
 
-CC            = gcc
-CXX           = g++
-DEFINES       = -DVER="\"e29719690762be6add7d550cab9180766746f4e0\"" -DQT_NO_DEBUG -DQT_CORE_LIB -DQT_SHARED
-CFLAGS        = -pipe -O2 -Wall -W $(DEFINES)
-CXXFLAGS      = -pipe -O2 -Wall -W $(DEFINES)
-INCPATH       = -I/usr/local/share/qt4/mkspecs/freebsd-g++ -I. -I/usr/local/include/qt4/QtCore -I/usr/local/include/qt4 -I. -I/usr/include/subversion-1 -I/usr/local/include/subversion-1 -I/usr/include/apr-1.0 -I/usr/include/apr-1 -I/usr/local/include/apr-1 -I. -I/usr/local/include/qt4 -I/usr/local/include
-LINK          = g++
+CC            = clang
+CXX           = clang++
+DEFINES       = -DVER="\"fa63382f9549c6ae1df7b8880d9cced531ab4e98\"" -DQT_NO_DEBUG -DQT_CORE_LIB -DQT_SHARED
+CFLAGS        = -pipe -O2 -Wall -W -pthread -D_THREAD_SAFE $(DEFINES)
+CXXFLAGS      = -pipe -O2 -Wall -W -pthread -D_THREAD_SAFE $(DEFINES)
+INCPATH       = -I/usr/local/share/qt4/mkspecs/freebsd-clang -I. -I/usr/local/include/qt4/QtCore -I/usr/local/include/qt4 -I. -I/usr/include/subversion-1 -I/usr/local/include/subversion-1 -I/usr/include/apr-1.0 -I/usr/include/apr-1 -I/usr/local/include/apr-1 -I. -I/usr/local/include/qt4 -I/usr/local/include
+LINK          = clang++
 LFLAGS        = -Wl,-O1 -pthread -Wl,-rpath,/usr/local/lib/qt4
 LIBS          = $(SUBLIBS)  -L/usr/local/lib/qt4 -L/usr/local/lib -lsvn_fs-1 -lsvn_repos-1 -lapr-1 -lsvn_subr-1 -lQtCore -L/usr/local/lib/qt4 -L/usr/local/lib 
 AR            = ar cqs
 RANLIB        = 
 QMAKE         = /usr/local/bin/qmake-qt4
 TAR           = tar -cf
 COMPRESS      = gzip -9f
 COPY          = cp -f
 SED           = sed
-COPY_FILE     = $(COPY)
-COPY_DIR      = $(COPY) -R
-STRIP         = 
-INSTALL_FILE  = $(COPY_FILE)
+COPY_FILE     = cp -f
+COPY_DIR      = cp -f -R
+STRIP         = strip
+INSTALL_FILE  = install -m 644 -p
 INSTALL_DIR   = $(COPY_DIR)
-INSTALL_PROGRAM = $(COPY_FILE)
+INSTALL_PROGRAM = install -m 755 -p
 DEL_FILE      = rm -f
 SYMLINK       = ln -f -s
 DEL_DIR       = rmdir
 MOVE          = mv -f
 CHK_DIR_EXISTS= test -d
 MKDIR         = mkdir -p
 
 ####### Output directory
 
 OBJECTS_DIR   = ./
 
 ####### Files
 
 SOURCES       = ruleparser.cpp \
 		repository.cpp \
 		svn.cpp \
 		main.cpp \
 		CommandLineParser.cpp 
 OBJECTS       = ruleparser.o \
 		repository.o \
 		svn.o \
 		main.o \
 		CommandLineParser.o
 DIST          = /usr/local/share/qt4/mkspecs/common/unix.conf \
+		/usr/local/share/qt4/mkspecs/common/freebsd.conf \
 		/usr/local/share/qt4/mkspecs/common/gcc-base.conf \
 		/usr/local/share/qt4/mkspecs/common/gcc-base-unix.conf \
-		/usr/local/share/qt4/mkspecs/common/g++-base.conf \
-		/usr/local/share/qt4/mkspecs/common/g++-unix.conf \
+		/usr/local/share/qt4/mkspecs/common/clang.conf \
+		/usr/local/share/qt4/mkspecs/common/clang-unix.conf \
 		/usr/local/share/qt4/mkspecs/qconfig.pri \
 		/usr/local/share/qt4/mkspecs/features/qt_functions.prf \
 		/usr/local/share/qt4/mkspecs/features/qt_config.prf \
 		/usr/local/share/qt4/mkspecs/features/exclusive_builds.prf \
 		/usr/local/share/qt4/mkspecs/features/default_pre.prf \
 		/usr/local/share/qt4/mkspecs/features/release.prf \
 		/usr/local/share/qt4/mkspecs/features/default_post.prf \
+		/usr/local/share/qt4/mkspecs/features/shared.prf \
 		/usr/local/share/qt4/mkspecs/features/unix/gdb_dwarf_index.prf \
-		/usr/local/share/qt4/mkspecs/features/unix/thread.prf \
 		/usr/local/share/qt4/mkspecs/features/warn_on.prf \
 		/usr/local/share/qt4/mkspecs/features/qt.prf \
+		/usr/local/share/qt4/mkspecs/features/unix/thread.prf \
 		/usr/local/share/qt4/mkspecs/features/moc.prf \
 		/usr/local/share/qt4/mkspecs/features/resources.prf \
 		/usr/local/share/qt4/mkspecs/features/uic.prf \
 		/usr/local/share/qt4/mkspecs/features/yacc.prf \
 		/usr/local/share/qt4/mkspecs/features/lex.prf \
 		/usr/local/share/qt4/mkspecs/features/include_source_dir.prf \
 		src.pro
 QMAKE_TARGET  = svn-all-fast-export
 DESTDIR       = ../
 TARGET        = ../svn-all-fast-export
 
 first: all
 ####### Implicit rules
 
 .SUFFIXES: .o .c .cpp .cc .cxx .C
 
 .cpp.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
 
 .cc.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
 
 .cxx.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
 
 .C.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
 
 .c.o:
 	$(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<"
 
 ####### Build rules
 
 all: Makefile $(TARGET)
 
 $(TARGET):  $(OBJECTS)  
 	@$(CHK_DIR_EXISTS) ../ || $(MKDIR) ../ 
 	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
 
-Makefile: src.pro  /usr/local/share/qt4/mkspecs/freebsd-g++/qmake.conf /usr/local/share/qt4/mkspecs/common/unix.conf \
+Makefile: src.pro  /usr/local/share/qt4/mkspecs/freebsd-clang/qmake.conf /usr/local/share/qt4/mkspecs/common/unix.conf \
+		/usr/local/share/qt4/mkspecs/common/freebsd.conf \
 		/usr/local/share/qt4/mkspecs/common/gcc-base.conf \
 		/usr/local/share/qt4/mkspecs/common/gcc-base-unix.conf \
-		/usr/local/share/qt4/mkspecs/common/g++-base.conf \
-		/usr/local/share/qt4/mkspecs/common/g++-unix.conf \
+		/usr/local/share/qt4/mkspecs/common/clang.conf \
+		/usr/local/share/qt4/mkspecs/common/clang-unix.conf \
 		/usr/local/share/qt4/mkspecs/qconfig.pri \
 		/usr/local/share/qt4/mkspecs/features/qt_functions.prf \
 		/usr/local/share/qt4/mkspecs/features/qt_config.prf \
 		/usr/local/share/qt4/mkspecs/features/exclusive_builds.prf \
 		/usr/local/share/qt4/mkspecs/features/default_pre.prf \
 		/usr/local/share/qt4/mkspecs/features/release.prf \
 		/usr/local/share/qt4/mkspecs/features/default_post.prf \
+		/usr/local/share/qt4/mkspecs/features/shared.prf \
 		/usr/local/share/qt4/mkspecs/features/unix/gdb_dwarf_index.prf \
-		/usr/local/share/qt4/mkspecs/features/unix/thread.prf \
 		/usr/local/share/qt4/mkspecs/features/warn_on.prf \
 		/usr/local/share/qt4/mkspecs/features/qt.prf \
+		/usr/local/share/qt4/mkspecs/features/unix/thread.prf \
 		/usr/local/share/qt4/mkspecs/features/moc.prf \
 		/usr/local/share/qt4/mkspecs/features/resources.prf \
 		/usr/local/share/qt4/mkspecs/features/uic.prf \
 		/usr/local/share/qt4/mkspecs/features/yacc.prf \
 		/usr/local/share/qt4/mkspecs/features/lex.prf \
 		/usr/local/share/qt4/mkspecs/features/include_source_dir.prf \
 		/usr/local/lib/qt4/libQtCore.prl
-	$(QMAKE) -unix -o Makefile src.pro
+	$(QMAKE) -o Makefile src.pro
 /usr/local/share/qt4/mkspecs/common/unix.conf:
+/usr/local/share/qt4/mkspecs/common/freebsd.conf:
 /usr/local/share/qt4/mkspecs/common/gcc-base.conf:
 /usr/local/share/qt4/mkspecs/common/gcc-base-unix.conf:
-/usr/local/share/qt4/mkspecs/common/g++-base.conf:
-/usr/local/share/qt4/mkspecs/common/g++-unix.conf:
+/usr/local/share/qt4/mkspecs/common/clang.conf:
+/usr/local/share/qt4/mkspecs/common/clang-unix.conf:
 /usr/local/share/qt4/mkspecs/qconfig.pri:
 /usr/local/share/qt4/mkspecs/features/qt_functions.prf:
 /usr/local/share/qt4/mkspecs/features/qt_config.prf:
 /usr/local/share/qt4/mkspecs/features/exclusive_builds.prf:
 /usr/local/share/qt4/mkspecs/features/default_pre.prf:
 /usr/local/share/qt4/mkspecs/features/release.prf:
 /usr/local/share/qt4/mkspecs/features/default_post.prf:
+/usr/local/share/qt4/mkspecs/features/shared.prf:
 /usr/local/share/qt4/mkspecs/features/unix/gdb_dwarf_index.prf:
-/usr/local/share/qt4/mkspecs/features/unix/thread.prf:
 /usr/local/share/qt4/mkspecs/features/warn_on.prf:
 /usr/local/share/qt4/mkspecs/features/qt.prf:
+/usr/local/share/qt4/mkspecs/features/unix/thread.prf:
 /usr/local/share/qt4/mkspecs/features/moc.prf:
 /usr/local/share/qt4/mkspecs/features/resources.prf:
 /usr/local/share/qt4/mkspecs/features/uic.prf:
 /usr/local/share/qt4/mkspecs/features/yacc.prf:
 /usr/local/share/qt4/mkspecs/features/lex.prf:
 /usr/local/share/qt4/mkspecs/features/include_source_dir.prf:
 /usr/local/lib/qt4/libQtCore.prl:
 qmake:  FORCE
-	@$(QMAKE) -unix -o Makefile src.pro
+	@$(QMAKE) -o Makefile src.pro
 
 dist: 
-	@$(CHK_DIR_EXISTS) .tmp/svn-all-fast-export1.0.0 || $(MKDIR) .tmp/svn-all-fast-export1.0.0 
-	$(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/svn-all-fast-export1.0.0/ && $(COPY_FILE) --parents ruleparser.h repository.h svn.h CommandLineParser.h .tmp/svn-all-fast-export1.0.0/ && $(COPY_FILE) --parents ruleparser.cpp repository.cpp svn.cpp main.cpp CommandLineParser.cpp .tmp/svn-all-fast-export1.0.0/ && (cd `dirname .tmp/svn-all-fast-export1.0.0` && $(TAR) svn-all-fast-export1.0.0.tar svn-all-fast-export1.0.0 && $(COMPRESS) svn-all-fast-export1.0.0.tar) && $(MOVE) `dirname .tmp/svn-all-fast-export1.0.0`/svn-all-fast-export1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/svn-all-fast-export1.0.0
+	@$(CHK_DIR_EXISTS) .tmp/svn-all-fast-exportfa63382f9549c6ae1df7b8880d9cced531ab4e98 || $(MKDIR) .tmp/svn-all-fast-exportfa63382f9549c6ae1df7b8880d9cced531ab4e98 
+	$(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/svn-all-fast-exportfa63382f9549c6ae1df7b8880d9cced531ab4e98/ && $(COPY_FILE) --parents ruleparser.h repository.h svn.h CommandLineParser.h .tmp/svn-all-fast-exportfa63382f9549c6ae1df7b8880d9cced531ab4e98/ && $(COPY_FILE) --parents ruleparser.cpp repository.cpp svn.cpp main.cpp CommandLineParser.cpp .tmp/svn-all-fast-exportfa63382f9549c6ae1df7b8880d9cced531ab4e98/ && (cd `dirname .tmp/svn-all-fast-exportfa63382f9549c6ae1df7b8880d9cced531ab4e98` && $(TAR) svn-all-fast-exportfa63382f9549c6ae1df7b8880d9cced531ab4e98.tar svn-all-fast-exportfa63382f9549c6ae1df7b8880d9cced531ab4e98 && $(COMPRESS) svn-all-fast-exportfa63382f9549c6ae1df7b8880d9cced531ab4e98.tar) && $(MOVE) `dirname .tmp/svn-all-fast-exportfa63382f9549c6ae1df7b8880d9cced531ab4e98`/svn-all-fast-exportfa63382f9549c6ae1df7b8880d9cced531ab4e98.tar.gz . && $(DEL_FILE) -r .tmp/svn-all-fast-exportfa63382f9549c6ae1df7b8880d9cced531ab4e98
 
 
 clean:compiler_clean 
 	-$(DEL_FILE) $(OBJECTS)
 	-$(DEL_FILE) *~ core *.core
 
 
 ####### Sub-libraries
 
 distclean: clean
 	-$(DEL_FILE) $(TARGET) 
 	-$(DEL_FILE) Makefile
 
 
 check: first
 
 mocclean: compiler_moc_header_clean compiler_moc_source_clean
 
 mocables: compiler_moc_header_make_all compiler_moc_source_make_all
 
 compiler_moc_header_make_all:
 compiler_moc_header_clean:
 compiler_rcc_make_all:
 compiler_rcc_clean:
 compiler_image_collection_make_all: qmake_image_collection.cpp
 compiler_image_collection_clean:
 	-$(DEL_FILE) qmake_image_collection.cpp
 compiler_moc_source_make_all:
 compiler_moc_source_clean:
 compiler_uic_make_all:
 compiler_uic_clean:
 compiler_yacc_decl_make_all:
 compiler_yacc_decl_clean:
 compiler_yacc_impl_make_all:
 compiler_yacc_impl_clean:
 compiler_lex_make_all:
 compiler_lex_clean:
 compiler_clean: 
 
 ####### Compile
 
 ruleparser.o: ruleparser.cpp ruleparser.h \
 		CommandLineParser.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ruleparser.o ruleparser.cpp
 
 repository.o: repository.cpp repository.h \
 		ruleparser.h \
 		CommandLineParser.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o repository.o repository.cpp
 
 svn.o: svn.cpp svn.h \
 		ruleparser.h \
 		CommandLineParser.h \
 		repository.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o svn.o svn.cpp
 
 main.o: main.cpp CommandLineParser.h \
 		ruleparser.h \
 		repository.h \
 		svn.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp
 
 CommandLineParser.o: CommandLineParser.cpp CommandLineParser.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o CommandLineParser.o CommandLineParser.cpp
 
 ####### Install
 
 install:   FORCE
 
 uninstall:   FORCE
 
 FORCE: