FreeBSD Bugzilla – Attachment 113566 Details for
Bug 155137
[PATCH] postgresql* prior 9.0 didn't conflict with postgresql9.0-*
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
file.shar
file.shar (text/plain), 14.83 KB, created by
Aldis Berjoza
on 2011-02-28 23:20:06 UTC
(
hide
)
Description:
file.shar
Filename:
MIME Type:
Creator:
Aldis Berjoza
Created:
2011-02-28 23:20:06 UTC
Size:
14.83 KB
patch
obsolete
># This is a shell archive. Save it in a file, remove anything before ># this line, and then unpack it by entering "sh file". Note, it may ># create directories; files and directories will be owned by you and ># have default permissions. ># ># This archive contains: ># ># postgresql-patches ># postgresql-patches/postgresql83-client.patch ># postgresql-patches/postgresql84-server.patch ># postgresql-patches/postgresql82-client.patch ># postgresql-patches/postgresql80-client.patch ># postgresql-patches/postgresql73-server.patch ># postgresql-patches/postgresql81-client.patch ># postgresql-patches/postgresql74-client.patch ># postgresql-patches/postgresql84-client.patch ># postgresql-patches/postgresql83-server.patch ># postgresql-patches/postgresql82-server.patch ># postgresql-patches/postgresql81-contrib.patch ># postgresql-patches/postgresql80-server.patch ># postgresql-patches/postgresql84-contrib.patch ># postgresql-patches/postgresql74-server.patch ># postgresql-patches/postgresql73-client.patch ># postgresql-patches/postgresql81-server.patch ># postgresql-patches/postgresql83-contrib.patch ># postgresql-patches/postgresql82-contrib.patch ># postgresql-patches/postgresql80-contrib.patch ># postgresql-patches/postgresql74-contrib.patch ># >echo c - postgresql-patches >mkdir -p postgresql-patches > /dev/null 2>&1 >echo x - postgresql-patches/postgresql83-client.patch >sed 's/^X//' >postgresql-patches/postgresql83-client.patch << 'be825b2ae03873083177f8fa63e49ec7' >Xdiff -ur postgresql83-client.bak/Makefile postgresql83-client/Makefile >X--- postgresql83-client.bak/Makefile 2011-03-01 00:57:39.097243084 +0200 >X+++ postgresql83-client/Makefile 2011-03-01 01:00:17.758341352 +0200 >X@@ -8,6 +8,7 @@ >X # See Mk/bsd.databases.mk for more info >X >X PORTNAME= postgresql >X+PORTREVISION= 1 >X PKGNAMESUFFIX= -client >X PORTEPOCH= 1 >X >be825b2ae03873083177f8fa63e49ec7 >echo x - postgresql-patches/postgresql84-server.patch >sed 's/^X//' >postgresql-patches/postgresql84-server.patch << '7674e4243e6691ce20d05990abba5218' >Xdiff -ur postgresql84-server.bak/Makefile postgresql84-server/Makefile >X--- postgresql84-server.bak/Makefile 2011-03-01 00:57:39.196255947 +0200 >X+++ postgresql84-server/Makefile 2011-03-01 01:00:34.236437032 +0200 >X@@ -7,6 +7,7 @@ >X >X PORTNAME?= postgresql >X DISTVERSION?= 8.4.7 >X+PORTREVISION?= 1 >X CATEGORIES?= databases >X MASTER_SITES= ${MASTER_SITE_PGSQL} >X MASTER_SITE_SUBDIR= source/v${DISTVERSION} >X@@ -15,8 +16,8 @@ >X MAINTAINER?= girgen@FreeBSD.org >X COMMENT?= The most advanced open-source database available anywhere >X >X-CONFLICTS?= ${PORTNAME}-client-7.* \ >X- ${PORTNAME}${PKGNAMESUFFIX}-7.* \ >X+CONFLICTS?= ${PORTNAME}-client-[79].* \ >X+ ${PORTNAME}${PKGNAMESUFFIX}-[79].* \ >X ${PORTNAME}-client-8.[0-35-9]* \ >X ${PORTNAME}${PKGNAMESUFFIX}-8.[0-35-9]* >X >7674e4243e6691ce20d05990abba5218 >echo x - postgresql-patches/postgresql82-client.patch >sed 's/^X//' >postgresql-patches/postgresql82-client.patch << '29c9f0ff9483ba3f24cb6b920c334a67' >Xdiff -ur postgresql82-client.bak/Makefile postgresql82-client/Makefile >X--- postgresql82-client.bak/Makefile 2011-03-01 00:57:38.943224347 +0200 >X+++ postgresql82-client/Makefile 2011-03-01 00:59:50.467890471 +0200 >X@@ -8,6 +8,7 @@ >X # See Mk/bsd.databases.mk for more info >X >X PORTNAME= postgresql >X+PORTREVISION= 1 >X PKGNAMESUFFIX= -client >X >X COMMENT= PostgreSQL database (client) >29c9f0ff9483ba3f24cb6b920c334a67 >echo x - postgresql-patches/postgresql80-client.patch >sed 's/^X//' >postgresql-patches/postgresql80-client.patch << 'ec90d09326b18be7e1160aabda3e765c' >Xdiff -ur postgresql80-client.bak/Makefile postgresql80-client/Makefile >X--- postgresql80-client.bak/Makefile 2011-03-01 00:57:38.670189366 +0200 >X+++ postgresql80-client/Makefile 2011-03-01 00:58:30.216719163 +0200 >X@@ -8,6 +8,7 @@ >X # See Mk/bsd.port.mk for more info >X >X PORTNAME= postgresql >X+PORTREVISION= 1 >X PKGNAMESUFFIX= -client >X >X COMMENT= PostgreSQL database (client) >ec90d09326b18be7e1160aabda3e765c >echo x - postgresql-patches/postgresql73-server.patch >sed 's/^X//' >postgresql-patches/postgresql73-server.patch << 'b50002228b35bf1b6d327c68dd0c2fbc' >Xdiff -ur postgresql74-server.bak/Makefile postgresql73-server/Makefile >X--- postgresql73-server.bak/Makefile 2011-03-01 00:57:38.362156641 +0200 >X+++ postgresql73-server/Makefile 2011-03-01 00:57:44.397914817 +0200 >X@@ -7,7 +7,7 @@ >X >X PORTNAME?= postgresql >X PORTVERSION?= 7.3.21 >X-PORTREVISION?= 2 >X+PORTREVISION?= 3 >X CATEGORIES?= databases >X MASTER_SITES= ${MASTER_SITE_PGSQL} >X MASTER_SITE_SUBDIR= source/v${PORTVERSION} >X@@ -20,9 +20,9 @@ >X EXPIRATION_DATE=2011-04-02 >X >X CONFLICTS?= ${PORTNAME}${PKGNAMESUFFIX}-7.[0-24-9]* \ >X- ${PORTNAME}${PKGNAMESUFFIX}-8.* \ >X+ ${PORTNAME}${PKGNAMESUFFIX}-[89].* \ >X ${PORTNAME}-client-7.[0-24-9]* \ >X- ${PORTNAME}-client-8.* >X+ ${PORTNAME}-client-[89].* >X >X WRKSRC= ${WRKDIR}/postgresql-${PORTVERSION} >X DIST_SUBDIR= postgresql >b50002228b35bf1b6d327c68dd0c2fbc >echo x - postgresql-patches/postgresql81-client.patch >sed 's/^X//' >postgresql-patches/postgresql81-client.patch << '6d2a2832950b95c4f5950126752cc57d' >Xdiff -ur postgresql81-client.bak/Makefile postgresql81-client/Makefile >X--- postgresql81-client.bak/Makefile 2011-03-01 00:57:38.792203756 +0200 >X+++ postgresql81-client/Makefile 2011-03-01 00:58:53.874714522 +0200 >X@@ -8,6 +8,7 @@ >X # See Mk/bsd.databases.mk for more info >X >X PORTNAME= postgresql >X+PORTREVISION= 1 >X PKGNAMESUFFIX= -client >X >X COMMENT= PostgreSQL database (client) >6d2a2832950b95c4f5950126752cc57d >echo x - postgresql-patches/postgresql74-client.patch >sed 's/^X//' >postgresql-patches/postgresql74-client.patch << 'be5a845948673cc25383a54caa8b6cb1' >Xdiff -ur postgresql74-client.bak/Makefile postgresql74-client/Makefile >X--- postgresql74-client.bak/Makefile 2011-03-01 00:57:38.526170224 +0200 >X+++ postgresql74-client/Makefile 2011-03-01 00:58:03.646353096 +0200 >X@@ -8,6 +8,7 @@ >X # See Mk/bsd.port.mk for more info >X >X PORTNAME= postgresql >X+PORTREVISION= 1 >X PKGNAMESUFFIX= -client >X >X COMMENT= PostgreSQL database (client) >be5a845948673cc25383a54caa8b6cb1 >echo x - postgresql-patches/postgresql84-client.patch >sed 's/^X//' >postgresql-patches/postgresql84-client.patch << 'c0ae8f87c3afead404d71a80ae5586e1' >Xdiff -ur postgresql84-client.bak/Makefile postgresql84-client/Makefile >X--- postgresql84-client.bak/Makefile 2011-03-01 00:57:39.250261973 +0200 >X+++ postgresql84-client/Makefile 2011-03-01 01:00:42.137435622 +0200 >X@@ -8,6 +8,7 @@ >X # See Mk/bsd.databases.mk for more info >X >X PORTNAME= postgresql >X+PORTREVISION= 1 >X PKGNAMESUFFIX= -client >X >X COMMENT= PostgreSQL database (client) >c0ae8f87c3afead404d71a80ae5586e1 >echo x - postgresql-patches/postgresql83-server.patch >sed 's/^X//' >postgresql-patches/postgresql83-server.patch << 'd4038724f9b62124315e36368b364e07' >Xdiff -ur postgresql83-server.bak/Makefile postgresql83-server/Makefile >X--- postgresql83-server.bak/Makefile 2011-03-01 00:57:39.042236093 +0200 >X+++ postgresql83-server/Makefile 2011-03-01 01:00:08.876217227 +0200 >X@@ -7,6 +7,7 @@ >X >X PORTNAME?= postgresql >X DISTVERSION?= 8.3.14 >X+PORTREVISION?= 1 >X CATEGORIES?= databases >X MASTER_SITES= ${MASTER_SITE_PGSQL} >X MASTER_SITE_SUBDIR= source/v${DISTVERSION} >X@@ -15,8 +16,8 @@ >X MAINTAINER?= girgen@FreeBSD.org >X COMMENT?= The most advanced open-source database available anywhere >X >X-CONFLICTS?= ${PORTNAME}-client-7.* \ >X- ${PORTNAME}${PKGNAMESUFFIX}-7.* \ >X+CONFLICTS?= ${PORTNAME}-client-[79].* \ >X+ ${PORTNAME}${PKGNAMESUFFIX}-[79].* \ >X ${PORTNAME}-client-8.[0-24-9]* \ >X ${PORTNAME}${PKGNAMESUFFIX}-8.[0-24-9]* >X >d4038724f9b62124315e36368b364e07 >echo x - postgresql-patches/postgresql82-server.patch >sed 's/^X//' >postgresql-patches/postgresql82-server.patch << '9b36765f79ef872cbeac07e93ae83046' >Xdiff -ur postgresql83-server.bak/Makefile postgresql82-server/Makefile >X--- postgresql82-server.bak/Makefile 2011-03-01 00:57:38.885216136 +0200 >X+++ postgresql82-server/Makefile 2011-03-01 00:59:41.457743371 +0200 >X@@ -7,6 +7,7 @@ >X >X PORTNAME?= postgresql >X PORTVERSION?= 8.2.20 >X+PORTREVISION?= 1 >X CATEGORIES?= databases >X MASTER_SITES= ${MASTER_SITE_PGSQL} >X MASTER_SITE_SUBDIR= source/v${PORTVERSION} >X@@ -16,8 +17,8 @@ >X MAINTAINER?= girgen@FreeBSD.org >X COMMENT?= The most advanced open-source database available anywhere >X >X-CONFLICTS?= ${PORTNAME}-client-7.* \ >X- ${PORTNAME}${PKGNAMESUFFIX}-7.* \ >X+CONFLICTS?= ${PORTNAME}-client-[79].* \ >X+ ${PORTNAME}${PKGNAMESUFFIX}-[79].* \ >X ${PORTNAME}-client-8.[0-13-9]* \ >X ${PORTNAME}${PKGNAMESUFFIX}-8.[0-13-9]* >X >9b36765f79ef872cbeac07e93ae83046 >echo x - postgresql-patches/postgresql81-contrib.patch >sed 's/^X//' >postgresql-patches/postgresql81-contrib.patch << '786a7e35b9e86f63da57622d6ffe3c7b' >Xdiff -ur postgresql81-contrib.bak/Makefile postgresql81-contrib/Makefile >X--- postgresql81-contrib.bak/Makefile 2011-03-01 00:57:38.839210848 +0200 >X+++ postgresql81-contrib/Makefile 2011-03-01 00:59:31.456475612 +0200 >X@@ -6,6 +6,7 @@ >X # >X >X PORTNAME= postgresql >X+PORTREVISION= 1 >X PKGNAMESUFFIX= -contrib >X CATEGORIES= databases >X >786a7e35b9e86f63da57622d6ffe3c7b >echo x - postgresql-patches/postgresql80-server.patch >sed 's/^X//' >postgresql-patches/postgresql80-server.patch << '462e811ee6f554224e869cbbc4287ade' >Xdiff -ur postgresql81-server.bak/Makefile postgresql80-server/Makefile >X--- postgresql80-server.bak/Makefile 2011-03-01 00:57:38.616181385 +0200 >X+++ postgresql80-server/Makefile 2011-03-01 00:58:19.579373075 +0200 >X@@ -7,7 +7,7 @@ >X >X PORTNAME?= postgresql >X PORTVERSION?= 8.0.26 >X-PORTREVISION?= 1 >X+PORTREVISION?= 2 >X CATEGORIES?= databases >X MASTER_SITES= ${MASTER_SITE_PGSQL} >X MASTER_SITE_SUBDIR= source/v${PORTVERSION} >X@@ -19,8 +19,8 @@ >X DEPRECATED= EOL see http://wiki.postgresql.org/wiki/PostgreSQL_Release_Support_Policy >X EXPIRATION_DATE=2011-04-02 >X >X-CONFLICTS?= ${PORTNAME}-client-7.* \ >X- ${PORTNAME}${PKGNAMESUFFIX}-7.* \ >X+CONFLICTS?= ${PORTNAME}-client-[79].* \ >X+ ${PORTNAME}${PKGNAMESUFFIX}-[79].* \ >X ${PORTNAME}-client-8.[1-9]* \ >X ${PORTNAME}${PKGNAMESUFFIX}-8.[1-9]* >X >462e811ee6f554224e869cbbc4287ade >echo x - postgresql-patches/postgresql84-contrib.patch >sed 's/^X//' >postgresql-patches/postgresql84-contrib.patch << '0eec8526aa16ee353b130193eb0f827e' >Xdiff -ur postgresql84-contrib.bak/Makefile postgresql84-contrib/Makefile >X--- postgresql84-contrib.bak/Makefile 2011-03-01 00:57:39.293269395 +0200 >X+++ postgresql84-contrib/Makefile 2011-03-01 01:00:49.769396109 +0200 >X@@ -6,6 +6,7 @@ >X # >X >X PORTNAME= postgresql >X+PORTREVISION= 1 >X PKGNAMESUFFIX= -contrib >X CATEGORIES= databases >X >0eec8526aa16ee353b130193eb0f827e >echo x - postgresql-patches/postgresql74-server.patch >sed 's/^X//' >postgresql-patches/postgresql74-server.patch << 'ff9cb3799e6383b9eb3a810d9a94cc12' >Xdiff -ur postgresql75-server.bak/Makefile postgresql74-server/Makefile >X--- postgresql74-server.bak/Makefile 2011-03-01 00:57:38.480164377 +0200 >X+++ postgresql74-server/Makefile 2011-03-01 00:57:51.921868281 +0200 >X@@ -7,7 +7,7 @@ >X >X PORTNAME?= postgresql >X PORTVERSION?= 7.4.30 >X-PORTREVISION?= 1 >X+PORTREVISION?= 2 >X CATEGORIES?= databases >X MASTER_SITES= ${MASTER_SITE_PGSQL} >X MASTER_SITE_SUBDIR= source/v${PORTVERSION} >X@@ -20,9 +20,9 @@ >X EXPIRATION_DATE=2011-04-02 >X >X CONFLICTS?= ${PORTNAME}${PKGNAMESUFFIX}-7.[0-35-9]* \ >X- ${PORTNAME}${PKGNAMESUFFIX}-8.* \ >X+ ${PORTNAME}${PKGNAMESUFFIX}-[89].* \ >X ${PORTNAME}-client-7.[0-35-9]* \ >X- ${PORTNAME}-client-8.* >X+ ${PORTNAME}-client-[89].* >X >X WRKSRC= ${WRKDIR}/postgresql-${PORTVERSION} >X DIST_SUBDIR= postgresql >ff9cb3799e6383b9eb3a810d9a94cc12 >echo x - postgresql-patches/postgresql73-client.patch >sed 's/^X//' >postgresql-patches/postgresql73-client.patch << '817fe9c31eb8ed0a26da1e0075913a72' >Xdiff -ur postgresql73-client.bak/Makefile postgresql73-client/Makefile >X--- postgresql73-client.bak/Makefile 2011-03-01 00:57:38.410155200 +0200 >X+++ postgresql73-client/Makefile 2011-03-01 00:57:47.611322108 +0200 >X@@ -9,7 +9,7 @@ >X >X PORTNAME= postgresql >X PKGNAMESUFFIX= -client >X-PORTREVISION= 1 >X+PORTREVISION= 2 >X >X COMMENT= PostgreSQL database (client) >X >817fe9c31eb8ed0a26da1e0075913a72 >echo x - postgresql-patches/postgresql81-server.patch >sed 's/^X//' >postgresql-patches/postgresql81-server.patch << '67a712ad64e16856e2f84a2743a27eac' >Xdiff -ur postgresql81-server.bak/Makefile postgresql81-server/Makefile >X--- postgresql81-server.bak/Makefile 2011-03-01 00:57:38.758207257 +0200 >X+++ postgresql81-server/Makefile 2011-03-01 00:58:46.933835723 +0200 >X@@ -7,6 +7,7 @@ >X >X PORTNAME?= postgresql >X PORTVERSION?= 8.1.23 >X+PORTREVISION?= 1 >X CATEGORIES?= databases >X MASTER_SITES= ${MASTER_SITE_PGSQL} >X MASTER_SITE_SUBDIR= source/v${PORTVERSION} >X@@ -18,8 +19,8 @@ >X DEPRECATED= EOL see http://wiki.postgresql.org/wiki/PostgreSQL_Release_Support_Policy >X EXPIRATION_DATE=2011-04-02 >X >X-CONFLICTS?= ${PORTNAME}-client-7.* \ >X- ${PORTNAME}${PKGNAMESUFFIX}-7.* \ >X+CONFLICTS?= ${PORTNAME}-client-[79].* \ >X+ ${PORTNAME}${PKGNAMESUFFIX}-[79].* \ >X ${PORTNAME}-client-8.[02-9]* \ >X ${PORTNAME}${PKGNAMESUFFIX}-8.[02-9]* >X >67a712ad64e16856e2f84a2743a27eac >echo x - postgresql-patches/postgresql83-contrib.patch >sed 's/^X//' >postgresql-patches/postgresql83-contrib.patch << '4912c9d99dc4a76fe073cdbac7800a05' >Xdiff -ur postgresql83-contrib.bak/Makefile postgresql83-contrib/Makefile >X--- postgresql83-contrib.bak/Makefile 2011-03-01 00:57:39.151250507 +0200 >X+++ postgresql83-contrib/Makefile 2011-03-01 01:00:24.673216846 +0200 >X@@ -6,6 +6,7 @@ >X # >X >X PORTNAME= postgresql >X+PORTREVISION= 1 >X PKGNAMESUFFIX= -contrib >X CATEGORIES= databases >X >4912c9d99dc4a76fe073cdbac7800a05 >echo x - postgresql-patches/postgresql82-contrib.patch >sed 's/^X//' >postgresql-patches/postgresql82-contrib.patch << 'b1c1c825c20e0e743756874c907d63e7' >Xdiff -ur postgresql82-contrib.bak/Makefile postgresql82-contrib/Makefile >X--- postgresql82-contrib.bak/Makefile 2011-03-01 00:57:39.004231263 +0200 >X+++ postgresql82-contrib/Makefile 2011-03-01 00:59:58.141856296 +0200 >X@@ -6,6 +6,7 @@ >X # >X >X PORTNAME= postgresql >X+PORTREVISION= 1 >X PKGNAMESUFFIX= -contrib >X CATEGORIES= databases >X >b1c1c825c20e0e743756874c907d63e7 >echo x - postgresql-patches/postgresql80-contrib.patch >sed 's/^X//' >postgresql-patches/postgresql80-contrib.patch << '72007a9ad212615b612a87365af757b4' >Xdiff -ur postgresql80-contrib.bak/Makefile postgresql80-contrib/Makefile >X--- postgresql80-contrib.bak/Makefile 2011-03-01 00:57:38.701200291 +0200 >X+++ postgresql80-contrib/Makefile 2011-03-01 00:58:37.944696880 +0200 >X@@ -6,6 +6,7 @@ >X # >X >X PORTNAME= postgresql >X+PORTREVISION= 1 >X PKGNAMESUFFIX= -contrib >X CATEGORIES= databases >X >72007a9ad212615b612a87365af757b4 >echo x - postgresql-patches/postgresql74-contrib.patch >sed 's/^X//' >postgresql-patches/postgresql74-contrib.patch << '0358af4b06824710796072e67eb58388' >Xdiff -ur postgresql74-contrib.bak/Makefile postgresql74-contrib/Makefile >X--- postgresql74-contrib.bak/Makefile 2011-03-01 00:57:38.568175842 +0200 >X+++ postgresql74-contrib/Makefile 2011-03-01 00:58:15.843900271 +0200 >X@@ -6,6 +6,7 @@ >X # >X >X PORTNAME= postgresql >X+PORTREVISION= 1 >X PKGNAMESUFFIX= -contrib >X CATEGORIES= databases >X >0358af4b06824710796072e67eb58388 >exit
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 155137
: 113566