Attachment #143843 for bug #191098

View | Details | Raw Unified | Return to bug 191098
Collapse All | Expand All




# $FreeBSD: head/sysutils/dar/Makefile 357745 2014-06-14 05:54:18Z miwi $

PORTNAME=	dar
PORTVERSION=	2.4.14
CATEGORIES=	sysutils archivers
MASTER_SITES=	SF



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 --disable-libgcrypt-linking \
		--disable-ea-support --disable-nodump-flag \
		--disable-gnugetopt --disable-dar-static \
		--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
INSTALL_TARGET=	install-strip
USE_LDCONFIG=	yes


Lines 1-2 Link Here

(-)sysutils/dar/distinfo (-2 / +2 lines)
1	SHA256 (dar-2.4.13.tar.gz) = f3b2c3c7ad615b76683f8cdb6d025576f4373c75b9e37a9f340536054350c97a	1	SHA256 (dar-2.4.14.tar.gz) = b4d020b86ffba9d38a1b3489e685a23ea108049f4c3dd4cb8924d3ff04f2f532
2	SIZE (dar-2.4.13.tar.gz) = 1799774	2	SIZE (dar-2.4.14.tar.gz) = 1800036




--- 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 @@
 @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)
-LDADD = -L../libdar -l$(MYLIB)
+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 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/$(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)

Lines 64-70 Link Here

(-)sysutils/dar/pkg-plist (-1 / +1 lines)
64	lib/libdar.a	64	lib/libdar.a
65	lib/libdar.so	65	lib/libdar.so
66	lib/libdar.so.5000	66	lib/libdar.so.5000
67	lib/libdar.so.5000.6.0	67	lib/libdar.so.5000.6.1
68	libdata/pkgconfig/libdar.pc	68	libdata/pkgconfig/libdar.pc
69	man/man1/dar.1.gz	69	man/man1/dar.1.gz
70	man/man1/dar_cp.1.gz	70	man/man1/dar_cp.1.gz

Return to bug 191098

Lines 2-8 Link Here

(-)sysutils/dar/Makefile (-3 / +4 lines)
2	# $FreeBSD: head/sysutils/dar/Makefile 357745 2014-06-14 05:54:18Z miwi $	2	# $FreeBSD: head/sysutils/dar/Makefile 357745 2014-06-14 05:54:18Z miwi $
3		3
4	PORTNAME= dar	4	PORTNAME= dar
5	PORTVERSION= 2.4.13	5	PORTVERSION= 2.4.14
6	CATEGORIES= sysutils archivers	6	CATEGORIES= sysutils archivers
7	MASTER_SITES= SF	7	MASTER_SITES= SF
8		8
Lines 11-24 Link Here
11		11
12	LICENSE= GPLv2 # (or later)	12	LICENSE= GPLv2 # (or later)
13		13
14	USES= libtool pathfix shebangfix	14	USES= libtool shebangfix
15	SHEBANG_FILES= doc/samples/dar_backup doc/samples/.bash doc/samples/.sh	15	SHEBANG_FILES= doc/samples/dar_backup doc/samples/.bash doc/samples/.sh
16	USE_GCC= any	16	USE_GCC= any
17	GNU_CONFIGURE= yes	17	GNU_CONFIGURE= yes
18	CONFIGURE_ARGS= --datadir=${DATADIR} --disable-build-html \	18	CONFIGURE_ARGS= --datadir=${DATADIR} --disable-build-html \
19	--disable-upx --disable-libgcrypt-linking \	19	--disable-upx --disable-libgcrypt-linking \
20	--disable-ea-support --disable-nodump-flag \	20	--disable-ea-support --disable-nodump-flag \
21	--disable-gnugetopt --disable-dar-static	21	--disable-gnugetopt --disable-dar-static \
		22	--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
22	INSTALL_TARGET= install-strip	23	INSTALL_TARGET= install-strip
23	USE_LDCONFIG= yes	24	USE_LDCONFIG= yes
24		25

Lines 1-24 Link Here

(-)sysutils/dar/files/patch-src-dar-Makefile.in (-12 / +3 lines)
1	--- src/dar_suite/Makefile.in.orig 2007-08-06 15:55:23.000000000 +0200	1	--- src/dar_suite/Makefile.in.orig 2007-08-06 15:55:23.000000000 +0200
2	+++ src/dar_suite/Makefile.in 2007-08-06 15:55:32.000000000 +0200	2	+++ src/dar_suite/Makefile.in 2007-08-06 15:55:32.000000000 +0200
3	@@ -330,7 +330,7 @@	3	@@ -351,7 +351,7 @@
4	@USE_UPX_TRUE@UPX = @UPX_PROG@
5	@BUILD_DAR_STATIC_FALSE@@USE_UPX_TRUE@ALSO_BUILD_INST =
6	@BUILD_DAR_STATIC_TRUE@@USE_UPX_TRUE@ALSO_BUILD_INST = $(ALSO_BUILD)$(EXEEXT)
7	-LDADD = -L../libdar -l$(MYLIB)
8	+LDADD=../libdar/lib$(MYLIB).la
9	@DEBUG_STATIC_FALSE@AM_LDFLAGS = @LTLIBINTL@ $(LD_PROF)
10	@DEBUG_STATIC_TRUE@AM_LDFLAGS = -all-static @LTLIBINTL@ $(LD_PROF)
11	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
12	@@ -349,7 +349,7 @@
13	#	4	#
14	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	5	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
15	dar_static_DEPENDENCIES = ../libdar/lib$(MYLIB).la	6	dar_static_DEPENDENCIES = ../libdar/$(MYLIB).la
16	-dar_static_LDFLAGS = -all-static @LTLIBINTL@	7	-dar_static_LDFLAGS = -all-static @LTLIBINTL@
17	+dar_static_LDFLAGS = -all-static @LTLIBINTL@ @LTLIBICONV@	8	+dar_static_LDFLAGS = -all-static @LTLIBINTL@ @LTLIBICONV@
18	all: all-am	9	all: all-am
19		10
20	.SUFFIXES:	11	.SUFFIXES:
21	@@ -456,7 +456,7 @@	12	@@ -458,7 +458,7 @@
22	$(CXXLINK) $(dar_slave_OBJECTS) $(dar_slave_LDADD) $(LIBS)	13	$(CXXLINK) $(dar_slave_OBJECTS) $(dar_slave_LDADD) $(LIBS)
23	dar_static$(EXEEXT): $(dar_static_OBJECTS) $(dar_static_DEPENDENCIES) $(EXTRA_dar_static_DEPENDENCIES)	14	dar_static$(EXEEXT): $(dar_static_OBJECTS) $(dar_static_DEPENDENCIES) $(EXTRA_dar_static_DEPENDENCIES)
24	@rm -f dar_static$(EXEEXT)	15	@rm -f dar_static$(EXEEXT)