diff options
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/dar/Makefile | 11 | ||||
| -rw-r--r-- | sysutils/dar/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/dar/files/patch-src-dar-Makefile.in | 20 | ||||
| -rw-r--r-- | sysutils/dar/files/patch-src_libdar_Makefile.in | 11 | ||||
| -rw-r--r-- | sysutils/dar/pkg-plist | 2 |
5 files changed, 7 insertions, 41 deletions
diff --git a/sysutils/dar/Makefile b/sysutils/dar/Makefile index 0bb008184075..d7fb23a89a67 100644 --- a/sysutils/dar/Makefile +++ b/sysutils/dar/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= dar -PORTVERSION= 2.4.14 -PORTREVISION= 1 +PORTVERSION= 2.4.15 CATEGORIES= sysutils archivers MASTER_SITES= SF @@ -14,7 +13,6 @@ LICENSE= GPLv2 # (or later) USES= libtool shebangfix SHEBANG_FILES= doc/samples/dar_backup doc/samples/*.bash doc/samples/*.sh -USE_GCC= any GNU_CONFIGURE= yes CONFIGURE_ARGS= --datadir=${DATADIR} --disable-build-html \ --disable-upx \ @@ -40,10 +38,6 @@ NLS_CONFIGURE_ENABLE= nls .include <bsd.port.options.mk> -.if ${OSVERSION} < 1000052 -LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo -.endif - post-patch: @${REINPLACE_CMD} -e \ 's|(char \*\*) \(\&inptr,\)|\1| ; \ @@ -51,5 +45,8 @@ post-patch: @${FIND} ${WRKSRC}/doc -name "Makefile.in" | ${XARGS} \ ${REINPLACE_CMD} -e \ 's|$$(pkgdatadir)|$$(docdir)|g' +.if !${PORT_OPTIONS:MDOCS} + @${REINPLACE_CMD} -e 's|src doc|src|' ${WRKSRC}/Makefile.in +.endif .include <bsd.port.mk> diff --git a/sysutils/dar/distinfo b/sysutils/dar/distinfo index 440d7682a4e0..ac268c02a03b 100644 --- a/sysutils/dar/distinfo +++ b/sysutils/dar/distinfo @@ -1,2 +1,2 @@ -SHA256 (dar-2.4.14.tar.gz) = b4d020b86ffba9d38a1b3489e685a23ea108049f4c3dd4cb8924d3ff04f2f532 -SIZE (dar-2.4.14.tar.gz) = 1800036 +SHA256 (dar-2.4.15.tar.gz) = 9606992bb85f01672b523a53d100cc2393737d6e737139b9469029e8cf23c9f4 +SIZE (dar-2.4.15.tar.gz) = 1799020 diff --git a/sysutils/dar/files/patch-src-dar-Makefile.in b/sysutils/dar/files/patch-src-dar-Makefile.in deleted file mode 100644 index 667f9eea88cc..000000000000 --- a/sysutils/dar/files/patch-src-dar-Makefile.in +++ /dev/null @@ -1,20 +0,0 @@ ---- 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 -@@ -351,7 +351,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/$(MYLIB).la --dar_static_LDFLAGS = -all-static @LTLIBINTL@ -+dar_static_LDFLAGS = -all-static @LTLIBINTL@ @LTLIBICONV@ - all: all-am - - .SUFFIXES: -@@ -458,7 +458,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) diff --git a/sysutils/dar/files/patch-src_libdar_Makefile.in b/sysutils/dar/files/patch-src_libdar_Makefile.in deleted file mode 100644 index 2ad4351ca570..000000000000 --- a/sysutils/dar/files/patch-src_libdar_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- src/libdar/Makefile.in.orig 2014-06-15 16:44:07.000000000 +0000 -+++ src/libdar/Makefile.in -@@ -337,7 +337,7 @@ AM_LDFLAGS = @LTLIBINTL@ $(LD_PROF) - lib_LTLIBRARIES = $(MYLIB) - LIBDAR_MAJOR = `grep LIBDAR_COMPILE_TIME_MAJOR libdar.hpp | cut -f 2 -d "=" | cut -f 1 -d ';' | sed -e 's% %%g'` - LIBDAR_MEDIUM = `grep LIBDAR_COMPILE_TIME_MEDIUM libdar.hpp | cut -f 2 -d "=" | cut -f 1 -d ';' | sed -e 's% %%g'` --LIBDAR_MEDIUM_000 = `grep LIBDAR_COMPILE_TIME_MEDIUM libdar.hpp | cut -f 2 -d "=" | cut -f 1 -d ';' | sed -r -e 's% %%g' -e 's%([^0-9]|^)([0-9]{1})([^0-9]|$$)%0\2%' -e 's%([^0-9]|^)([0-9]{2})([^0-9]|$$)%0\2%'` -+LIBDAR_MEDIUM_000 = `grep LIBDAR_COMPILE_TIME_MEDIUM libdar.hpp | cut -f 2 -d "=" | cut -f 1 -d ';' | sed -E -e 's% %%g' -e 's%([^0-9]|^)([0-9]{1})([^0-9]|$$)%0\2%' -e 's%([^0-9]|^)([0-9]{2})([^0-9]|$$)%0\2%'` - LIBDAR_MINOR = `grep LIBDAR_COMPILE_TIME_MINOR libdar.hpp | cut -f 2 -d "=" | cut -f 1 -d ';' | sed -e 's% %%g'` - LIBDAR_LIBTOOL_CURRENT = $(LIBDAR_MAJOR)$(LIBDAR_MEDIUM_000) - LIBDAR_LIBTOOL_REVISION = $(LIBDAR_MINOR) diff --git a/sysutils/dar/pkg-plist b/sysutils/dar/pkg-plist index 5794f9c2c669..009eae33c876 100644 --- a/sysutils/dar/pkg-plist +++ b/sysutils/dar/pkg-plist @@ -64,7 +64,7 @@ include/dar/wrapperlib.hpp lib/libdar.a lib/libdar.so lib/libdar.so.5000 -lib/libdar.so.5000.6.1 +lib/libdar.so.5000.6.2 libdata/pkgconfig/libdar.pc man/man1/dar.1.gz man/man1/dar_cp.1.gz |