From adb16d40964f990d8c43eacd23beba92bd9f5294 Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Tue, 20 Jan 2004 23:32:17 +0000 Subject: [PATCH] Alejandro Mery: updated clip (1.1.7-3) and improved postgres detection git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2260 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/mnemoc/clip/clip.conf | 4 ++ package/mnemoc/clip/clip.desc | 4 +- package/mnemoc/clip/no_bindir.patch | 37 ------------- package/mnemoc/clip/no_clean.patch | 30 ----------- package/mnemoc/clip/postgresql.patch | 78 ++++++++++++++++++++++++++++ 5 files changed, 84 insertions(+), 69 deletions(-) delete mode 100644 package/mnemoc/clip/no_bindir.patch delete mode 100644 package/mnemoc/clip/no_clean.patch create mode 100644 package/mnemoc/clip/postgresql.patch diff --git a/package/mnemoc/clip/clip.conf b/package/mnemoc/clip/clip.conf index da7cc4988..88d584b7e 100644 --- a/package/mnemoc/clip/clip.conf +++ b/package/mnemoc/clip/clip.conf @@ -65,3 +65,7 @@ makeinstopt="$makeopt" hook_add prepatch 5 'clip_patch' hook_add postdoc 5 'clip_examples' +hook_add postpatch 5 'mv cliplibs/clip-postgres/Makefile \ + cliplibs/clip-postgres/Makefile.in +chmod +x cliplibs/clip-postgres/configure' + diff --git a/package/mnemoc/clip/clip.desc b/package/mnemoc/clip/clip.desc index ffbc76f7d..36dbc5e99 100644 --- a/package/mnemoc/clip/clip.desc +++ b/package/mnemoc/clip/clip.desc @@ -42,9 +42,9 @@ [L] GPL [S] Stable -[V] 1.1.7-1 +[V] 1.1.7-3 [P] X -----5---9 800.000 [D] 923907069 clip-prg-1.1.7-1.tgz ftp://ftp.itk.ru/pub/clip/ -#[D] 1511789814 patch-1.1.6-3.tgz !ftp://ftp.itk.ru/pub/clip/patch.tgz +[D] 2363781309 patch-1.1.7-3.tgz !ftp://ftp.itk.ru/pub/clip/patch.tgz diff --git a/package/mnemoc/clip/no_bindir.patch b/package/mnemoc/clip/no_bindir.patch deleted file mode 100644 index 696c72eb0..000000000 --- a/package/mnemoc/clip/no_bindir.patch +++ /dev/null @@ -1,37 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/mnemoc/clip/no_bindir.patch -# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./clip/Makefile.in.orig 2004-01-08 11:50:21.000000000 -0300 -+++ ./clip/Makefile.in 2004-01-08 15:56:07.000000000 -0300 -@@ -329,6 +329,7 @@ - cp hashextract$(EXESUFF) $(DESTDIR)$(CLIPROOT)/bin/clip_hashextract$(EXESUFF) - cd $(DESTDIR)$(CLIPROOT)/bin && chmod 0755 $(BINS) $(SCRIPTS) clip_bug cliphash$(EXESUFF) - if [ "$(OSNAME)" = CYGWIN ] ; then echo "bash lowname %1 %2 %3 %4 %5 %6 %7 %8 %9" > $(DESTDIR)$(CLIPROOT)/bin/lowname.bat ; fi -+ifneq ($(BINDIR),$(CLIPROOT)/bin) - -cd $(DESTDIR)$(BINDIR)/ && rm -f clip$(EXESUFF) clip_msgfmt \ - clip_msgmerge clip_makeslib clip_cp clip_makelib \ - clipar$(EXESUFF) cliphash$(EXESUFF) clip_bug$(EXESUFF) \ -@@ -359,6 +360,7 @@ - ln -sf $(CLIPROOT)/bin/clip_trans$(EXESUFF) $(DESTDIR)$(BINDIR)/ - ln -sf $(CLIPROOT)/bin/clip_conv$(EXESUFF) $(DESTDIR)$(BINDIR)/ - ln -sf $(CLIPROOT)/bin/clip_hashextract$(EXESUFF) $(DESTDIR)$(BINDIR)/ -+endif - touch $(DESTDIR)$(CLIPROOT)/cliprc/.notrm - - inst_locale: diff --git a/package/mnemoc/clip/no_clean.patch b/package/mnemoc/clip/no_clean.patch deleted file mode 100644 index 0a0308815..000000000 --- a/package/mnemoc/clip/no_clean.patch +++ /dev/null @@ -1,30 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/mnemoc/clip/no_clean.patch -# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./cliplibs/Makefile.orig 2004-01-08 19:01:54.000000000 -0300 -+++ ./cliplibs/Makefile 2004-01-08 19:22:08.000000000 -0300 -@@ -5,7 +5,7 @@ - clip-mysql clip-postgres clip-oracle clip-interbase clip-odbc \ - clip-com clip-oasis clip-rtf \ - --all local user system install lib: clean -+all local user system install lib: - for dir in $(dirs); \ - do \ - (cd $$dir ;\ diff --git a/package/mnemoc/clip/postgresql.patch b/package/mnemoc/clip/postgresql.patch new file mode 100644 index 000000000..379bade04 --- /dev/null +++ b/package/mnemoc/clip/postgresql.patch @@ -0,0 +1,78 @@ +# --- ROCK-COPYRIGHT-NOTE-BEGIN --- +# +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# Please add additional copyright information _after_ the line containing +# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +# +# ROCK Linux: rock-src/package/mnemoc/clip/postgresql.patch +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# --- ROCK-COPYRIGHT-NOTE-END --- + +--- ./cliplibs/clip-postgres/Makefile 2004-01-19 11:36:31.000000000 -0300 ++++ ./cliplibs/clip-postgres/Makefile.in 2004-01-19 12:22:53.000000000 -0300 +@@ -13,19 +13,20 @@ + TARGET=libclip-postgres$(DLLSUFF) + ATARGET=libclip-postgres.a + RTARGET=libclip-postgres$(DLLREALSUFF) +-PGINC = -I/usr/include/pgsql -I/usr/include/postgresql -I/usr/include/pgsql/server -I/usr/include -I/usr/local/include ++PGINC = -I@PGINCDIR@ ++PGLIB = -L@PGLIBDIR@ + OBJS=pg_clip.o pg.o + + all: have_lib $(TARGET) $(ATARGET) + + have_lib: +- test -f /usr/include/pgsql/libpq-fe.h -o -f /usr/include/postgresql/libpq-fe.h -o -f /usr/include/pgsql/server/libpq-fe.h -o -f /usr/include/libpq-fe.h -o -f /usr/local/include/libpq-fe.h ++ test -f @PGINCDIR@/libpq-fe.h + + $(TARGET): $(OBJS) +- $(CLIPROOT)/bin/clip_makeslib $(TARGET) $(OBJS) -lpq -L/usr/local/lib -L/usr/local/pgsql/lib ++ $(CLIPROOT)/bin/clip_makeslib $(TARGET) $(OBJS) -lpq $(PGLIB) + + $(ATARGET): $(OBJS) +- $(CLIPROOT)/bin/clip_makelib $(ATARGET) $(OBJS) -lpq -L/usr/local/lib/ -L/usr/local/pgsql/lib ++ $(CLIPROOT)/bin/clip_makelib $(ATARGET) $(OBJS) -lpq $(PGLIB) + + pg_clip.o: pg_clip.c + $(CC) $(C_FLAGS) $(CLIPINCLUDE) $(PGINC) -c pg_clip.c +--- /dev/null 1969-12-31 21:00:00.000000000 -0300 ++++ ./cliplibs/clip-postgres/configure 2004-01-19 12:37:45.000000000 -0300 +@@ -0,0 +1,29 @@ ++#!/bin/sh ++ ++if [ -z "$PGINCDIR" ]; then ++ for x in /usr/include/pgsql \ ++ /usr/include/pgsql/server \ ++ /usr/include/postgresql \ ++ /opt/postgresql/include ++ do ++ if [ -f "$x/libpq-fe.h" ]; then ++ PGINCDIR=$x ++ break ++ fi ++ done ++fi ++if [ -z "$PGLIBDIR" ]; then ++ for x in /usr/local/lib \ ++ /usr/local/pgsql/lib \ ++ /opt/postgresql/lib ++ do ++ if [ -f "$x/libpq.so" ]; then ++ PGLIBDIR=$x ++ break ++ fi ++ done ++fi ++ ++sed -e "s,@PGINCDIR@,${PGINCDIR:-/usr/include},g" \ ++ -e "s,@PGLIBDIR@,${PGLIBDIR:-/usr/lib},g" \ ++ Makefile.in > Makefile