diff options
| author | Kirill Ponomarev <krion@FreeBSD.org> | 2003-08-27 18:57:02 +0000 |
|---|---|---|
| committer | Kirill Ponomarev <krion@FreeBSD.org> | 2003-08-27 18:57:02 +0000 |
| commit | de153dca59065bcf464f847888dc10024a32c310 (patch) | |
| tree | afa0e778f6127d5072f9b40a70e3d46be0d28248 | |
| parent | - Update to version 0.23 (diff) | |
- Fix build with MySQL
| -rw-r--r-- | net-p2p/gnunet/Makefile | 5 | ||||
| -rw-r--r-- | net-p2p/gnunet/files/patch-configure | 13 | ||||
| -rw-r--r-- | net/gnunet/Makefile | 5 | ||||
| -rw-r--r-- | net/gnunet/files/patch-configure | 13 |
4 files changed, 36 insertions, 0 deletions
diff --git a/net-p2p/gnunet/Makefile b/net-p2p/gnunet/Makefile index 5fcf41eff178..0261543359c3 100644 --- a/net-p2p/gnunet/Makefile +++ b/net-p2p/gnunet/Makefile @@ -8,6 +8,7 @@ PORTNAME= gnunet PORTVERSION= 0.5.5 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://www.ovmj.org/GNUnet/download/ \ ${MASTER_SITE_GNU} @@ -17,6 +18,8 @@ DISTNAME= GNUnet-${PORTVERSION} MAINTAINER= krion@FreeBSD.org COMMENT= An anonymous, distributed, reputation-based network +LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext + USE_LIBTOOL= yes INSTALLS_SHLIB= yes USE_GMAKE= yes @@ -24,6 +27,7 @@ USE_REINPLACE= yes USE_BZIP2= yes USE_OPENSSL= yes USE_GNOME= gtk12 +USE_GETOPT_LONG= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ @@ -40,6 +44,7 @@ PLIST_SUB+= WITH_GDBM="@comment " .if defined(WITH_MYSQL) USE_MYSQL= yes WANT_MYSQL_VER= 323 +CONFIGURE_ARGS+= --with-mysql .else CONFIGURE_ARGS+= --without-mysql .endif diff --git a/net-p2p/gnunet/files/patch-configure b/net-p2p/gnunet/files/patch-configure new file mode 100644 index 000000000000..1199b62c9db9 --- /dev/null +++ b/net-p2p/gnunet/files/patch-configure @@ -0,0 +1,13 @@ +--- configure.orig Wed Aug 27 15:47:59 2003 ++++ configure Wed Aug 27 15:55:40 2003 +@@ -13748,8 +13748,8 @@ + echo "${ECHO_T}\"$with_mysql\"" >&6 + if test "$with_mysql" != "no" + then +- LDFLAGS="-L$with_mysql/lib -L$with_mysql/lib/mysql $LDFLAGS" +- CPPFLAGS="-I$with_mysql/include $CPPFLAGS" ++ LDFLAGS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql $LDFLAGS" ++ CPPFLAGS="-I${LOCALBASE}/include $CPPFLAGS" + + for ac_header in mysql/mysql.h + do diff --git a/net/gnunet/Makefile b/net/gnunet/Makefile index 5fcf41eff178..0261543359c3 100644 --- a/net/gnunet/Makefile +++ b/net/gnunet/Makefile @@ -8,6 +8,7 @@ PORTNAME= gnunet PORTVERSION= 0.5.5 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://www.ovmj.org/GNUnet/download/ \ ${MASTER_SITE_GNU} @@ -17,6 +18,8 @@ DISTNAME= GNUnet-${PORTVERSION} MAINTAINER= krion@FreeBSD.org COMMENT= An anonymous, distributed, reputation-based network +LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext + USE_LIBTOOL= yes INSTALLS_SHLIB= yes USE_GMAKE= yes @@ -24,6 +27,7 @@ USE_REINPLACE= yes USE_BZIP2= yes USE_OPENSSL= yes USE_GNOME= gtk12 +USE_GETOPT_LONG= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ @@ -40,6 +44,7 @@ PLIST_SUB+= WITH_GDBM="@comment " .if defined(WITH_MYSQL) USE_MYSQL= yes WANT_MYSQL_VER= 323 +CONFIGURE_ARGS+= --with-mysql .else CONFIGURE_ARGS+= --without-mysql .endif diff --git a/net/gnunet/files/patch-configure b/net/gnunet/files/patch-configure new file mode 100644 index 000000000000..1199b62c9db9 --- /dev/null +++ b/net/gnunet/files/patch-configure @@ -0,0 +1,13 @@ +--- configure.orig Wed Aug 27 15:47:59 2003 ++++ configure Wed Aug 27 15:55:40 2003 +@@ -13748,8 +13748,8 @@ + echo "${ECHO_T}\"$with_mysql\"" >&6 + if test "$with_mysql" != "no" + then +- LDFLAGS="-L$with_mysql/lib -L$with_mysql/lib/mysql $LDFLAGS" +- CPPFLAGS="-I$with_mysql/include $CPPFLAGS" ++ LDFLAGS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql $LDFLAGS" ++ CPPFLAGS="-I${LOCALBASE}/include $CPPFLAGS" + + for ac_header in mysql/mysql.h + do |