On 2010-01-22, at 1:27 AM, Jim Busser wrote: > Despite that the postgresql84 port has progressed from 8.4.0 to (6 weeks ago) > 8.4.2, that portfile does not incorporate apparently-bug-fixing patches > referenced in > > ticket 21030 > ticket 21358 > > Can these please be committed?
In the meantime it would be great if I could be pointed to anything I did not do (or did wrong) trying to apply the patch manually. After downloading the three files at http://trac.macports.org/ticket/21358 I did the following including the complaint that the file to patch remained inadequately specified, so I provided that too (interactively) and got port cd $(port dir postgresql84) patch -p0 < /Users/djb/Desktop/patches/Portfile.diff can't find file to patch at input line 3 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |--- Portfile.orig 2009-09-13 09:11:36.000000000 +0200 |+++ Portfile 2009-09-13 18:12:53.000000000 +0200 -------------------------- File to patch: /opt/local/var/macports/sources/rsync.macports.org/release/ports/databases/postgresql84/Portfile patching file /opt/local/var/macports/sources/rsync.macports.org/release/ports/databases/postgresql84/Portfile Then: sudo port install -d py26-psycopg2 +postgresql84 Password: ---> Computing dependencies for py26-psycopg2 Portfile changed since last build; discarding previous state. ---> Fetching postgresql84 ---> Verifying checksum(s) for postgresql84 ---> Extracting postgresql84 ---> Configuring postgresql84 ---> Building postgresql84 Error: Target org.macports.build returned: shell command "cd /opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_release_ports_databases_postgresql84/work/postgresql-8.4.2/src/include && patch < /opt/local/var/macports/sources/rsync.macports.org/release/ports/databases/postgresql84/files/patch_pg_config_h.diff && patch < /opt/local/var/macports/sources/rsync.macports.org/release/ports/databases/postgresql84/files/patch_postgres_h.diff" returned error 1 Command output: sh: /opt/local/var/macports/sources/rsync.macports.org/release/ports/databases/postgresql84/files/patch_pg_config_h.diff: No such file or directory Error: The following dependencies failed to build: postgresql84 python26 tk Xft2 fontconfig freetype Error: Status 1 encountered during processing. Before reporting a bug, first run the command again with the -d flag to get complete output. I am wondering whether it is expected that I ought to have first mkdir'd a directory "files" inside /opt/local/var/macports/sources/rsync.macports.org/release/ports/databases/postgresql84/ and into that copied the three patch files? Anyhow, that is what I tried and then got the following, to which I answered "y" Reversed (or previously applied) patch detected! Assume -R? [n] y and I then did / got sudo port install -d py26-psycopg2 +postgresql84 ---> Computing dependencies for py26-psycopg2 Portfile changed since last build; discarding previous state. ---> Fetching postgresql84 ---> Verifying checksum(s) for postgresql84 ---> Extracting postgresql84 ---> Configuring postgresql84 ---> Building postgresql84 Error: Target org.macports.build returned: shell command " cd "/opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_release_ports_databases_postgresql84/work/postgresql-8.4.2" && /usr/bin/gnumake -j2 " returned error 2 Command output: /usr/bin/gnumake -C ../../src/port all gnumake[3]: Nothing to be done for `all'. prereqdir=`cd parser/ >/dev/null && pwd` && \ cd ../../src/include/parser/ && rm -f gram.h && \ ln -s "$prereqdir/gram.h" . /usr/bin/gnumake -C utils fmgroids.h /usr/bin/gnumake -C utils probes.h AWK='awk' /bin/sh Gen_fmgrtab.sh ../../../src/include/catalog/pg_proc.h sed -f ./Gen_dummy_probes.sed probes.d >probes.h cd ../../src/include/utils/ && rm -f probes.h && \ ln -s ../../../src/backend/utils/probes.h . cd ../../src/include/utils/ && rm -f fmgroids.h && \ ln -s ../../../src/backend/utils/fmgroids.h . /usr/bin/gnumake -C access all /usr/bin/gnumake -C bootstrap all /usr/bin/gnumake -C common all /usr/bin/gcc-4.2 -no-cpp-precomp -O2 -arch x86_64 -arch i386 -Wall -Wmissing-prototypes -Wpointer-arith -Wdeclaration-after-statement -Wendif-labels -fno-strict-aliasing -fwrapv -I. -I../../../src/include -I/opt/local/include -I/opt/local/include/ossp -I/opt/local/include/libxml2 -I/opt/local/include -c -o bootparse.o bootparse.c /usr/bin/gcc-4.2 -no-cpp-precomp -O2 -arch x86_64 -arch i386 -Wall -Wmissing-prototypes -Wpointer-arith -Wdeclaration-after-statement -Wendif-labels -fno-strict-aliasing -fwrapv -I../../../../src/include -I/opt/local/include -I/opt/local/include/ossp -I/opt/local/include/libxml2 -I/opt/local/include -c -o heaptuple.o heaptuple.c heaptuple.c: In function 'heap_fill_tuple': heaptuple.c:196: error: duplicate case value heaptuple.c:196: error: previously used here lipo: can't figure out the architecture type of: /var/tmp//ccFsxDRh.out gnumake[4]: *** [heaptuple.o] Error 1 gnumake[3]: *** [common-recursive] Error 2 gnumake[2]: *** [access-recursive] Error 2 gnumake[2]: *** Waiting for unfinished jobs.... /usr/bin/gcc-4.2 -no-cpp-precomp -O2 -arch x86_64 -arch i386 -Wall -Wmissing-prototypes -Wpointer-arith -Wdeclaration-after-statement -Wendif-labels -fno-strict-aliasing -fwrapv -I. -I../../../src/include -I/opt/local/include -I/opt/local/include/ossp -I/opt/local/include/libxml2 -I/opt/local/include -c -o bootstrap.o bootstrap.c ( echo src/backend/bootstrap/bootparse.o src/backend/bootstrap/bootstrap.o ) >objfiles.txt gnumake[1]: *** [all] Error 2 gnumake: *** [all] Error 2 Error: The following dependencies failed to build: postgresql84 python26 tk Xft2 fontconfig freetype Error: Status 1 encountered during processing. _______________________________________________ macports-users mailing list [email protected] http://lists.macosforge.org/mailman/listinfo.cgi/macports-users
