[Midnightbsd-cvs] mports [23787] trunk/databases/qdbm: fix build

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun Aug 19 13:59:49 EDT 2018 

Revision: 23787
          http://svnweb.midnightbsd.org/mports/?rev=23787
Author:   laffer1
Date:     2018-08-19 13:59:48 -0400 (Sun, 19 Aug 2018)
Log Message:
-----------
fix build

Modified Paths:
--------------
    trunk/databases/qdbm/Makefile
    trunk/databases/qdbm/files/patch-Makefile.in

Added Paths:
-----------
    trunk/databases/qdbm/files/patch-configure

Modified: trunk/databases/qdbm/Makefile
===================================================================
--- trunk/databases/qdbm/Makefile	2018-08-19 17:57:31 UTC (rev 23786)
+++ trunk/databases/qdbm/Makefile	2018-08-19 17:59:48 UTC (rev 23787)
@@ -2,62 +2,44 @@
 
 PORTNAME=	qdbm
 PORTVERSION=	1.8.78
-PORTREVISION=	1
+PORTREVISION=	4
 CATEGORIES=	databases
 MASTER_SITES=	http://fallabs.com/qdbm/
 
 MAINTAINER=	ports at MidnightBSD.org
-COMMENT?=	Quick Database Manager
-LICENSE=        lgpl
+COMMENT=	Quick Database Manager
 
+LICENSE=	lgpl2.1
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+LIB_DEPENDS=	liblzo2.so:archivers/lzo2
+
+USES=		iconv
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-
-.if !defined(SLAVEPORT)
-USES+=		iconv
-CONFIGURE_ARGS=	--enable-zlib \
-		--enable-iconv \
-		--enable-pthread
-CFLAGS+=	${PTHREAD_CFLAGS}
-CPPFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
-LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
-MAKE_ARGS=	RELCFLAGS="${CFLAGS}" \
-		MYDATADIR="${DOCSDIR}" MYDOCS="${PORTDOCS}"
-.if !defined(NOPORTDOCS)
+CONFIGURE_ENV=	ac_cv_lib_iconv_main=yes
+CONFIGURE_ARGS=	--enable-bzip --enable-lzo --enable-zlib \
+		--enable-iconv --enable-pthread
+CPPFLAGS+=	-I${LOCALBASE}/include
+CFLAGS+=	-fPIC -fsigned-char
+LIBS+=		-L${LOCALBASE}/lib ${ICONV_LIB}
+MAKE_ARGS=	MYDATADIR="${DOCSDIR}" MYDOCS="${PORTDOCS}" \
+		MYPCDIR="${PREFIX}/libdata/pkgconfig"
+INSTALL_TARGET=	install-strip
 PORTDOCS=	ChangeLog NEWS
-.endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|@libdir@/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
-		${WRKSRC}/Makefile.in
+.if defined(WITH_DEBUG)
+	@${REINPLACE_CMD} 's/-DNDEBUG//' ${WRKSRC}/Makefile.in
+.endif
 
 post-build:
-	cd ${WRKSRC}/lab; \
-	${MAKE} CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -liconv" fmtcnv031127
+	cd ${WRKSRC}/lab && ${MAKE} CC="${CC}" CFLAGS="${CFLAGS}" \
+	    CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
+	    fmtcnv031127
 
 post-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/lab/fmtcnv031127 ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/lab/fmtcnv031127 ${STAGEDIR}${PREFIX}/bin
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libqdbm.so.14.14.0
 
-.else
-
-LIB_DEPENDS+=	qdbm:${PORTSDIR}/databases/qdbm
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/java|${JAVA_HOME}|' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
-.if ${SLAVEPORT}=="ruby"
-	@${FIND} ${WRKSRC} -type f | \
-		${XARGS} -n 10 ${REINPLACE_CMD} -e \
-		's|/usr/bin/ruby -w|${SETENV} ruby|'
-	@${FIND} ${WRKSRC} -name '*.bak' | ${XARGS} ${RM} -f
-.endif
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if !defined(SLAVEPORT) && defined(WITH_DEBUG)
-CONFIGURE_ARGS+=	--enable-debug
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: trunk/databases/qdbm/files/patch-Makefile.in
===================================================================
--- trunk/databases/qdbm/files/patch-Makefile.in	2018-08-19 17:57:31 UTC (rev 23786)
+++ trunk/databases/qdbm/files/patch-Makefile.in	2018-08-19 17:59:48 UTC (rev 23787)
@@ -1,11 +1,29 @@
---- Makefile.in.orig    Wed Feb 21 16:44:56 2007
-+++ Makefile.in Sun Jul  8 18:19:52 2007
-@@ -169,8 +169,10 @@
-	cd $(srcdir)/man && cp -Rf $(MYMAN1S) $(DESTDIR)$(MYMAN1DIR)
-	mkdir -p $(DESTDIR)$(MYMAN3DIR)
-	cd $(srcdir)/man && cp -Rf $(MYMAN3S) $(DESTDIR)$(MYMAN3DIR)
-+.if $(MYDOCS) != ""
-	mkdir -p $(DESTDIR)$(MYDATADIR)
-	cd $(srcdir) && cp -Rf $(MYDOCS) $(DESTDIR)$(MYDATADIR)
-+.endif
-	mkdir -p $(DESTDIR)$(MYPCDIR)
+--- Makefile.in.orig	2010-08-04 17:14:34 UTC
++++ Makefile.in
+@@ -51,20 +51,19 @@ DESTDIR =
+ 
+ # Building binaries
+ CC = @CC@
+-CPPFLAGS = @CPPFLAGS@ -I$(srcdir) -I$(MYHEADDIR) \
+-  -I$(HOME)/include -I/usr/local/include @MYDEFS@ \
++CPPFLAGS = @CPPFLAGS@ -I$(srcdir) -I$(MYHEADDIR) @MYDEFS@ \
+   -D_XOPEN_SOURCE_EXTENDED=1 -D_GNU_SOURCE=1 -D__EXTENSIONS__=1 -D_HPUX_SOURCE=1 \
+   -D_POSIX_MAPPED_FILES=1 -D_POSIX_SYNCHRONIZED_IO=1 \
+   -DPIC=1 -D_THREAD_SAFE=1 -D_REENTRANT=1 -DNDEBUG
+-CFLAGS = -Wall -pedantic -fPIC -fsigned-char -O3 -fomit-frame-pointer -fforce-addr @MYOPTS@
++CFLAGS = @CFLAGS@
+ LD = @LD@
+ LIBS = -lqdbm @LIBS@
+-LIBLDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib @LIBS@
+-LDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib $(LIBS)
+-LDENV = LD_RUN_PATH=/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib
++LIBLDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) @LIBS@
++LDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) $(LIBS)
++LDENV =
+ AR = @AR@
+ ARFLAGS = rcsv
+-RUNENV = LD_LIBRARY_PATH=.:/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib
++RUNENV =
+ 
+ 
+ 

Added: trunk/databases/qdbm/files/patch-configure
===================================================================
--- trunk/databases/qdbm/files/patch-configure	                        (rev 0)
+++ trunk/databases/qdbm/files/patch-configure	2018-08-19 17:59:48 UTC (rev 23787)
@@ -0,0 +1,29 @@
+--- configure.orig	2010-08-04 17:15:20 UTC
++++ configure
+@@ -1934,7 +1934,7 @@ fi
+ if test "$enable_iconv" = "yes"
+ then
+   MYDEFS="$MYDEFS -DMYICONV"
+-  MGWLIBS="-liconv $MGWLIBS"
++  MGWLIBS="$ICONV_LIB $MGWLIBS"
+   enables="$enables (iconv)"
+   isiconv="yes"
+ fi
+@@ -3047,7 +3047,7 @@ if test "${ac_cv_lib_iconv_main+set}" = 
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-liconv  $LIBS"
++LIBS="$ICONV_LIB  $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -3076,7 +3076,7 @@ if test "x$ac_cv_lib_iconv_main" = x""ye
+ #define HAVE_LIBICONV 1
+ _ACEOF
+ 
+-  LIBS="-liconv $LIBS"
++  LIBS="$ICONV_LIB $LIBS"
+ 
+ fi
+ 


Property changes on: trunk/databases/qdbm/files/patch-configure
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property

More information about the Midnightbsd-cvs mailing list