diff options
| author | Tijl Coosemans <tijl@FreeBSD.org> | 2014-06-11 14:49:59 +0000 |
|---|---|---|
| committer | Tijl Coosemans <tijl@FreeBSD.org> | 2014-06-11 14:49:59 +0000 |
| commit | 9f8b4bcde30c0ca3bf6cead5f48aa102536e0e92 (patch) | |
| tree | c4f78cbaf45ab044db3e157be708afd711a4e841 /sysutils/dar | |
| parent | 0533abe3e7aae5c19e0a0ce9c1e82ed5e94f63e8 (diff) | |
| download | ports-9f8b4bcde30c0ca3bf6cead5f48aa102536e0e92.tar.gz ports-9f8b4bcde30c0ca3bf6cead5f48aa102536e0e92.zip | |
Notes
Diffstat (limited to 'sysutils/dar')
| -rw-r--r-- | sysutils/dar/Makefile | 3 | ||||
| -rw-r--r-- | sysutils/dar/files/patch-configure | 20 | ||||
| -rw-r--r-- | sysutils/dar/files/patch-src-dar-Makefile.in | 22 |
3 files changed, 41 insertions, 4 deletions
diff --git a/sysutils/dar/Makefile b/sysutils/dar/Makefile index ef9633ef6cd1..1ecedb8f3f6a 100644 --- a/sysutils/dar/Makefile +++ b/sysutils/dar/Makefile @@ -16,7 +16,6 @@ USES= pathfix shebangfix libtool SHEBANG_FILES= doc/samples/dar_backup doc/samples/*.bash doc/samples/*.sh USE_GCC= any GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-lelf" CONFIGURE_ARGS= --datadir=${DATADIR} --disable-build-html \ --disable-upx --disable-libgcrypt-linking \ --disable-ea-support --disable-nodump-flag \ @@ -25,7 +24,7 @@ INSTALL_TARGET= install-strip USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= DOCS LZO NLS OPTIONS_SUB= yes diff --git a/sysutils/dar/files/patch-configure b/sysutils/dar/files/patch-configure new file mode 100644 index 000000000000..6e6f7a417ac8 --- /dev/null +++ b/sysutils/dar/files/patch-configure @@ -0,0 +1,20 @@ +--- configure.orig ++++ configure +@@ -6453,7 +6453,7 @@ + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_utf8_to_88591, +- (char **) &inptr, &inbytesleft, ++ &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + return 1; +@@ -6472,7 +6472,7 @@ + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_ascii_to_88591, +- (char **) &inptr, &inbytesleft, ++ &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + return 1; diff --git a/sysutils/dar/files/patch-src-dar-Makefile.in b/sysutils/dar/files/patch-src-dar-Makefile.in index 9688c36e658c..983b530a0884 100644 --- a/sysutils/dar/files/patch-src-dar-Makefile.in +++ b/sysutils/dar/files/patch-src-dar-Makefile.in @@ -1,6 +1,6 @@ --- src/dar_suite/Makefile.in.orig 2007-08-06 15:55:23.000000000 +0200 +++ src/dar_suite/Makefile.in 2007-08-06 15:55:32.000000000 +0200 -@@ -282,7 +282,7 @@ +@@ -330,7 +330,7 @@ @USE_UPX_TRUE@UPX = @UPX_PROG@ @BUILD_DAR_STATIC_FALSE@@USE_UPX_TRUE@ALSO_BUILD_INST = @BUILD_DAR_STATIC_TRUE@@USE_UPX_TRUE@ALSO_BUILD_INST = $(ALSO_BUILD)$(EXEEXT) @@ -8,4 +8,22 @@ +LDADD=../libdar/lib$(MYLIB).la @DEBUG_STATIC_FALSE@AM_LDFLAGS = @LTLIBINTL@ $(LD_PROF) @DEBUG_STATIC_TRUE@AM_LDFLAGS = -all-static @LTLIBINTL@ $(LD_PROF) - dar_SOURCES = command_line.cpp command_line.hpp config_file.cpp config_file.hpp dar.cpp dar.hpp dar_suite.cpp dar_suite.hpp hide_file.cpp hide_file.hpp no_comment.cpp no_comment.hpp shell_interaction.cpp shell_interaction.hpp dar.usage getopt_decision.h my_getopt_long.h + dar_SOURCES = command_line.cpp command_line.hpp config_file.cpp config_file.hpp dar.cpp dar.hpp dar_suite.cpp dar_suite.hpp hide_file.cpp hide_file.hpp no_comment.cpp no_comment.hpp shell_interaction.cpp shell_interaction.hpp dar.usage getopt_decision.h my_getopt_long.h line_tools.hpp line_tools.cpp crit_action_cmd_line.cpp crit_action_cmd_line.hpp +@@ -349,7 +349,7 @@ + # + dar_static_SOURCES = command_line.cpp command_line.hpp config_file.cpp config_file.hpp dar.cpp dar.hpp dar_suite.cpp dar_suite.hpp hide_file.cpp hide_file.hpp no_comment.cpp no_comment.hpp shell_interaction.cpp shell_interaction.hpp dar.usage line_tools.hpp line_tools.cpp crit_action_cmd_line.cpp + dar_static_DEPENDENCIES = ../libdar/lib$(MYLIB).la +-dar_static_LDFLAGS = -all-static @LTLIBINTL@ ++dar_static_LDFLAGS = -all-static @LTLIBINTL@ @LTLIBICONV@ + all: all-am + + .SUFFIXES: +@@ -456,7 +456,7 @@ + $(CXXLINK) $(dar_slave_OBJECTS) $(dar_slave_LDADD) $(LIBS) + dar_static$(EXEEXT): $(dar_static_OBJECTS) $(dar_static_DEPENDENCIES) $(EXTRA_dar_static_DEPENDENCIES) + @rm -f dar_static$(EXEEXT) +- $(dar_static_LINK) $(dar_static_OBJECTS) $(dar_static_LDADD) $(LIBS) ++ $(dar_static_LINK) $(dar_static_OBJECTS) $(dar_static_LDADD) $(LIBS) -lelf + dar_xform$(EXEEXT): $(dar_xform_OBJECTS) $(dar_xform_DEPENDENCIES) $(EXTRA_dar_xform_DEPENDENCIES) + @rm -f dar_xform$(EXEEXT) + $(CXXLINK) $(dar_xform_OBJECTS) $(dar_xform_LDADD) $(LIBS) |