Attachment #62562 for bug #93498

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

Lines 16-22 Link Here

(-)/data2/FreeBSD/custom_ports/security/libprelude/Makefile (-1 / +1 lines)
16	USE_GPG= yes	16	USE_GPG= yes
17	SIG_SUFFIX= .sig	17	SIG_SUFFIX= .sig
18	USE_GMAKE= yes	18	USE_GMAKE= yes
19	USE_AUTOTOOLS= libtool:15	19	GNU_CONFIGURE= yes
20	INSTALLS_SHLIB= yes	20	INSTALLS_SHLIB= yes
21	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}	21	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
22	CONFIGURE_ARGS= --localstatedir=/var	22	CONFIGURE_ARGS= --localstatedir=/var




--- Makefile.in.orig	Sat Jan 28 18:06:10 2006
+++ Makefile.in	Mon Jan 30 15:04:06 2006
@@ -310,7 +310,7 @@
 target_vendor = @target_vendor@
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 ACLOCAL_AMFLAGS = -I m4 -I libmissing/m4

 EXTRA_DIST = HACKING.README LICENSE.README client.conf global.conf idmef-client.conf tls.conf
 bin_SCRIPTS = $(top_builddir)/libprelude-config
 distuninstallcheck_listfiles = find . -type f -print | grep -v 'perl' | grep -v '3pm'
@@ -832,61 +832,13 @@
 	$(INSTALL) -d -m 755 $(DESTDIR)$(prelude_config_dir);
 	$(INSTALL) -d -m 755 $(DESTDIR)$(prelude_config_dir)/default;
 	$(INSTALL) -d -m 755 $(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_srcdir)/client.conf $(DESTDIR)$(prelude_config_dir)/default/client.conf-dist;		\
-        else															\
-                $(INSTALL) -m 644 $(top_srcdir)/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_srcdir)/global.conf $(DESTDIR)$(prelude_config_dir)/default/global.conf-dist;		\
-        else															\
-                $(INSTALL) -m 644 $(top_srcdir)/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_srcdir)/idmef-client.conf $(DESTDIR)$(prelude_config_dir)/default/idmef-client.conf-dist; \
-        else															\
-                $(INSTALL) -m 644 $(top_srcdir)/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;
 
 uninstall-local:
 	rm -f $(DESTDIR)$(prelude_config_dir)/default/client.conf




@comment $FreeBSD: ports/security/libprelude/pkg-plist,v 1.9 2006/02/14 15:12:59 sergei Exp $
bin/libprelude-config
bin/prelude-adduser
etc/prelude/default/client.conf-dist
etc/prelude/default/global.conf-dist
etc/prelude/default/idmef-client.conf-dist
etc/prelude/default/tls.conf-dist
include/libprelude/common.h
include/libprelude/daemonize.h
include/libprelude/idmef-additional-data.h

include/libprelude/prelude-timer.h
include/libprelude/prelude.h
include/libprelude/variable.h
lib/libprelude.la
lib/libprelude.so
lib/libprelude.so.6
%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Prelude.pm

Return to bug 93498

Lines 1-6 Link Here

(-)/data2/FreeBSD/custom_ports/security/libprelude/files/patch-Makefile.in (-3 / +72 lines)
1	--- Makefile.in.orig Tue Jan 10 16:15:30 2006	1	--- Makefile.in.orig Sat Jan 28 18:06:10 2006
2	+++ Makefile.in Tue Jan 10 16:15:49 2006	2	+++ Makefile.in Mon Jan 30 15:04:06 2006
3	@@ -308,7 +308,7 @@	3	@@ -310,7 +310,7 @@
4	target_vendor = @target_vendor@	4	target_vendor = @target_vendor@
5	DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc	5	DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
6	ACLOCAL_AMFLAGS = -I m4 -I libmissing/m4	6	ACLOCAL_AMFLAGS = -I m4 -I libmissing/m4
Lines 9-11 Link Here
9	EXTRA_DIST = HACKING.README LICENSE.README client.conf global.conf idmef-client.conf tls.conf	9	EXTRA_DIST = HACKING.README LICENSE.README client.conf global.conf idmef-client.conf tls.conf
10	bin_SCRIPTS = $(top_builddir)/libprelude-config	10	bin_SCRIPTS = $(top_builddir)/libprelude-config
11	distuninstallcheck_listfiles = find . -type f -print \| grep -v 'perl' \| grep -v '3pm'	11	distuninstallcheck_listfiles = find . -type f -print \| grep -v 'perl' \| grep -v '3pm'
		12	@@ -832,61 +832,13 @@
		13	$(INSTALL) -d -m 755 $(DESTDIR)$(prelude_config_dir);
		14	$(INSTALL) -d -m 755 $(DESTDIR)$(prelude_config_dir)/default;
		15	$(INSTALL) -d -m 755 $(DESTDIR)$(prelude_config_dir)/profile;
		16	- @if test -f $(DESTDIR)$(prelude_config_dir)/default/client.conf; then \
		17	- echo; \
		18	- echo "********************************************************************************"; \
		19	- echo; \
		20	- echo "$(DESTDIR)$(prelude_config_dir)/default/client.conf already exist..."; \
		21	- echo "Installing default configuration in $(DESTDIR)$(prelude_config_dir)/default/client.conf-dist"; \
		22	- echo; \
		23	- echo "********************************************************************************"; \
		24	- echo; \
		25	- $(INSTALL) -m 644 $(top_srcdir)/client.conf $(DESTDIR)$(prelude_config_dir)/default/client.conf-dist; \
		26	- else \
		27	- $(INSTALL) -m 644 $(top_srcdir)/client.conf $(DESTDIR)$(prelude_config_dir)/default; \
		28	- fi
		29	-
		30	- @if test -f $(DESTDIR)$(prelude_config_dir)/default/global.conf; then \
		31	- echo; \
		32	- echo "********************************************************************************"; \
		33	- echo; \
		34	- echo "$(DESTDIR)$(prelude_config_dir)/default/global.conf already exist..."; \
		35	- echo "Installing default configuration in $(DESTDIR)$(prelude_config_dir)/default/global.conf-dist"; \
		36	- echo; \
		37	- echo "********************************************************************************"; \
		38	- echo; \
		39	- $(INSTALL) -m 644 $(top_srcdir)/global.conf $(DESTDIR)$(prelude_config_dir)/default/global.conf-dist; \
		40	- else \
		41	- $(INSTALL) -m 644 $(top_srcdir)/global.conf $(DESTDIR)$(prelude_config_dir)/default; \
		42	- fi
		43	-
		44	- @if test -f $(DESTDIR)$(prelude_config_dir)/default/idmef-client.conf; then \
		45	- echo; \
		46	- echo "********************************************************************************"; \
		47	- echo; \
		48	- echo "$(DESTDIR)$(prelude_config_dir)/default/idmef-client.conf already exist..."; \
		49	- echo "Installing default configuration in $(DESTDIR)$(prelude_config_dir)/default/idmef-client.conf-dist"; \
		50	- echo; \
		51	- echo "********************************************************************************"; \
		52	- echo; \
		53	- $(INSTALL) -m 644 $(top_srcdir)/idmef-client.conf $(DESTDIR)$(prelude_config_dir)/default/idmef-client.conf-dist; \
		54	- else \
		55	- $(INSTALL) -m 644 $(top_srcdir)/idmef-client.conf $(DESTDIR)$(prelude_config_dir)/default; \
		56	- fi
		57	-
		58	- @if test -f $(DESTDIR)$(prelude_config_dir)/default/tls.conf; then \
		59	- echo; \
		60	- echo "********************************************************************************"; \
		61	- echo; \
		62	- echo "$(DESTDIR)$(prelude_config_dir)/default/tls.conf already exist..."; \
		63	- echo "Installing default configuration in $(DESTDIR)$(prelude_config_dir)/default/tls.conf-dist"; \
		64	- echo; \
		65	- echo "********************************************************************************"; \
		66	- echo; \
		67	- $(INSTALL) -m 644 $(top_srcdir)/tls.conf $(DESTDIR)$(prelude_config_dir)/default/tls.conf-dist; \
		68	- else \
		69	- $(INSTALL) -m 644 $(top_srcdir)/tls.conf $(DESTDIR)$(prelude_config_dir)/default; \
		70	- fi
		71	+ $(INSTALL) -m 644 $(top_srcdir)/client.conf $(DESTDIR)$(prelude_config_dir)/default/client.conf-dist;
		72	+
		73	+ $(INSTALL) -m 644 $(top_srcdir)/global.conf $(DESTDIR)$(prelude_config_dir)/default/global.conf-dist;
		74	+
		75	+ $(INSTALL) -m 644 $(top_srcdir)/idmef-client.conf $(DESTDIR)$(prelude_config_dir)/default/idmef-client.conf-dist;
76	+
77	+ $(INSTALL) -m 644 $(top_srcdir)/tls.conf $(DESTDIR)$(prelude_config_dir)/default/tls.conf-dist;
78
79	uninstall-local:
80	rm -f $(DESTDIR)$(prelude_config_dir)/default/client.conf

Lines 1-10 Link Here

(-)/data2/FreeBSD/custom_ports/security/libprelude/pkg-plist (-5 / +5 lines)
1	@comment $FreeBSD: ports/security/libprelude/pkg-plist,v 1.9 2006/02/14 15:12:59 sergei Exp $	1	@comment $FreeBSD: ports/security/libprelude/pkg-plist,v 1.9 2006/02/14 15:12:59 sergei Exp $
2	bin/libprelude-config	2	bin/libprelude-config
3	bin/prelude-adduser	3	bin/prelude-adduser
4	etc/prelude/default/client.conf	4	etc/prelude/default/client.conf-dist
5	etc/prelude/default/global.conf	5	etc/prelude/default/global.conf-dist
6	etc/prelude/default/idmef-client.conf	6	etc/prelude/default/idmef-client.conf-dist
7	etc/prelude/default/tls.conf	7	etc/prelude/default/tls.conf-dist
8	include/libprelude/common.h	8	include/libprelude/common.h
9	include/libprelude/daemonize.h	9	include/libprelude/daemonize.h
10	include/libprelude/idmef-additional-data.h	10	include/libprelude/idmef-additional-data.h
Lines 50-56 Link Here
50	include/libprelude/prelude-timer.h	50	include/libprelude/prelude-timer.h
51	include/libprelude/prelude.h	51	include/libprelude/prelude.h
52	include/libprelude/variable.h	52	include/libprelude/variable.h
53	lib/libprelude.a	53	lib/libprelude.la
54	lib/libprelude.so	54	lib/libprelude.so
55	lib/libprelude.so.6	55	lib/libprelude.so.6
56	%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Prelude.pm	56	%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Prelude.pm