Attachment #93393 for bug #131286

Lines 4-10 Link Here

(-)libprelude/Makefile (-1 / +1 lines)
4	# $FreeBSD: ports/security/libprelude/Makefile,v 1.58 2008/11/30 21:00:11 remko Exp $	4	# $FreeBSD: ports/security/libprelude/Makefile,v 1.58 2008/11/30 21:00:11 remko Exp $
5		5
6	PORTNAME= libprelude	6	PORTNAME= libprelude
7	PORTVERSION= 0.9.20.2	7	PORTVERSION= 0.9.21.2
8	PORTREVISION= 1	8	PORTREVISION= 1
9	CATEGORIES= security	9	CATEGORIES= security
10	MASTER_SITES= http://www.prelude-ids.com/download/releases/%SUBDIR%/	10	MASTER_SITES= http://www.prelude-ids.com/download/releases/%SUBDIR%/

Lines 1-3 Link Here

(-)libprelude/distinfo (-3 / +3 lines)
1	MD5 (libprelude-0.9.20.2.tar.gz) = 4980065cc9fc7f8d6f0ca25e902b745d	1	MD5 (libprelude-0.9.21.2.tar.gz) = 767ea378580caab14ebb4df0ee5e4129
2	SHA256 (libprelude-0.9.20.2.tar.gz) = e6df8831fe9b8f12bd12cac92ac2a891b4dfaefedbb4e8c703a696272e188e06	2	SHA256 (libprelude-0.9.21.2.tar.gz) = cc8c05f0855bfea1e02bb938547a7be4d81465bfe2d89f180e3a17325978bf19
3	SIZE (libprelude-0.9.20.2.tar.gz) = 2407849	3	SIZE (libprelude-0.9.21.2.tar.gz) = 2484552




--- Makefile.in.orig	2008-09-09 04:55:27.000000000 -0400
+++ Makefile.in	2008-09-09 04:55:27.000000000 -0400
@@ -1174,61 +1174,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							\
-		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;
 
 uninstall-local:
 	rm -f $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/client.conf




--- libmissing/Makefile.in.orig	2008-09-09 04:55:25.000000000 -0400
+++ libmissing/Makefile.in	2008-09-09 04:55:25.000000000 -0400
@@ -686,7 +686,7 @@
 	sys/time.h-t time.h time.h-t unistd.h unistd.h-t wchar.h \
 	wchar.h-t wctype.h wctype.h-t
 MOSTLYCLEANDIRS = arpa netinet sys sys
-CLEANFILES = configmake.h configmake.h-t charset.alias ref-add.sed \
+CLEANFILES = configmake.h configmake.h-t ref-add.sed \
 	ref-del.sed
 DISTCLEANFILES = 
 MAINTAINERCLEANFILES = 
@@ -709,8 +709,6 @@
 	vsnprintf.c
 libmissing_la_LDFLAGS = $(AM_LDFLAGS)
 LINK_WARNING_H = $(top_srcdir)/./link-warning.h
-charset_alias = $(DESTDIR)$(libdir)/charset.alias
-charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -1247,44 +1245,6 @@
 	} > $@-t
 	mv $@-t $@
 
-# We need the following in order to install a simple file in $(libdir)
-# which is shared with other installed packages. We use a list of referencing
-# packages so that "make uninstall" will remove the file if and only if it
-# is not used by another installed package.
-# On systems with glibc-2.1 or newer, the file is redundant, therefore we
-# avoid installing it.
-
-all-local: charset.alias ref-add.sed ref-del.sed
-install-exec-local: all-local
-	test $(GLIBC21) != no || $(mkinstalldirs) $(DESTDIR)$(libdir)
-	if test -f $(charset_alias); then \
-	  sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
-	  $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
-	  rm -f $(charset_tmp) ; \
-	else \
-	  if test $(GLIBC21) = no; then \
-	    sed -f ref-add.sed charset.alias > $(charset_tmp) ; \
-	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
-	    rm -f $(charset_tmp) ; \
-	  fi ; \
-	fi
-
-uninstall-local: all-local
-	if test -f $(charset_alias); then \
-	  sed -f ref-del.sed $(charset_alias) > $(charset_tmp); \
-	  if grep '^# Packages using this file: $$' $(charset_tmp) \
-	      > /dev/null; then \
-	    rm -f $(charset_alias); \
-	  else \
-	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias); \
-	  fi; \
-	  rm -f $(charset_tmp); \
-	fi
-
-charset.alias: config.charset
-	rm -f t-$@ $@
-	$(SHELL) $(srcdir)/config.charset '$(host)' > t-$@
-	mv t-$@ $@
 .sin.sed:
 	rm -f t-$@ $@
 	sed -e '/^#/d' -e 's/@''PACKAGE''@/$(PACKAGE)/g' $< > t-$@

Return to bug 131286

Lines 1-68 Link Here

(-)libprelude/files/patch-Makefile.in (-68 lines)
1	--- Makefile.in.orig 2008-09-09 04:55:27.000000000 -0400
2	+++ Makefile.in 2008-09-09 04:55:27.000000000 -0400
3	@@ -1174,61 +1174,10 @@
4	$(INSTALL) -d -m 755 $(DESTDIR)$(PRELUDE_CONFIG_DIR);
5	$(INSTALL) -d -m 755 $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default;
6	$(INSTALL) -d -m 711 $(DESTDIR)$(PRELUDE_CONFIG_DIR)/profile;
7	- @if test -f $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/client.conf; then \
8	- echo; \
9	- echo "********************************************************************************"; \
10	- echo; \
11	- echo "$(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/client.conf already exist..."; \
12	- echo "Installing default configuration in $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/client.conf-dist"; \
13	- echo; \
14	- echo "********************************************************************************"; \
15	- echo; \
16	- $(INSTALL) -m 644 $(top_builddir)/client.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/client.conf-dist; \
17	- else \
18	- $(INSTALL) -m 644 $(top_builddir)/client.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default; \
19	- fi
20	-
21	- @if test -f $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/global.conf; then \
22	- echo; \
23	- echo "********************************************************************************"; \
24	- echo; \
25	- echo "$(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/global.conf already exist..."; \
26	- echo "Installing default configuration in $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/global.conf-dist"; \
27	- echo; \
28	- echo "********************************************************************************"; \
29	- echo; \
30	- $(INSTALL) -m 644 $(top_builddir)/global.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/global.conf-dist; \
31	- else \
32	- $(INSTALL) -m 644 $(top_builddir)/global.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default; \
33	- fi
34	-
35	- @if test -f $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/idmef-client.conf; then \
36	- echo; \
37	- echo "********************************************************************************"; \
38	- echo; \
39	- echo "$(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/idmef-client.conf already exist..."; \
40	- echo "Installing default configuration in $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/idmef-client.conf-dist"; \
41	- echo; \
42	- echo "********************************************************************************"; \
43	- echo; \
44	- $(INSTALL) -m 644 $(top_builddir)/idmef-client.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/idmef-client.conf-dist;\
45	- else \
46	- $(INSTALL) -m 644 $(top_builddir)/idmef-client.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default; \
47	- fi
48	-
49	- @if test -f $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/tls.conf; then \
50	- echo; \
51	- echo "********************************************************************************"; \
52	- echo; \
53	- echo "$(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/tls.conf already exist..."; \
54	- echo "Installing default configuration in $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/tls.conf-dist"; \
55	- echo; \
56	- echo "********************************************************************************"; \
57	- echo; \
58	- $(INSTALL) -m 644 $(top_srcdir)/tls.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/tls.conf-dist; \
59	- else \
60	- $(INSTALL) -m 644 $(top_srcdir)/tls.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default; \
61	- fi
62	+ $(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;
64	+ $(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;
66
67	uninstall-local:
68	rm -f $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/client.conf

Lines 1-65 Link Here

(-)libprelude/files/patch-libmissing_Makefile.in (-65 lines)
1	--- libmissing/Makefile.in.orig 2008-09-09 04:55:25.000000000 -0400
2	+++ libmissing/Makefile.in 2008-09-09 04:55:25.000000000 -0400
3	@@ -686,7 +686,7 @@
4	sys/time.h-t time.h time.h-t unistd.h unistd.h-t wchar.h \
5	wchar.h-t wctype.h wctype.h-t
6	MOSTLYCLEANDIRS = arpa netinet sys sys
7	-CLEANFILES = configmake.h configmake.h-t charset.alias ref-add.sed \
8	+CLEANFILES = configmake.h configmake.h-t ref-add.sed \
9	ref-del.sed
10	DISTCLEANFILES =
11	MAINTAINERCLEANFILES =
12	@@ -709,8 +709,6 @@
13	vsnprintf.c
14	libmissing_la_LDFLAGS = $(AM_LDFLAGS)
15	LINK_WARNING_H = $(top_srcdir)/./link-warning.h
16	-charset_alias = $(DESTDIR)$(libdir)/charset.alias
17	-charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
18	all: $(BUILT_SOURCES)
19	$(MAKE) $(AM_MAKEFLAGS) all-recursive
20
21	@@ -1247,44 +1245,6 @@
22	} > $@-t
23	mv $@-t $@
24
25	-# We need the following in order to install a simple file in $(libdir)
26	-# which is shared with other installed packages. We use a list of referencing
27	-# packages so that "make uninstall" will remove the file if and only if it
28	-# is not used by another installed package.
29	-# On systems with glibc-2.1 or newer, the file is redundant, therefore we
30	-# avoid installing it.
31	-
32	-all-local: charset.alias ref-add.sed ref-del.sed
33	-install-exec-local: all-local
34	- test $(GLIBC21) != no \|\| $(mkinstalldirs) $(DESTDIR)$(libdir)
35	- if test -f $(charset_alias); then \
36	- sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
37	- $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
38	- rm -f $(charset_tmp) ; \
39	- else \
40	- if test $(GLIBC21) = no; then \
41	- sed -f ref-add.sed charset.alias > $(charset_tmp) ; \
42	- $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
43	- rm -f $(charset_tmp) ; \
44	- fi ; \
45	- fi
46	-
47	-uninstall-local: all-local
48	- if test -f $(charset_alias); then \
49	- sed -f ref-del.sed $(charset_alias) > $(charset_tmp); \
50	- if grep '^# Packages using this file: $$' $(charset_tmp) \
51	- > /dev/null; then \
52	- rm -f $(charset_alias); \
53	- else \
54	- $(INSTALL_DATA) $(charset_tmp) $(charset_alias); \
55	- fi; \
56	- rm -f $(charset_tmp); \
57	- fi
58	-
59	-charset.alias: config.charset
60	- rm -f t-$@ $@
61	- $(SHELL) $(srcdir)/config.charset '$(host)' > t-$@
62	- mv t-$@ $@
63	.sin.sed:
64	rm -f t-$@ $@
65	sed -e '/^#/d' -e 's/@''PACKAGE''@/$(PACKAGE)/g' $< > t-$@