Attachment #118082 for bug #160250

View | Details | Raw Unified | Return to bug 160250
Collapse All | Expand All




#

PORTNAME=	gdbm
PORTVERSION=	1.9.1
PORTREVISION=	3
CATEGORIES=	databases
MASTER_SITES=	GNU
MASTER_SITE_SUBDIR=	${PORTNAME}

MAINTAINER=	gabor@FreeBSD.org
COMMENT=	The GNU database manager

OPTIONS=	COMPAT	"dbm/ndbm compatibility" off

GNU_CONFIGURE=	yes
USE_AUTOTOOLS=	libtool
USE_GMAKE=	yes
GNU_CONFIGURE=	yes
USE_LDCONFIG=	yes

INFO=		gdbm
MAN3=		gdbm.3

.include <bsd.port.options.mk>

.if defined(WITH_COMPAT)
CONFIGURE_ARGS+=--enable-libgdbm-compat
PLIST_SUB=	GDBM_COMPAT=""
.else
PLIST_SUB=	GDBM_COMPAT="@comment "
.endif

MAN3=		gdbm.3
INFO=		gdbm

pre-everything::
.if !defined(WITH_COMPAT)
	@${ECHO_MSG}

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (gdbm-1.8.3.tar.gz) = cc340338a2e28b40058ab9eb5354a21d53f88a1582ea21ba0bb185c37a281dc9	1	SHA256 (gdbm-1.9.1.tar.gz) = 6025852637772b0699f2294b5f14fd4a084bca3c8161d29d64d1f30d6d1a9aed
2	SIZE (gdbm-1.8.3.tar.gz) = 228695	2	SIZE (gdbm-1.9.1.tar.gz) = 554843




@comment $FreeBSD: ports/databases/gdbm/pkg-plist,v 1.12 2009/08/02 19:32:41 mezz Exp $
bin/testgdbm
include/gdbm.h
%%GDBM_COMPAT%%include/dbm.h
%%GDBM_COMPAT%%include/ndbm.h
lib/libgdbm.a
lib/libgdbm.la
lib/libgdbm.so
lib/libgdbm.so.4
%%GDBM_COMPAT%%lib/libgdbm_compat.a
%%GDBM_COMPAT%%lib/libgdbm_compat.la
%%GDBM_COMPAT%%lib/libgdbm_compat.so
%%GDBM_COMPAT%%lib/libgdbm_compat.so.4

Removed Link Here

(-)files/patch-configure (-10 lines)
1	--- configure.orig Sat Sep 28 08:23:50 2002
2	+++ configure Wed Oct 16 06:15:31 2002
3	@@ -6974,6 +6974,7 @@
4
5	# This can be used to rebuild libtool when needed
6	LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
7	+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
8
9	# Always use our own libtool.
10	LIBTOOL='$(SHELL) $(top_builddir)/libtool'




--- Makefile.in.orig	2009-06-29 13:15:23.000000000 -0500
+++ Makefile.in	2009-06-29 13:16:42.000000000 -0500
@@ -130,7 +130,7 @@
 	$(srcdir)/mkinstalldirs $(INSTALL_ROOT)$(libdir) \
 		$(INSTALL_ROOT)$(includedir) $(INSTALL_ROOT)$(man3dir) \
 		$(INSTALL_ROOT)$(infodir)
-	$(LIBTOOL) $(INSTALL) -c libgdbm.la $(INSTALL_ROOT)$(libdir)/libgdbm.la
+	$(LIBTOOL) --mode=install $(INSTALL) -c libgdbm.la $(INSTALL_ROOT)$(libdir)/libgdbm.la
 	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) gdbm.h \
 		$(INSTALL_ROOT)$(includedir)/gdbm.h
 	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.3 \
@@ -141,7 +141,7 @@
 install-compat:
 	$(srcdir)/mkinstalldirs $(INSTALL_ROOT)$(libdir) \
 		$(INSTALL_ROOT)$(includedir)
-	$(LIBTOOL) $(INSTALL) -c libgdbm_compat.la \
+	$(LIBTOOL) --mode=install $(INSTALL) -c libgdbm_compat.la \
 		$(INSTALL_ROOT)$(libdir)/libgdbm_compat.la
 	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/dbm.h \
 		$(INSTALL_ROOT)$(includedir)/dbm.h

Return to bug 160250

Lines 6-35 Link Here

(-)Makefile (-9 / +11 lines)
6	#	6	#
7		7
8	PORTNAME= gdbm	8	PORTNAME= gdbm
9	PORTVERSION= 1.8.3	9	PORTVERSION= 1.9.1
10	PORTREVISION= 3
11	CATEGORIES= databases	10	CATEGORIES= databases
12	MASTER_SITES= ${MASTER_SITE_GNU}	11	MASTER_SITES= GNU
13	MASTER_SITE_SUBDIR= ${PORTNAME}
14		12
15	MAINTAINER= gabor@FreeBSD.org	13	MAINTAINER= gabor@FreeBSD.org
16	COMMENT= The GNU database manager	14	COMMENT= The GNU database manager
17		15
		16	OPTIONS= COMPAT "dbm/ndbm compatibility" off
		17
		18	GNU_CONFIGURE= yes
18	USE_AUTOTOOLS= libtool	19	USE_AUTOTOOLS= libtool
19	USE_GMAKE= yes	20	USE_GMAKE= yes
20	GNU_CONFIGURE= yes
21	USE_LDCONFIG= yes	21	USE_LDCONFIG= yes
22		22
		23	INFO= gdbm
		24	MAN3= gdbm.3
		25
		26	.include <bsd.port.options.mk>
		27
23	.if defined(WITH_COMPAT)	28	.if defined(WITH_COMPAT)
24	INSTALL_TARGET= install install-compat	29	CONFIGURE_ARGS+=--enable-libgdbm-compat
25	PLIST_SUB= GDBM_COMPAT=""	30	PLIST_SUB= GDBM_COMPAT=""
26	.else	31	.else
27	PLIST_SUB= GDBM_COMPAT="@comment "	32	PLIST_SUB= GDBM_COMPAT="@comment "
28	.endif	33	.endif
29		34
30	MAN3= gdbm.3
31	INFO= gdbm
32
33	pre-everything::	35	pre-everything::
34	.if !defined(WITH_COMPAT)	36	.if !defined(WITH_COMPAT)
35	@${ECHO_MSG}	37	@${ECHO_MSG}

Lines 1-12 Link Here

(-)pkg-plist (-2 / +3 lines)
1	@comment $FreeBSD: ports/databases/gdbm/pkg-plist,v 1.12 2009/08/02 19:32:41 mezz Exp $	1	@comment $FreeBSD: ports/databases/gdbm/pkg-plist,v 1.12 2009/08/02 19:32:41 mezz Exp $
		2	bin/testgdbm
2	include/gdbm.h	3	include/gdbm.h
3	%%GDBM_COMPAT%%include/dbm.h	4	%%GDBM_COMPAT%%include/dbm.h
4	%%GDBM_COMPAT%%include/ndbm.h	5	%%GDBM_COMPAT%%include/ndbm.h
5	lib/libgdbm.a	6	lib/libgdbm.a
6	lib/libgdbm.la	7	lib/libgdbm.la
7	lib/libgdbm.so	8	lib/libgdbm.so
8	lib/libgdbm.so.3	9	lib/libgdbm.so.4
9	%%GDBM_COMPAT%%lib/libgdbm_compat.a	10	%%GDBM_COMPAT%%lib/libgdbm_compat.a
10	%%GDBM_COMPAT%%lib/libgdbm_compat.la	11	%%GDBM_COMPAT%%lib/libgdbm_compat.la
11	%%GDBM_COMPAT%%lib/libgdbm_compat.so	12	%%GDBM_COMPAT%%lib/libgdbm_compat.so
12	%%GDBM_COMPAT%%lib/libgdbm_compat.so.3	13	%%GDBM_COMPAT%%lib/libgdbm_compat.so.4

Removed Link Here

(-)files/patch-libtool22 (-20 lines)
1	--- Makefile.in.orig 2009-06-29 13:15:23.000000000 -0500
2	+++ Makefile.in 2009-06-29 13:16:42.000000000 -0500
3	@@ -130,7 +130,7 @@
4	$(srcdir)/mkinstalldirs $(INSTALL_ROOT)$(libdir) \
5	$(INSTALL_ROOT)$(includedir) $(INSTALL_ROOT)$(man3dir) \
6	$(INSTALL_ROOT)$(infodir)
7	- $(LIBTOOL) $(INSTALL) -c libgdbm.la $(INSTALL_ROOT)$(libdir)/libgdbm.la
8	+ $(LIBTOOL) --mode=install $(INSTALL) -c libgdbm.la $(INSTALL_ROOT)$(libdir)/libgdbm.la
9	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) gdbm.h \
10	$(INSTALL_ROOT)$(includedir)/gdbm.h
11	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.3 \
12	@@ -141,7 +141,7 @@
13	install-compat:
14	$(srcdir)/mkinstalldirs $(INSTALL_ROOT)$(libdir) \
15	$(INSTALL_ROOT)$(includedir)
16	- $(LIBTOOL) $(INSTALL) -c libgdbm_compat.la \
17	+ $(LIBTOOL) --mode=install $(INSTALL) -c libgdbm_compat.la \
18	$(INSTALL_ROOT)$(libdir)/libgdbm_compat.la
19	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/dbm.h \
20	$(INSTALL_ROOT)$(includedir)/dbm.h