diff options
| author | dholland <dholland@pkgsrc.org> | 2011-12-21 08:29:05 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2011-12-21 08:29:05 +0000 |
| commit | f1ada84f877958e37b19a5cf43ac455a916d8087 (patch) | |
| tree | 09611266f8142b6db46779ddd1edccb4bc0c1667 /databases/pgbouncer | |
| parent | a029b9dc8b9d01c32bff362e88a57256e5aae5f4 (diff) | |
| download | pkgsrc-f1ada84f877958e37b19a5cf43ac455a916d8087.tar.gz | |
Fix build failure on NetBSD caused by trying to redefine bswap16/32/64.
While here, fix some pkglint.
Diffstat (limited to 'databases/pgbouncer')
| -rw-r--r-- | databases/pgbouncer/Makefile | 6 | ||||
| -rw-r--r-- | databases/pgbouncer/distinfo | 3 | ||||
| -rw-r--r-- | databases/pgbouncer/patches/patch-lib_usual_endian_h | 24 |
3 files changed, 30 insertions, 3 deletions
diff --git a/databases/pgbouncer/Makefile b/databases/pgbouncer/Makefile index a6c4b8063e2..584a1de6c48 100644 --- a/databases/pgbouncer/Makefile +++ b/databases/pgbouncer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2011/12/21 08:27:20 dholland Exp $ +# $NetBSD: Makefile,v 1.3 2011/12/21 08:29:05 dholland Exp $ # DISTNAME= pgbouncer-${VERSION} @@ -15,7 +15,7 @@ PKG_DESTDIR_SUPPORT= user-destdir VERSION= 1.4.2 USE_LANGUAGES= c -USE_TOOLS= gmake +USE_TOOLS+= gmake GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-libevent=${BUILDLINK_PREFIX.libevent} @@ -28,6 +28,8 @@ RCD_SCRIPTS+= pgbouncer INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 ${EGDIR} +.include "../../mk/bsd.prefs.mk" + PGUSER?= pgsql PGGROUP?= pgsql PKG_GROUPS= ${PGGROUP} diff --git a/databases/pgbouncer/distinfo b/databases/pgbouncer/distinfo index 8faac2f9ff9..4faa6af0163 100644 --- a/databases/pgbouncer/distinfo +++ b/databases/pgbouncer/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2011/09/03 22:15:51 mjl Exp $ +$NetBSD: distinfo,v 1.2 2011/12/21 08:29:05 dholland Exp $ SHA1 (pgbouncer-1.4.2.tgz) = 610198c3f2186d70267275f554e23bd43598e4b5 RMD160 (pgbouncer-1.4.2.tgz) = 055796e23dd7029d3f4a2c882cf24399a5481cb1 Size (pgbouncer-1.4.2.tgz) = 283204 bytes +SHA1 (patch-lib_usual_endian_h) = 38ee6610c1f4e4aeededcb41cad56b877b6b7b0b diff --git a/databases/pgbouncer/patches/patch-lib_usual_endian_h b/databases/pgbouncer/patches/patch-lib_usual_endian_h new file mode 100644 index 00000000000..fe9199db90e --- /dev/null +++ b/databases/pgbouncer/patches/patch-lib_usual_endian_h @@ -0,0 +1,24 @@ +$NetBSD: patch-lib_usual_endian_h,v 1.1 2011/12/21 08:29:05 dholland Exp $ + +Avoid trying to redefine bswap16/32/64 when on NetBSD. + +--- lib/usual/endian.h~ 2011-04-29 13:07:43.000000000 +0000 ++++ lib/usual/endian.h +@@ -42,6 +42,8 @@ + * @{ + */ + ++#ifndef __NetBSD__ /* already in sys/endian.h */ ++ + #ifndef bswap16 + #ifdef bswap_16 + #define bswap16(x) bswap_16(x) +@@ -80,6 +82,8 @@ static inline uint64_t bswap64(uint64_t + #endif + #endif + ++#endif /* NetBSD */ ++ + /* @} */ + + /** |