Attachment #86960 for bug #123486

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

Lines 4-11 Link Here

(-)Makefile (-2 / +1 lines)
4	# $FreeBSD: ports/security/libprelude/Makefile,v 1.51 2008/03/03 11:57:04 novel Exp $	4	# $FreeBSD: ports/security/libprelude/Makefile,v 1.51 2008/03/03 11:57:04 novel Exp $
5		5
6	PORTNAME= libprelude	6	PORTNAME= libprelude
7	PORTVERSION= 0.9.16.1	7	PORTVERSION= 0.9.17.2
8	PORTREVISION= 1
9	CATEGORIES= security	8	CATEGORIES= security
10	MASTER_SITES= http://www.prelude-ids.org/download/releases/ \	9	MASTER_SITES= http://www.prelude-ids.org/download/releases/ \
11	http://www.prelude-ids.org/download/releases/old/	10	http://www.prelude-ids.org/download/releases/old/

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (libprelude-0.9.16.1.tar.gz) = ba597fdfb9641a0099a8907ea53c6db8	1	MD5 (libprelude-0.9.17.2.tar.gz) = 7c769293b4d79be2667993b8a88d42ac
2	SHA256 (libprelude-0.9.16.1.tar.gz) = d300bddf9101daf67f86cc6edf094b85cca1e3b3d9c4352a0083da1486b6b20b	2	SHA256 (libprelude-0.9.17.2.tar.gz) = ba6caef5ba1df76a1c6989d71dbcd6f6cc373716e308f5d1b9389e47e302dfc9
3	SIZE (libprelude-0.9.16.1.tar.gz) = 1973446	3	SIZE (libprelude-0.9.17.2.tar.gz) = 2031211

Lines 61-67 Link Here

(-)pkg-plist (-1 / +1 lines)
61	include/libprelude/variable.h	61	include/libprelude/variable.h
62	lib/libprelude.la	62	lib/libprelude.la
63	lib/libprelude.so	63	lib/libprelude.so
64	lib/libprelude.so.13	64	lib/libprelude.so.14
65	%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Prelude.pm	65	%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Prelude.pm
66	%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Prelude/.packlist	66	%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Prelude/.packlist
67	%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Prelude/Prelude.bs	67	%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Prelude/Prelude.bs




--- Makefile.in.orig	2008-04-28 13:30:22.000000000 +0200
+++ Makefile.in	2008-05-05 08:52:48.000000000 +0200
@@ -1103,61 +1103,10 @@
 	$(INSTALL) -d -m 755 $(DESTDIR)$(PRELUDE_CONFIG_DIR);
 	$(INSTALL) -d -m 755 $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default;
 	$(INSTALL) -d -m 711 $(DESTDIR)$(PRELUDE_CONFIG_DIR)/profile;
-	@if test -f $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/client.conf; then							\
-@HAVE_SYSTEM_LIBLTDL_TRUE@SUBDIRS = libmissing m4 src prelude-admin bindings docs
+@HAVE_SYSTEM_LIBLTDL_FALSE@SUBDIRS = libltdl libmissing m4 src prelude-admin bindings docs
+@HAVE_SYSTEM_LIBLTDL_TRUE@SUBDIRS = libmissing m4 src prelude-admin bindings docs
 DIST_SUBDIRS = $(SUBDIRS)
 EXTRA_DIST = HACKING.README LICENSE.README client.conf global.conf idmef-client.conf tls.conf
 bin_SCRIPTS = $(top_builddir)/libprelude-config
@@ -1038,61 +1038,11 @@
 	$(INSTALL) -d -m 755 $(DESTDIR)$(prelude_config_dir);
 	$(INSTALL) -d -m 755 $(DESTDIR)$(prelude_config_dir)/default;
 	$(INSTALL) -d -m 711 $(DESTDIR)$(prelude_config_dir)/profile;
-	@if test -f $(DESTDIR)$(prelude_config_dir)/default/client.conf; then							\
-		echo;														\
-		echo "********************************************************************************";          		\
-                echo;														\
-                echo "$(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/client.conf already exist...";					\
-                echo "Installing default configuration in $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/client.conf-dist";		\
-                echo;														\
-                echo "********************************************************************************";			\
-		echo;														\
-		$(INSTALL) -m 644 $(top_builddir)/client.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/client.conf-dist;		\
-        else															\
-                $(INSTALL) -m 644 $(top_builddir)/client.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default;				\
-        fi
-
-	@if test -f $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/global.conf; then							\
-		echo;														\
-		echo "********************************************************************************";          		\
-                echo;														\
-                echo "$(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/global.conf already exist...";					\
-                echo "Installing default configuration in $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/global.conf-dist";		\
-                echo;														\
-                echo "********************************************************************************";			\
-		echo;														\
-		$(INSTALL) -m 644 $(top_builddir)/global.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/global.conf-dist;		\
-        else															\
-                $(INSTALL) -m 644 $(top_builddir)/global.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default;				\
-        fi															
-
-	@if test -f $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/idmef-client.conf; then						\
-		echo;														\
-		echo "********************************************************************************";          		\
-                echo;														\
-                echo "$(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/idmef-client.conf already exist...";					\
-                echo "Installing default configuration in $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/idmef-client.conf-dist";		\
-                echo;														\
-                echo "********************************************************************************";			\
-		echo;														\
-		$(INSTALL) -m 644 $(top_builddir)/idmef-client.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/idmef-client.conf-dist;\
-        else															\
-                $(INSTALL) -m 644 $(top_builddir)/idmef-client.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default;			\
-        fi
-
-	@if test -f $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/tls.conf; then								\
-		echo;														\
-		echo "********************************************************************************";          		\
-                echo;														\
-                echo "$(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/tls.conf already exist...";						\
-                echo "Installing default configuration in $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/tls.conf-dist";			\
-                echo;														\
-                echo "********************************************************************************";			\
-		echo;														\
-		$(INSTALL) -m 644 $(top_srcdir)/tls.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/tls.conf-dist;			\
-        else															\
-                $(INSTALL) -m 644 $(top_srcdir)/tls.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default;					\
-	fi
+	$(INSTALL) -m 644 $(top_srcdir)/client.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/client.conf-dist;
+	$(INSTALL) -m 644 $(top_srcdir)/global.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/global.conf-dist;
+	$(INSTALL) -m 644 $(top_srcdir)/idmef-client.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/idmef-client.conf-dist;
+	$(INSTALL) -m 644 $(top_srcdir)/tls.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/tls.conf-dist;
+	$(INSTALL) -m 644 $(top_srcdir)/tls.conf $(DESTDIR)$(prelude_config_dir)/default/tls.conf-dist;
 
 uninstall-local:
 	rm -f $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/client.conf

Return to bug 123486

Lines 1-80 Link Here

(-)files/patch-Makefile.in (-43 / +31 lines)
1	--- Makefile.in.orig Tue Sep 4 16:31:01 2007	1	--- Makefile.in.orig 2008-04-28 13:30:22.000000000 +0200
2	+++ Makefile.in Wed Sep 5 11:29:03 2007	2	+++ Makefile.in 2008-05-05 08:52:48.000000000 +0200
3	@@ -514,8 +514,8 @@	3	@@ -1103,61 +1103,10 @@
4	target_vendor = @target_vendor@	4	$(INSTALL) -d -m 755 $(DESTDIR)$(PRELUDE_CONFIG_DIR);
5	DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --without-system-ltdl	5	$(INSTALL) -d -m 755 $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default;
6	ACLOCAL_AMFLAGS = -I m4 -I libmissing/m4	6	$(INSTALL) -d -m 711 $(DESTDIR)$(PRELUDE_CONFIG_DIR)/profile;
7	-@HAVE_SYSTEM_LIBLTDL_FALSE@SUBDIRS = libltdl libmissing m4 src prelude-admin bindings docs	7	- @if test -f $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/client.conf; then \
8	-@HAVE_SYSTEM_LIBLTDL_TRUE@SUBDIRS = libmissing m4 src prelude-admin bindings docs
9	+@HAVE_SYSTEM_LIBLTDL_FALSE@SUBDIRS = libltdl libmissing m4 src prelude-admin bindings docs
10	+@HAVE_SYSTEM_LIBLTDL_TRUE@SUBDIRS = libmissing m4 src prelude-admin bindings docs
11	DIST_SUBDIRS = $(SUBDIRS)
12	EXTRA_DIST = HACKING.README LICENSE.README client.conf global.conf idmef-client.conf tls.conf
13	bin_SCRIPTS = $(top_builddir)/libprelude-config
14	@@ -1038,61 +1038,11 @@
15	$(INSTALL) -d -m 755 $(DESTDIR)$(prelude_config_dir);
16	$(INSTALL) -d -m 755 $(DESTDIR)$(prelude_config_dir)/default;
17	$(INSTALL) -d -m 711 $(DESTDIR)$(prelude_config_dir)/profile;
18	- @if test -f $(DESTDIR)$(prelude_config_dir)/default/client.conf; then \
19	- echo; \	8	- echo; \
20	- echo "********************************************************************************"; \	9	- echo "********************************************************************************"; \
21	- echo; \	10	- echo; \
22	- echo "$(DESTDIR)$(prelude_config_dir)/default/client.conf already exist..."; \	11	- echo "$(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/client.conf already exist..."; \
23	- echo "Installing default configuration in $(DESTDIR)$(prelude_config_dir)/default/client.conf-dist"; \	12	- echo "Installing default configuration in $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/client.conf-dist"; \
24	- echo; \	13	- echo; \
25	- echo "********************************************************************************"; \	14	- echo "********************************************************************************"; \
26	- echo; \	15	- echo; \
27	- $(INSTALL) -m 644 $(top_srcdir)/client.conf $(DESTDIR)$(prelude_config_dir)/default/client.conf-dist; \	16	- $(INSTALL) -m 644 $(top_builddir)/client.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/client.conf-dist; \
28	- else \	17	- else \
29	- $(INSTALL) -m 644 $(top_srcdir)/client.conf $(DESTDIR)$(prelude_config_dir)/default; \	18	- $(INSTALL) -m 644 $(top_builddir)/client.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default; \
30	- fi	19	- fi
31	-	20	-
32	- @if test -f $(DESTDIR)$(prelude_config_dir)/default/global.conf; then \	21	- @if test -f $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/global.conf; then \
33	- echo; \	22	- echo; \
34	- echo "********************************************************************************"; \	23	- echo "********************************************************************************"; \
35	- echo; \	24	- echo; \
36	- echo "$(DESTDIR)$(prelude_config_dir)/default/global.conf already exist..."; \	25	- echo "$(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/global.conf already exist..."; \
37	- echo "Installing default configuration in $(DESTDIR)$(prelude_config_dir)/default/global.conf-dist"; \	26	- echo "Installing default configuration in $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/global.conf-dist"; \
38	- echo; \	27	- echo; \
39	- echo "********************************************************************************"; \	28	- echo "********************************************************************************"; \
40	- echo; \	29	- echo; \
41	- $(INSTALL) -m 644 $(top_srcdir)/global.conf $(DESTDIR)$(prelude_config_dir)/default/global.conf-dist; \	30	- $(INSTALL) -m 644 $(top_builddir)/global.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/global.conf-dist; \
42	- else \	31	- else \
43	- $(INSTALL) -m 644 $(top_srcdir)/global.conf $(DESTDIR)$(prelude_config_dir)/default; \	32	- $(INSTALL) -m 644 $(top_builddir)/global.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default; \
44	- fi	33	- fi
45	-	34	-
46	- @if test -f $(DESTDIR)$(prelude_config_dir)/default/idmef-client.conf; then \	35	- @if test -f $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/idmef-client.conf; then \
47	- echo; \	36	- echo; \
48	- echo "********************************************************************************"; \	37	- echo "********************************************************************************"; \
49	- echo; \	38	- echo; \
50	- echo "$(DESTDIR)$(prelude_config_dir)/default/idmef-client.conf already exist..."; \	39	- echo "$(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/idmef-client.conf already exist..."; \
51	- echo "Installing default configuration in $(DESTDIR)$(prelude_config_dir)/default/idmef-client.conf-dist"; \	40	- echo "Installing default configuration in $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/idmef-client.conf-dist"; \
52	- echo; \	41	- echo; \
53	- echo "********************************************************************************"; \	42	- echo "********************************************************************************"; \
54	- echo; \	43	- echo; \
55	- $(INSTALL) -m 644 $(top_srcdir)/idmef-client.conf $(DESTDIR)$(prelude_config_dir)/default/idmef-client.conf-dist; \	44	- $(INSTALL) -m 644 $(top_builddir)/idmef-client.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/idmef-client.conf-dist;\
56	- else \	45	- else \
57	- $(INSTALL) -m 644 $(top_srcdir)/idmef-client.conf $(DESTDIR)$(prelude_config_dir)/default; \	46	- $(INSTALL) -m 644 $(top_builddir)/idmef-client.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default; \
58	- fi	47	- fi
59	-	48	-
60	- @if test -f $(DESTDIR)$(prelude_config_dir)/default/tls.conf; then \	49	- @if test -f $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/tls.conf; then \
61	- echo; \	50	- echo; \
62	- echo "********************************************************************************"; \	51	- echo "********************************************************************************"; \
63	- echo; \	52	- echo; \
64	- echo "$(DESTDIR)$(prelude_config_dir)/default/tls.conf already exist..."; \	53	- echo "$(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/tls.conf already exist..."; \
65	- echo "Installing default configuration in $(DESTDIR)$(prelude_config_dir)/default/tls.conf-dist"; \	54	- echo "Installing default configuration in $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/tls.conf-dist"; \
66	- echo; \	55	- echo; \
67	- echo "********************************************************************************"; \	56	- echo "********************************************************************************"; \
68	- echo; \	57	- echo; \
69	- $(INSTALL) -m 644 $(top_srcdir)/tls.conf $(DESTDIR)$(prelude_config_dir)/default/tls.conf-dist; \	58	- $(INSTALL) -m 644 $(top_srcdir)/tls.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/tls.conf-dist; \
70	- else \	59	- else \
71	- $(INSTALL) -m 644 $(top_srcdir)/tls.conf $(DESTDIR)$(prelude_config_dir)/default; \	60	- $(INSTALL) -m 644 $(top_srcdir)/tls.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default; \
72	- fi	61	- fi
73	+	62	+ $(INSTALL) -m 644 $(top_srcdir)/client.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/client.conf-dist;
74	+ $(INSTALL) -m 644 $(top_srcdir)/client.conf $(DESTDIR)$(prelude_config_dir)/default/client.conf-dist;	63	+ $(INSTALL) -m 644 $(top_srcdir)/global.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/global.conf-dist;
75	+ $(INSTALL) -m 644 $(top_srcdir)/global.conf $(DESTDIR)$(prelude_config_dir)/default/global.conf-dist;	64	+ $(INSTALL) -m 644 $(top_srcdir)/idmef-client.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/idmef-client.conf-dist;
76	+ $(INSTALL) -m 644 $(top_srcdir)/idmef-client.conf $(DESTDIR)$(prelude_config_dir)/default/idmef-client.conf-dist;	65	+ $(INSTALL) -m 644 $(top_srcdir)/tls.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/tls.conf-dist;
77	+ $(INSTALL) -m 644 $(top_srcdir)/tls.conf $(DESTDIR)$(prelude_config_dir)/default/tls.conf-dist;
78		66
79	uninstall-local:	67	uninstall-local:
80	rm -f $(DESTDIR)$(prelude_config_dir)/default/client.conf	68	rm -f $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/client.conf