j...@wxcvbn.org (Jérémie Courrèges-Anglas) writes:
> Christian Rueger <cr+li...@rueger-net.de> writes:
>
>> Hi
>
> Hi,
>
>> new release with a few minor fixes:
>> - fix handling of files >4Gb
>> - fix handling of files >2Gb on 32bit platforms (compile with
>> _FILE_OFFSET_BITS=64)
>
> (note that OpenBSD doesn't care about _FILE_OFFSET_BITS)
>
>> - fix file size limit test
>> - fix compiler warnings (missing #include)
>> - ....
>
> Some nits/issues I noticed:
> - is it really needed to bump the library minor? No function/symbol was
> added, and if you noticed a change in the size of public structures /
> function arguments, this should be a *major* bump.
> - no need in patch-Makefile for stuff that we can override from the port
> Makefile; patch-Makefile is still here to get rid of SONAME though
> - respect DEBUG=-g (LDFLAGS)
> - move stuff from FAKE_FLAGS to MAKE_FLAGS in case prefix/sysconfdir
> gets used at build time in a future update; right now it doesn't
> matter, as we don't build nss_cdb
> - merge PFRAG.shared into PLIST
>
> Updated diff below, tests pass on sparc64/powerpc.
And... actually strip %%SHARED%% from the PLIST, thanks sthen@ :)
Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/tinycdb/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile 11 Mar 2013 02:52:09 -0000 1.3
+++ Makefile 7 Sep 2014 19:31:05 -0000
@@ -2,10 +2,7 @@
COMMENT = creating and reading constant databases
-V = 0.77
-REVISION = 0
-DISTNAME = tinycdb_$V
-PKGNAME = tinycdb-$V
+DISTNAME = tinycdb-0.78
CATEGORIES = databases
SHARED_LIBS = cdb 0.0
@@ -19,19 +16,23 @@ PERMIT_PACKAGE_CDROM = Yes
WANTLIB = c
-WRKDIST = ${WRKDIR}/tinycdb-$V
-MAKE_FLAGS += sysconfdir="${SYSCONFDIR}" LIBcdb_VERSION="${LIBcdb_VERSION}"
-FAKE_FLAGS += ${MAKE_FLAGS} prefix="${PREFIX}"
+MAKE_FLAGS = CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+ LIBcdb_VERSION="${LIBcdb_VERSION}" \
+ SHAREDLIB="libcdb.so.${LIBcdb_VERSION}" \
+ prefix="${PREFIX}" sysconfdir="${SYSCONFDIR}"
.include <bsd.port.arch.mk>
.if ${PROPERTIES:Mno_shared}
-TEST_TARGET = tests
+TEST_TARGET = tests
.else
MAKE_FLAGS += INSTALLPROG="cdb-shared"
ALL_TARGET = all shared
INSTALL_TARGET = install install-sharedlib
-TEST_TARGET = tests-shared
+TEST_TARGET = tests-shared
.endif
+
+post-install:
+ rm -f "${PREFIX}/lib/libcdb.so"
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/databases/tinycdb/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 18 May 2012 20:59:13 -0000 1.1.1.1
+++ distinfo 7 Sep 2014 17:26:29 -0000
@@ -1,5 +1,2 @@
-MD5 (tinycdb_0.77.tar.gz) = wA5fuWwwNWrDtnsqtdVkGw==
-RMD160 (tinycdb_0.77.tar.gz) = gDWB67hMxNt6vhaz+1uXjAVlJVM=
-SHA1 (tinycdb_0.77.tar.gz) = KHOl9hTpJeKEzXGnIWoNEDQK7Jw=
-SHA256 (tinycdb_0.77.tar.gz) = grw8zwr+0JeEcqBwzkUGZnuANeZdDcJDiOM4WNOba8Y=
-SIZE (tinycdb_0.77.tar.gz) = 37728
+SHA256 (tinycdb-0.78.tar.gz) = UGePQy2K2o1p9yjsEcMUDhUYE6eEfPMKYthvOnIO1jw=
+SIZE (tinycdb-0.78.tar.gz) = 36754
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/databases/tinycdb/patches/patch-Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-Makefile
--- patches/patch-Makefile 18 May 2012 20:59:13 -0000 1.1.1.1
+++ patches/patch-Makefile 7 Sep 2014 19:29:50 -0000
@@ -1,64 +1,12 @@
$OpenBSD: patch-Makefile,v 1.1.1.1 2012/05/18 20:59:13 sthen Exp $
---- Makefile.orig Sat Jan 31 18:12:21 2009
-+++ Makefile Sun Apr 19 15:49:39 2009
-@@ -7,19 +7,19 @@
-
- VERSION = 0.77
-
--prefix=/usr/local
-+prefix?=/usr/local
- exec_prefix=$(prefix)
- bindir=$(exec_prefix)/bin
- libdir=$(exec_prefix)/lib
- syslibdir=$(libdir)
--sysconfdir=/etc
-+sysconfdir?=/etc
- includedir=$(prefix)/include
- mandir=$(prefix)/man
- NSSCDB_DIR = $(sysconfdir)
- DESTDIR=
-
--CC = cc
--CFLAGS = -O
-+CC?= cc
-+CFLAGS?= -O
-
- AR = ar
- ARFLAGS = rv
-@@ -29,7 +29,7 @@ NSS_CDB = libnss_cdb.so.2
- LIBBASE = libcdb
- LIB = $(LIBBASE).a
- PICLIB = $(LIBBASE)_pic.a
--SHAREDLIB = $(LIBBASE).so.1
-+SHAREDLIB = $(LIBBASE).so.${LIBcdb_VERSION}
- SOLIB = $(LIBBASE).so
- CDB_USELIB = $(LIB)
- NSS_USELIB = $(PICLIB)
-@@ -85,7 +85,7 @@ $(SHAREDLIB): $(LIB_OBJS_PIC) $(LIBMAP)
+--- Makefile.orig Fri May 11 16:17:47 2012
++++ Makefile Sun Sep 7 21:29:46 2014
+@@ -87,7 +87,7 @@ $(SHAREDLIB): $(LIB_OBJS_PIC) $(LIBMAP)
-rm -f $(SOLIB)
ln -s $@ $(SOLIB)
- $(CC) $(CFLAGS) $(CFLAGS_SHARED) -o $@ \
-- $(CFLAGS_SONAME)$(SHAREDLIB) $(CFLAGS_VSCRIPT)$(LIBMAP) \
-+ $(CFLAGS_VSCRIPT)$(LIBMAP) \
+ $(LD) $(LDFLAGS) $(LDFLAGS_SHARED) -o $@ \
+- $(LDFLAGS_SONAME)$(SHAREDLIB) $(LDFLAGS_VSCRIPT)$(LIBMAP) \
++ $(LDFLAGS_VSCRIPT)$(LIBMAP) \
$(LIB_OBJS_PIC)
cdb: cdb.o $(CDB_USELIB)
-@@ -137,7 +137,7 @@ do_install = \
- done
-
- install-all: all $(INSTALLPROG)
-- set -- \
-+ @set -- \
- cdb.h 644 $(includedir) - \
- cdb.3 644 $(mandir)/man3 - \
- cdb.1 644 $(mandir)/man1 - \
-@@ -152,8 +152,7 @@ install-nss: nss
- $(do_install)
- install-sharedlib: sharedlib
- @set -- $(SHAREDLIB) 644 $(libdir) - ; \
-- $(do_install) ; \
-- ln -sf $(SHAREDLIB) $(DESTDIR)$(libdir)/$(LIBBASE).so
-+ $(do_install)
- install-piclib: piclib
- @set -- $(PICLIB) 644 $(libdir) - ; \
- $(do_install)
Index: patches/patch-tests_sh
===================================================================
RCS file: /cvs/ports/databases/tinycdb/patches/patch-tests_sh,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-tests_sh
--- patches/patch-tests_sh 18 May 2012 20:59:13 -0000 1.1.1.1
+++ patches/patch-tests_sh 7 Sep 2014 17:26:29 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-tests_sh,v 1.1.1.1 2012/05/18 20:59:13 sthen Exp $
---- tests.sh.orig Mon Nov 3 22:08:55 2003
-+++ tests.sh Sun Apr 20 10:50:58 2008
-@@ -15,7 +15,7 @@ esac
+--- tests.sh.orig Fri May 11 16:16:30 2012
++++ tests.sh Fri Aug 22 18:39:47 2014
+@@ -14,7 +14,7 @@ esac
do_csum() {
echo checksum may fail if no md5sum program
@@ -10,12 +10,3 @@ $OpenBSD: patch-tests_sh,v 1.1.1.1 2012/
}
rm -f 1.cdb 1a.cdb
-@@ -106,7 +106,7 @@ echo $?
-
- echo Handling file size limits
- (
-- ulimit -f 3
-+ ulimit -f 4
- trap '' 25
- (
- for i in 0 1 2 3 4 5 6 7 8 9 ; do
Index: pkg/PFRAG.shared
===================================================================
RCS file: pkg/PFRAG.shared
diff -N pkg/PFRAG.shared
--- pkg/PFRAG.shared 18 May 2012 20:59:13 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2012/05/18 20:59:13 sthen Exp $
-@lib lib/libcdb.so.${LIBcdb_VERSION}
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/databases/tinycdb/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 18 May 2012 20:59:13 -0000 1.1.1.1
+++ pkg/PLIST 7 Sep 2014 20:11:00 -0000
@@ -1,8 +1,8 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2012/05/18 20:59:13 sthen Exp $
-%%SHARED%%
@bin bin/cdb
include/cdb.h
lib/libcdb.a
+@lib lib/libcdb.so.${LIBcdb_VERSION}
@man man/man1/cdb.1
@man man/man3/cdb.3
@man man/man5/cdb.5
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
