pkgsrc-Bugs archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

pkg/47355: Please update databases/tinycdb to 0.78 and libtoolized



>Number:         47355
>Category:       pkg
>Synopsis:       Please update databases/tinycdb to 0.78 and libtoolized
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed Dec 19 18:10:00 +0000 2012
>Originator:     Ryo ONODERA
>Release:        NetBSD 6.99.15
>Organization:
        
>Environment:
        
        
System: NetBSD tellurium.elements.tetera.org 6.99.15 NetBSD 6.99.15 (NODKWEDGE) 
#92: Mon Dec 17 23:02:28 JST 2012 
root%tellurium.elements.tetera.org@localhost:/usr/obj/sys/arch/amd64/compile/NODKWEDGE
 amd64
Architecture: x86_64
Machine: amd64
>Description:
Please update databases/tinycdb to 0.78, and convert to libtoolized.
Using libtool will improve portability.
At least, on SmartOS build is fixed.

I have not tested with mail/postfix.
        
>How-To-Repeat:
        
>Fix:
        
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/databases/tinycdb/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- Makefile    2 Oct 2012 21:25:54 -0000       1.7
+++ Makefile    19 Dec 2012 18:01:50 -0000
@@ -1,9 +1,7 @@
 # $NetBSD: Makefile,v 1.7 2012/10/02 21:25:54 asau Exp $
 #
 
-DISTNAME=              tinycdb_0.77
-PKGNAME=               ${DISTNAME:S/_/-/}
-PKGREVISION=           1
+DISTNAME=              tinycdb-0.78
 CATEGORIES=            databases
 MASTER_SITES=          http://www.corpit.ru/mjt/tinycdb/
 
@@ -13,23 +11,23 @@
 
 CONFLICTS+=            cdb-[0-9]*
 
-WRKSRC=                        ${WRKDIR}/${PKGNAME_NOREV}
+USE_LIBTOOL=           yes
+USE_LANGUAGE+=         c
 
-BUILD_TARGET=          all sharedlib piclib
-INSTALL_TARGET=                install install-piclib install-sharedlib
+MAKE_FILE=             BSDmakefile
 
-SUBST_CLASSES+=                paths
-SUBST_STAGE.paths=     do-configure
-SUBST_FILES.paths=     Makefile debian/libcdb.pc
-SUBST_VARS.paths=      PREFIX PKG_SYSCONFDIR PKGMANDIR
-SUBST_MESSAGE.paths=   Configuring pkgsrc paths.
-
-PKGCONFIG_OVERRIDE+=   debian/libcdb.pc
+PKGCONFIG_OVERRIDE+=   libcdb.pc
 
 INSTALLATION_DIRS+=    lib/pkgconfig
 
+SUBST_CLASSES+=                paths
+SUBST_STAGE.paths=     pre-configure
+SUBST_FILES.paths=     libcdb.pc
+SUBST_VARS.paths=      PREFIX
+SUBST_MESSAGE.paths=   Configuring pkgsrc paths.
+
 post-install:
-       ${INSTALL_DATA} ${WRKSRC}/debian/libcdb.pc \
+       ${INSTALL_DATA} ${WRKSRC}/libcdb.pc \
                        ${DESTDIR}${PREFIX}/lib/pkgconfig
 
 .include "../../mk/bsd.pkg.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/databases/tinycdb/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- PLIST       27 Feb 2012 17:14:46 -0000      1.3
+++ PLIST       19 Dec 2012 18:01:50 -0000
@@ -1,10 +1,8 @@
-@comment $NetBSD: PLIST,v 1.3 2012/02/27 17:14:46 elric Exp $
+@comment $NetBSD$
 bin/cdb
 include/cdb.h
-lib/libcdb.a
-lib/libcdb.so
-lib/libcdb.so.1
-lib/libcdb_pic.a
+lib/libcdb.la
+lib/libcdb_pic.la
 lib/pkgconfig/libcdb.pc
 man/man1/cdb.1
 man/man3/cdb.3
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/databases/tinycdb/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo    11 Sep 2010 08:26:04 -0000      1.4
+++ distinfo    19 Dec 2012 18:01:50 -0000
@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.4 2010/09/11 08:26:04 obache Exp $
 
-SHA1 (tinycdb_0.77.tar.gz) = 2873a5f614e925e284cd71a7216a0d10340aec9c
-RMD160 (tinycdb_0.77.tar.gz) = 803581ebb84cc4db7abe16b3fb5b978c05652553
-Size (tinycdb_0.77.tar.gz) = 37728 bytes
-SHA1 (patch-aa) = bef278a549d4dad63ed5968067fd1dde1f409f46
-SHA1 (patch-ab) = d4d0fa9fc253c7ea86287a66859fcba06b4ec485
+SHA1 (tinycdb-0.78.tar.gz) = ade42ee1e7c56f66a63cb933206c089b9983adba
+RMD160 (tinycdb-0.78.tar.gz) = d37c3d35f687574def9e5a161bcdd5ae9a7da4d0
+Size (tinycdb-0.78.tar.gz) = 36754 bytes
+SHA1 (patch-BSDmakefile) = ed40d49b094c56d9f2cea8688e6446035a866f01
+SHA1 (patch-libcdb.pc) = c4e027ab43ce21320c8c81c7a325108fa2aa4fb9


$NetBSD$

--- BSDmakefile.orig    2012-12-19 17:49:56.000000000 +0000
+++ BSDmakefile
@@ -0,0 +1,57 @@
+# Makefile for libtoolized tinycdb
+# based on tinycdb's Makefile
+
+VERSION=        0.78
+
+CFLAGS+=       -D_FILE_OFFSET_BITS=64
+
+
+OBJS=          cdb_init.o cdb_find.o cdb_findnext.o cdb_seq.o cdb_seek.o \
+               cdb_unpack.o \
+               cdb_make_add.o cdb_make_put.o cdb_make.o cdb_hash.o
+LOBJS=         ${OBJS:R:S/$/.lo/g}
+
+
+all: libcdb.la libcdb_pic.la cdb
+install: install-man install-prog install-lib install-header
+
+.SUFFIXES: .c .lo
+
+.c.lo:
+       ${LIBTOOL} --tag=CC --mode=compile ${CC} -c ${CFLAGS} -o ${.TARGET} 
${.IMPSRC}
+
+libcdb.la: ${LOBJS}
+       ${LIBTOOL} --tag=CC --mode=link ${CC} ${LDFLAGS} ${CFLAGS} -o 
${.TARGET} \
+               ${LOBJS} -version-info 1 -rpath ${PREFIX}/lib
+
+libcdb_pic.la: ${LOBJS}
+       ${LIBTOOL} --tag=CC --mode=link ${CC} ${LDFLAGS} ${CFLAGS} -fPIC -o 
${.TARGET} \
+               ${LOBJS} -version-info 1 -rpath ${PREFIX}/lib
+
+cdb: cdb.lo libcdb.la
+       ${LIBTOOL} --tag=CC --mode=link ${CC} ${LDFLAGS} ${CFLAGS} -o 
${.TARGET} \
+               cdb.lo libcdb.la -rpath ${PREFIX}/lib
+
+install-man:
+       ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+       ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3
+       ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
+       ${BSD_INSTALL_MAN} cdb.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+       ${BSD_INSTALL_MAN} cdb.3 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3
+       ${BSD_INSTALL_MAN} cdb.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
+
+install-prog:
+       ${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
+       ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} cdb \
+               ${DESTDIR}${PREFIX}/bin
+
+install-lib:
+       ${BSD_INSTALL_LIB_DIR} ${DESTDIR}${PREFIX}/lib
+       ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libcdb.la \
+               ${DESTDIR}${PREFIX}/lib
+       ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libcdb_pic.la \
+               ${DESTDIR}${PREFIX}/lib
+
+install-header:
+       ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include
+       ${BSD_INSTALL_DATA} cdb.h ${DESTDIR}${PREFIX}/include


$NetBSD$

--- libcdb.pc.orig      2012-12-19 17:50:14.000000000 +0000
+++ libcdb.pc
@@ -0,0 +1,12 @@
+# Package Information for pkg-config
+
+prefix=@PREFIX@
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: libcdb
+Description: tinycdb - Constant Data Base library
+Version: 0.78
+Libs: -L${libdir} -lcdb
+Cflags: -I${includedir}

>Unformatted:
        
        


Home | Main Index | Thread Index | Old Index