Attachment #130481 for bug #174410

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

Lines 2-11 Link Here

(-)Makefile (-3 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= perdition	4	PORTNAME= perdition
5	PORTVERSION= 1.17.1	5	PORTVERSION= 1.18
6	PORTREVISION= 7
7	CATEGORIES= mail net security	6	CATEGORIES= mail net security
8	MASTER_SITES= http://www.vergenet.net/linux/perdition/download/${PORTVERSION}/	7	MASTER_SITES= http://horms.net/projects/perdition/download/${PORTVERSION}/
9		8
10	MAINTAINER= thomas@bsdunix.ch	9	MAINTAINER= thomas@bsdunix.ch
11	COMMENT= POP3 & IMAP4 proxy that can map users to multiple backend servers	10	COMMENT= POP3 & IMAP4 proxy that can map users to multiple backend servers

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (perdition-1.17.1.tar.gz) = e2abd57aa76b106591056ef835e26816c71c3b39dc55bc3aeba6dfeefac7af26	1	SHA256 (perdition-1.18.tar.gz) = cad541ca1881de8eec74106851d10c2027588b96cf1f70e3cf395f2c24c4ecaa
2	SIZE (perdition-1.17.1.tar.gz) = 638162	2	SIZE (perdition-1.18.tar.gz) = 602933




--- etc/perdition/Makefile.in.orig	2012-03-20 05:07:55.000000000 -0700
+++ etc/perdition/Makefile.in	2012-12-12 16:48:33.000000000 -0800
@@ -303,14 +303,17 @@
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(perditionconfdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(perditionconfdir)" || exit $$?; \
+	  for p in $$files; do \
+	    $(am__strip_dir) \
+	    echo " $(INSTALL_DATA) $$p '$(DESTDIR)$(perditionconfdir)/$$f-dist'"; \
+	    $(INSTALL_DATA) $$p "$(DESTDIR)$(perditionconfdir)/$$f-dist" || exit $$?; \
+          done; \
 	done
 
 uninstall-perditionconfDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(perditionconf_DATA)'; test -n "$(perditionconfdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	files=`for p in $$list; do echo $$p-dist; done | sed -e 's|^.*/||'`; \
 	test -n "$$files" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(perditionconfdir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(perditionconfdir)" && rm -f $$files
 	done
 tags: TAGS
 TAGS:

Lines 1-11 Link Here

(-)files/patch-makebdb-Makefile.in (-6 / +6 lines)
1	--- makebdb/Makefile.in.orig 2007-11-02 15:47:34.000000000 +0100	1	--- makebdb/Makefile.in.orig 2012-03-20 05:07:57.000000000 -0700
2	+++ makebdb/Makefile.in 2007-11-02 15:48:33.000000000 +0100	2	+++ makebdb/Makefile.in 2012-12-12 16:03:10.000000000 -0800
3	@@ -231,7 +231,7 @@	3	@@ -288,7 +288,7 @@
4	options.c \	4	options.c \
5	options.h	5	options.h
6		6
7	-makebdb_LDADD = -L../libjain -L../libjain/.libs/ -ljain -ldb -lpopt \	7	-makebdb_LDADD = -ldb -lpopt \
8	+makebdb_LDADD = -L../libjain -L../libjain/.libs/ -ljain -ldb3 -lpopt \	8	+makebdb_LDADD = -ldb3 -lpopt \
9	@dmalloc_lib@	9	@dmalloc_lib@
10		10
11	INCLUDES = -I$(top_srcdir)/libjain	11	all: all-am

Lines 1-11 Link Here

(-)files/patch-perdition-db-bdb-Makefile.in (-5 / +5 lines)
1	--- perdition/db/bdb/Makefile.in.orig 2007-11-02 15:49:39.000000000 +0100	1	--- perdition/db/bdb/Makefile.in.orig 2012-03-20 05:08:00.000000000 -0700
2	+++ perdition/db/bdb/Makefile.in 2007-11-02 15:50:20.000000000 +0100	2	+++ perdition/db/bdb/Makefile.in 2012-12-12 16:04:40.000000000 -0800
3	@@ -235,7 +235,7 @@	3	@@ -287,7 +287,7 @@
4	perditiondb_bdb.h	4	perditiondb_bdb.h
5		5
6	libperditiondb_bdb_la_LDFLAGS = -version-info 0:0:0	6	libperditiondb_bdb_la_LDFLAGS = -version-info 0:0:0
7	-libperditiondb_bdb_la_LIBADD = -ldb	7	-libperditiondb_bdb_la_LIBADD = -ldb -lvanessa_logger -lvanessa_adt
8	+libperditiondb_bdb_la_LIBADD = -ldb3	8	+libperditiondb_bdb_la_LIBADD = -ldb3 -lvanessa_logger -lvanessa_adt
9	INCLUDES = \	9	INCLUDES = \
10	-I$(top_srcdir)/ \	10	-I$(top_srcdir)/ \
11	-I$(top_srcdir)/perdition \	11	-I$(top_srcdir)/perdition \




--- perdition/db/ldap/Makefile.in.orig	2012-03-20 05:08:04.000000000 -0700
+++ perdition/db/ldap/Makefile.in	2012-12-12 16:50:02.000000000 -0800
@@ -864,7 +864,7 @@
 @LDAP_SCHEMA_TRUE@	test -n "@ldap_schemadir@"
 @LDAP_SCHEMA_TRUE@	mkdir -p "$(DESTDIR)@ldap_schemadir@"
 @LDAP_SCHEMA_TRUE@	chmod 755 "$(DESTDIR)@ldap_schemadir@"
-@LDAP_SCHEMA_TRUE@	install -m 644 $< "$(DESTDIR)@ldap_schemadir@/"
+@LDAP_SCHEMA_TRUE@	for p in $< ; do $(am__strip_dir) install -m 644 $$p "$(DESTDIR)@ldap_schemadir@/$$f-dist" ; done
+			install -m644 $(schema_sources) \
+				"$(DESTDIR)@ldap_schemadir@/perdition.schema-dist";\
 		fi \
 	fi
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.




--- perdition/db/posix_regex/Makefile.in.orig	2012-03-20 05:08:06.000000000 -0700
+++ perdition/db/posix_regex/Makefile.in	2012-12-12 16:47:41.000000000 -0800
@@ -414,14 +414,17 @@
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(confdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(confdir)" || exit $$?; \
+	  for p in $$files; do \
+	    $(am__strip_dir) \
+	    echo " $(INSTALL_DATA) $$p '$(DESTDIR)$(confdir)/$$f-dist'"; \
+	    $(INSTALL_DATA) $$p "$(DESTDIR)$(confdir)/$$f-dist" || exit $$?; \
+          done ; \
 	done
 
 uninstall-confDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(conf_DATA)'; test -n "$(confdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	files=`for p in $$list; do echo $$p-dist; done | sed -e 's|^.*/||'`; \
 	test -n "$$files" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(confdir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(confdir)" && rm -f $$files
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)

Lines 9-19 Link Here

(-)pkg-plist (-5 lines)
9	etc/perdition/popmap-dist	9	etc/perdition/popmap-dist
10	etc/perdition/Makefile.popmap-dist	10	etc/perdition/Makefile.popmap-dist
11	etc/perdition/Makefile	11	etc/perdition/Makefile
12	include/jain.h
13	lib/libjain.so.0
14	lib/libjain.so
15	lib/libjain.la
16	lib/libjain.a
17	%%BDB%%lib/libperditiondb_bdb.so.0	12	%%BDB%%lib/libperditiondb_bdb.so.0
18	%%BDB%%lib/libperditiondb_bdb.so	13	%%BDB%%lib/libperditiondb_bdb.so
19	%%BDB%%lib/libperditiondb_bdb.la	14	%%BDB%%lib/libperditiondb_bdb.la

Return to bug 174410

Lines 1-23 Link Here

(-)files/patch-etc-perdition-Makefile.in (-19 / +19 lines)
1	--- etc/perdition/Makefile.in.orig 2007-11-02 15:40:32.000000000 +0100	1	--- etc/perdition/Makefile.in.orig 2012-03-20 05:07:55.000000000 -0700
2	+++ etc/perdition/Makefile.in 2007-11-02 15:45:43.000000000 +0100	2	+++ etc/perdition/Makefile.in 2012-12-12 16:48:33.000000000 -0800
3	@@ -259,16 +259,16 @@	3	@@ -303,14 +303,17 @@
4	@list='$(perditionconf_DATA)'; for p in $$list; do \	4	echo "$$d$$p"; \
5	if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \	5	done \| $(am__base_list) \| \
6	f=$(am__strip_dir) \	6	while read files; do \
7	- echo " $(perditionconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(perditionconfdir)/$$f'"; \	7	- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(perditionconfdir)'"; \
8	- $(perditionconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(perditionconfdir)/$$f"; \	8	- $(INSTALL_DATA) $$files "$(DESTDIR)$(perditionconfdir)" \|\| exit $$?; \
9	+ echo " $(perditionconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(perditionconfdir)/$$f-dist'"; \	9	+ for p in $$files; do \
10	+ $(perditionconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(perditionconfdir)/$$f-dist"; \	10	+ $(am__strip_dir) \
		11	+ echo " $(INSTALL_DATA) $$p '$(DESTDIR)$(perditionconfdir)/$$f-dist'"; \
		12	+ $(INSTALL_DATA) $$p "$(DESTDIR)$(perditionconfdir)/$$f-dist" \|\| exit $$?; \
		13	+ done; \
11	done	14	done
12		15
13	uninstall-perditionconfDATA:	16	uninstall-perditionconfDATA:
14	@$(NORMAL_UNINSTALL)	17	@$(NORMAL_UNINSTALL)
15	@list='$(perditionconf_DATA)'; for p in $$list; do \	18	@list='$(perditionconf_DATA)'; test -n "$(perditionconfdir)" \|\| list=; \
16	f=$(am__strip_dir) \	19	- files=`for p in $$list; do echo $$p; done \| sed -e 's\|^.*/\|\|'`; \
17	- echo " rm -f '$(DESTDIR)$(perditionconfdir)/$$f'"; \	20	+ files=`for p in $$list; do echo $$p-dist; done \| sed -e 's\|^.*/\|\|'`; \
18	- rm -f "$(DESTDIR)$(perditionconfdir)/$$f"; \	21	test -n "$$files" \|\| exit 0; \
19	+ echo " rm -f '$(DESTDIR)$(perditionconfdir)/$$f-dist'"; \	22	echo " ( cd '$(DESTDIR)$(perditionconfdir)' && rm -f" $$files ")"; \
20	+ rm -f "$(DESTDIR)$(perditionconfdir)/$$f-dist"; \	23	cd "$(DESTDIR)$(perditionconfdir)" && rm -f $$files
21	done
22	tags: TAGS
23	TAGS:

Lines 1-13 Link Here

(-)files/patch-perdition-db-ldap-Makefile.in (-12 / +10 lines)
1	--- perdition/db/ldap/Makefile.in.orig Tue Dec 6 15:59:30 2005	1	--- perdition/db/ldap/Makefile.in.orig 2012-03-20 05:08:04.000000000 -0700
2	+++ perdition/db/ldap/Makefile.in Tue Dec 6 16:04:27 2005	2	+++ perdition/db/ldap/Makefile.in 2012-12-12 16:50:02.000000000 -0800
3	@@ -545,8 +545,8 @@	3	@@ -864,7 +864,7 @@
4	"$(DESTDIR)@ldap_schemadir@"; \	4	@LDAP_SCHEMA_TRUE@ test -n "@ldap_schemadir@"
5	fi; \	5	@LDAP_SCHEMA_TRUE@ mkdir -p "$(DESTDIR)@ldap_schemadir@"
6	if test -w "$(DESTDIR)@ldap_schemadir@"; then \	6	@LDAP_SCHEMA_TRUE@ chmod 755 "$(DESTDIR)@ldap_schemadir@"
7	- install -m644 $< \	7	-@LDAP_SCHEMA_TRUE@ install -m 644 $< "$(DESTDIR)@ldap_schemadir@/"
8	- "$(DESTDIR)@ldap_schemadir@/perdition.schema";\	8	+@LDAP_SCHEMA_TRUE@ for p in $< ; do $(am__strip_dir) install -m 644 $$p "$(DESTDIR)@ldap_schemadir@/$$f-dist" ; done
9	+ install -m644 $(schema_sources) \
10	+ "$(DESTDIR)@ldap_schemadir@/perdition.schema-dist";\
11	fi \
12	fi
13		9
		10	# Tell versions [3.59,3.63) of GNU make to not export all variables.
		11	# Otherwise a system limit (for SysV at least) may be exceeded.

Lines 1-23 Link Here

(-)files/patch-perdition-db-posix_regex-Makefile.in (-19 / +19 lines)
1	--- perdition/db/posix_regex/Makefile.in.orig 2007-11-02 15:53:56.000000000 +0100	1	--- perdition/db/posix_regex/Makefile.in.orig 2012-03-20 05:08:06.000000000 -0700
2	+++ perdition/db/posix_regex/Makefile.in 2007-11-02 15:55:31.000000000 +0100	2	+++ perdition/db/posix_regex/Makefile.in 2012-12-12 16:47:41.000000000 -0800
3	@@ -355,16 +355,16 @@	3	@@ -414,14 +414,17 @@
4	@list='$(conf_DATA)'; for p in $$list; do \	4	echo "$$d$$p"; \
5	if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \	5	done \| $(am__base_list) \| \
6	f=$(am__strip_dir) \	6	while read files; do \
7	- echo " $(confDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(confdir)/$$f'"; \	7	- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(confdir)'"; \
8	- $(confDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(confdir)/$$f"; \	8	- $(INSTALL_DATA) $$files "$(DESTDIR)$(confdir)" \|\| exit $$?; \
9	+ echo " $(confDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(confdir)/$$f-dist'"; \	9	+ for p in $$files; do \
10	+ $(confDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(confdir)/$$f-dist"; \	10	+ $(am__strip_dir) \
		11	+ echo " $(INSTALL_DATA) $$p '$(DESTDIR)$(confdir)/$$f-dist'"; \
		12	+ $(INSTALL_DATA) $$p "$(DESTDIR)$(confdir)/$$f-dist" \|\| exit $$?; \
		13	+ done ; \
11	done	14	done
12		15
13	uninstall-confDATA:	16	uninstall-confDATA:
14	@$(NORMAL_UNINSTALL)	17	@$(NORMAL_UNINSTALL)
15	@list='$(conf_DATA)'; for p in $$list; do \	18	@list='$(conf_DATA)'; test -n "$(confdir)" \|\| list=; \
16	f=$(am__strip_dir) \	19	- files=`for p in $$list; do echo $$p; done \| sed -e 's\|^.*/\|\|'`; \
17	- echo " rm -f '$(DESTDIR)$(confdir)/$$f'"; \	20	+ files=`for p in $$list; do echo $$p-dist; done \| sed -e 's\|^.*/\|\|'`; \
18	- rm -f "$(DESTDIR)$(confdir)/$$f"; \	21	test -n "$$files" \|\| exit 0; \
19	+ echo " rm -f '$(DESTDIR)$(confdir)/$$f-dist'"; \	22	echo " ( cd '$(DESTDIR)$(confdir)' && rm -f" $$files ")"; \
20	+ rm -f "$(DESTDIR)$(confdir)/$$f-dist"; \	23	cd "$(DESTDIR)$(confdir)" && rm -f $$files
21	done
22
23	ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)