diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/postgresql | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/postgresql')
| -rw-r--r-- | package/postgresql/Makefile | 8 | ||||
| -rw-r--r-- | package/postgresql/ipkg/libpq.control | 4 | ||||
| -rw-r--r-- | package/postgresql/ipkg/pgsql-cli.control | 5 |
3 files changed, 5 insertions, 12 deletions
diff --git a/package/postgresql/Makefile b/package/postgresql/Makefile index 2ec836bf6..05929cbbd 100644 --- a/package/postgresql/Makefile +++ b/package/postgresql/Makefile @@ -9,15 +9,17 @@ PKG_NAME:= postgresql PKG_VERSION:= 8.3.7 PKG_RELEASE:= 1 PKG_MD5SUM:= 6e36f3b4dd27ae0c352376ea9f843de2 - -MASTER_SITES:= ftp://ftp7.de.postgresql.org/pub/ftp.postgresql.org/source/v${PKG_VERSION}/ \ +PKG_DESCR:= PostgreSQL database library +PKG_SECTION:= libs +PKG_URL:= http://www.postgresql.org +PKG_SITES:= ftp://ftp7.de.postgresql.org/pub/ftp.postgresql.org/source/v${PKG_VERSION}/ \ ftp://ftp8.de.postgresql.org/pub/ftp.postgresql.org/source/v${PKG_VERSION}/ \ ftp://ftp.be.postgresql.org/pub/postgresql/source/v${PKG_VERSION}/ \ ftp://ftp.tw.postgresql.org/pub/postgresql/source/v${PKG_VERSION}/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBPQ,libpq,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBPQ,libpq,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu PKG_CONFIGURE_ARGS:=\ diff --git a/package/postgresql/ipkg/libpq.control b/package/postgresql/ipkg/libpq.control deleted file mode 100644 index ff669c6cb..000000000 --- a/package/postgresql/ipkg/libpq.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libpq -Priority: optional -Section: libs -Description: PostgreSQL client library diff --git a/package/postgresql/ipkg/pgsql-cli.control b/package/postgresql/ipkg/pgsql-cli.control deleted file mode 100644 index 4ce03e45c..000000000 --- a/package/postgresql/ipkg/pgsql-cli.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: pgsql-cli -Priority: optional -Section: libs -Description: Command Line Interface (CLI) to PostgreSQL databases -Depends: libpq |