svn commit: r337338 - in head/databases/dbf: . files
Pawel Pekala
pawel at FreeBSD.org
Tue Dec 24 12:33:45 UTC 2013
Author: pawel
Date: Tue Dec 24 12:33:44 2013
New Revision: 337338
URL: http://svnweb.freebsd.org/changeset/ports/337338
Log:
- Fix build with gcc on 8.x and 9.x
- Use option subs
- Support staging, strip library
PR: ports/184896
Submitted by: KATO Tsuguru <tkato432 at yahoo.com>
Added:
head/databases/dbf/files/
head/databases/dbf/files/patch-libdbf.h (contents, props changed)
Modified:
head/databases/dbf/Makefile
Modified: head/databases/dbf/Makefile
==============================================================================
--- head/databases/dbf/Makefile Tue Dec 24 10:46:52 2013 (r337337)
+++ head/databases/dbf/Makefile Tue Dec 24 12:33:44 2013 (r337338)
@@ -3,6 +3,7 @@
PORTNAME= dbf
PORTVERSION= 0.9.0
+PORTREVISION= 1
CATEGORIES= databases
MASTER_SITES= SF/${PORTNAME}.berlios
DISTFILES= ${PORTNAME}-core-${PORTVERSION}.src.zip \
@@ -12,6 +13,7 @@ MAINTAINER= ports at FreeBSD.org
COMMENT= Show and convert the content of dBASE III, IV, and 5.0 files
OPTIONS_DEFINE= NLS
+OPTIONS_SUB= yes
WRKSRC= ${WRKDIR}/lib${PORTNAME}
@@ -22,21 +24,16 @@ GNU_CONFIGURE= yes
CONFIGURE_ENV= ac_cv_prog_DOC_TO_MAN=""
USE_LDCONFIG= yes
-NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
USES+= gettext
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib -lintl
-PLIST_SUB+= NLS=""
.else
CONFIGURE_ENV+= ac_cv_header_libintl_h=no
-PLIST_SUB+= NLS="@comment "
.endif
-_make_jobs= -j${MAKE_JOBS_NUMBER}
-
post-extract:
@${FIND} ${WRKDIR} -name "configure" -or -name "install-sh" | \
${XARGS} ${CHMOD} ${BINMODE}
@@ -49,8 +46,8 @@ post-configure:
@(cd ${WRKDIR}/${PORTNAME}-core && ${SETENV} ${CONFIGURE_ENV} \
CC="${CC}" CXX="${CXX}" \
CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
- CPPFLAGS="-I${WRKSRC}/include" \
- LDFLAGS="-L${WRKSRC}/src/.libs" \
+ CPPFLAGS="-I${WRKSRC}/include ${CPPFLAGS}" \
+ LDFLAGS="-L${WRKSRC}/src/.libs ${LDFLAGS}" \
INSTALL_DATA="${INSTALL_DATA}" \
INSTALL_LIB="${INSTALL_LIB}" \
INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
@@ -59,11 +56,14 @@ post-configure:
./configure --prefix=${PREFIX})
post-build:
- @(cd ${WRKDIR}/${PORTNAME}-core && ${SETENV} ${MAKE_ENV} ${MAKE} \
- ${MAKE_FLAGS} ${MAKEFILE} ${_make_jobs} ${ALL_TARGET})
+ @(cd ${WRKDIR}/${PORTNAME}-core && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
+ ${MAKE_FLAGS} ${MAKEFILE} -j${MAKE_JOBS_NUMBER} ${MAKE_ARGS} \
+ ${ALL_TARGET})
post-install:
- @(cd ${WRKDIR}/${PORTNAME}-core && ${SETENV} ${MAKE_ENV} ${MAKE} \
- ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
+ @(cd ${WRKDIR}/${PORTNAME}-core && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
+ ${MAKE_FLAGS} ${MAKEFILE} -j${MAKE_JOBS_NUMBER} ${MAKE_ARGS} \
+ ${INSTALL_TARGET})
+ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libdbf.so.0
.include <bsd.port.mk>
Added: head/databases/dbf/files/patch-libdbf.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/dbf/files/patch-libdbf.h Tue Dec 24 12:33:44 2013 (r337338)
@@ -0,0 +1,17 @@
+--- ../libdbf/include/libdbf/libdbf.h.orig
++++ ../libdbf/include/libdbf/libdbf.h
+@@ -17,6 +17,9 @@
+ * $Id: libdbf.h,v 1.6 2006/04/14 12:25:30 rollinhand Exp $
+ ****************************************************************************/
+
++#ifndef __LIBDBF_H__
++#define __LIBDBF_H__
++
+ #include <sys/types.h>
+
+ /*! \file libdbf.h
+@@ -337,3 +340,4 @@
+ */
+ int dbf_IsMemo(P_DBF *p_dbf);
+
++#endif /* __LIBDBF_H__ */
More information about the svn-ports-all
mailing list