mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-20 20:09:11 +00:00
- Add workaround for glib-2.24 [1].
- Allow to choose samba port [2]. PR: ports/146768 [1], ports/146769 [2] Submitted by: Ricky Morse <remorse@partners.org> [1,2]
This commit is contained in:
Jun Kuriyama
parent
026cfe3180
commit
f51da86276
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=254825
@ -7,7 +7,7 @@
|
||||
|
||||
PORTNAME= amanda
|
||||
PORTVERSION= 2.6.1p2
|
||||
PORTREVISION= 1
|
||||
PORTREVISION= 2
|
||||
PORTEPOCH= 1
|
||||
CATEGORIES= misc
|
||||
MASTER_SITES= SF/amanda/amanda%20-%20stable/${PORTVERSION}
|
||||
@ -125,8 +125,9 @@ CONFIGURE_ARGS+= --without-gnuplot
|
||||
.endif
|
||||
|
||||
.if defined (WITH_SAMBA)
|
||||
BUILD_DEPENDS+= smbclient:${PORTSDIR}/net/samba3
|
||||
RUN_DEPENDS+= smbclient:${PORTSDIR}/net/samba3
|
||||
SAMBA_PORT?= samba3
|
||||
BUILD_DEPENDS+= smbclient:${PORTSDIR}/net/${SAMBA_PORT}
|
||||
RUN_DEPENDS+= smbclient:${PORTSDIR}/net/${SAMBA_PORT}
|
||||
CONFIGURE_ARGS+= --with-smbclient=${PREFIX}/bin/smbclient
|
||||
.endif
|
||||
|
||||
|
||||
51
misc/amanda-server/files/patch-common-src::glib-util.c
Normal file
51
misc/amanda-server/files/patch-common-src::glib-util.c
Normal file
@ -0,0 +1,51 @@
|
||||
|
||||
--- common-src/glib-util.c.orig 2010-05-20 13:19:58.000000000 -0400
|
||||
+++ common-src/glib-util.c 2010-05-20 13:24:40.000000000 -0400
|
||||
@@ -38,26 +38,15 @@
|
||||
if (did_glib_init) return;
|
||||
did_glib_init = TRUE;
|
||||
|
||||
- /* Initialize glib's type system */
|
||||
- g_type_init();
|
||||
-
|
||||
/* set up libcurl (this must happen before threading
|
||||
* is initialized) */
|
||||
#ifdef HAVE_LIBCURL
|
||||
# ifdef G_THREADS_ENABLED
|
||||
- g_assert(!g_thread_supported());
|
||||
+ g_assert(!g_thread_supported()); /* assert threads aren't initialized yet */
|
||||
# endif
|
||||
g_assert(curl_global_init(CURL_GLOBAL_ALL) == 0);
|
||||
#endif
|
||||
|
||||
- /* And set up glib's threads */
|
||||
-#if defined(G_THREADS_ENABLED) && !defined(G_THREADS_IMPL_NONE)
|
||||
- if (g_thread_supported()) {
|
||||
- return;
|
||||
- }
|
||||
- g_thread_init(NULL);
|
||||
-#endif
|
||||
-
|
||||
/* do a version check */
|
||||
#if GLIB_CHECK_VERSION(2,6,0)
|
||||
{
|
||||
@@ -71,6 +60,17 @@
|
||||
}
|
||||
}
|
||||
#endif
|
||||
+
|
||||
+ /* Initialize glib's type system. On glib >= 2.24, this will initialize
|
||||
+ * threads, so it must be done after curl is initialized. */
|
||||
+ g_type_init();
|
||||
+
|
||||
+ /* And set up glib's threads */
|
||||
+#if defined(G_THREADS_ENABLED) && !defined(G_THREADS_IMPL_NONE)
|
||||
+ if (!g_thread_supported())
|
||||
+ g_thread_init(NULL);
|
||||
+#endif
|
||||
+
|
||||
}
|
||||
|
||||
typedef enum {
|
||||
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
PORTNAME= amanda
|
||||
PORTVERSION= 2.6.1p2
|
||||
PORTREVISION= 1
|
||||
PORTREVISION= 2
|
||||
PORTEPOCH= 1
|
||||
CATEGORIES= misc
|
||||
MASTER_SITES= SF/amanda/amanda%20-%20stable/${PORTVERSION}
|
||||
@ -125,8 +125,9 @@ CONFIGURE_ARGS+= --without-gnuplot
|
||||
.endif
|
||||
|
||||
.if defined (WITH_SAMBA)
|
||||
BUILD_DEPENDS+= smbclient:${PORTSDIR}/net/samba3
|
||||
RUN_DEPENDS+= smbclient:${PORTSDIR}/net/samba3
|
||||
SAMBA_PORT?= samba3
|
||||
BUILD_DEPENDS+= smbclient:${PORTSDIR}/net/${SAMBA_PORT}
|
||||
RUN_DEPENDS+= smbclient:${PORTSDIR}/net/${SAMBA_PORT}
|
||||
CONFIGURE_ARGS+= --with-smbclient=${PREFIX}/bin/smbclient
|
||||
.endif
|
||||
|
||||
|
||||
51
misc/amanda26-server/files/patch-common-src::glib-util.c
Normal file
51
misc/amanda26-server/files/patch-common-src::glib-util.c
Normal file
@ -0,0 +1,51 @@
|
||||
|
||||
--- common-src/glib-util.c.orig 2010-05-20 13:19:58.000000000 -0400
|
||||
+++ common-src/glib-util.c 2010-05-20 13:24:40.000000000 -0400
|
||||
@@ -38,26 +38,15 @@
|
||||
if (did_glib_init) return;
|
||||
did_glib_init = TRUE;
|
||||
|
||||
- /* Initialize glib's type system */
|
||||
- g_type_init();
|
||||
-
|
||||
/* set up libcurl (this must happen before threading
|
||||
* is initialized) */
|
||||
#ifdef HAVE_LIBCURL
|
||||
# ifdef G_THREADS_ENABLED
|
||||
- g_assert(!g_thread_supported());
|
||||
+ g_assert(!g_thread_supported()); /* assert threads aren't initialized yet */
|
||||
# endif
|
||||
g_assert(curl_global_init(CURL_GLOBAL_ALL) == 0);
|
||||
#endif
|
||||
|
||||
- /* And set up glib's threads */
|
||||
-#if defined(G_THREADS_ENABLED) && !defined(G_THREADS_IMPL_NONE)
|
||||
- if (g_thread_supported()) {
|
||||
- return;
|
||||
- }
|
||||
- g_thread_init(NULL);
|
||||
-#endif
|
||||
-
|
||||
/* do a version check */
|
||||
#if GLIB_CHECK_VERSION(2,6,0)
|
||||
{
|
||||
@@ -71,6 +60,17 @@
|
||||
}
|
||||
}
|
||||
#endif
|
||||
+
|
||||
+ /* Initialize glib's type system. On glib >= 2.24, this will initialize
|
||||
+ * threads, so it must be done after curl is initialized. */
|
||||
+ g_type_init();
|
||||
+
|
||||
+ /* And set up glib's threads */
|
||||
+#if defined(G_THREADS_ENABLED) && !defined(G_THREADS_IMPL_NONE)
|
||||
+ if (!g_thread_supported())
|
||||
+ g_thread_init(NULL);
|
||||
+#endif
|
||||
+
|
||||
}
|
||||
|
||||
typedef enum {
|
||||
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
PORTNAME= amanda
|
||||
PORTVERSION= 2.6.1p2
|
||||
PORTREVISION= 1
|
||||
PORTREVISION= 2
|
||||
PORTEPOCH= 1
|
||||
CATEGORIES= misc
|
||||
MASTER_SITES= SF/amanda/amanda%20-%20stable/${PORTVERSION}
|
||||
@ -125,8 +125,9 @@ CONFIGURE_ARGS+= --without-gnuplot
|
||||
.endif
|
||||
|
||||
.if defined (WITH_SAMBA)
|
||||
BUILD_DEPENDS+= smbclient:${PORTSDIR}/net/samba3
|
||||
RUN_DEPENDS+= smbclient:${PORTSDIR}/net/samba3
|
||||
SAMBA_PORT?= samba3
|
||||
BUILD_DEPENDS+= smbclient:${PORTSDIR}/net/${SAMBA_PORT}
|
||||
RUN_DEPENDS+= smbclient:${PORTSDIR}/net/${SAMBA_PORT}
|
||||
CONFIGURE_ARGS+= --with-smbclient=${PREFIX}/bin/smbclient
|
||||
.endif
|
||||
|
||||
|
||||
51
misc/amanda32-server/files/patch-common-src::glib-util.c
Normal file
51
misc/amanda32-server/files/patch-common-src::glib-util.c
Normal file
@ -0,0 +1,51 @@
|
||||
|
||||
--- common-src/glib-util.c.orig 2010-05-20 13:19:58.000000000 -0400
|
||||
+++ common-src/glib-util.c 2010-05-20 13:24:40.000000000 -0400
|
||||
@@ -38,26 +38,15 @@
|
||||
if (did_glib_init) return;
|
||||
did_glib_init = TRUE;
|
||||
|
||||
- /* Initialize glib's type system */
|
||||
- g_type_init();
|
||||
-
|
||||
/* set up libcurl (this must happen before threading
|
||||
* is initialized) */
|
||||
#ifdef HAVE_LIBCURL
|
||||
# ifdef G_THREADS_ENABLED
|
||||
- g_assert(!g_thread_supported());
|
||||
+ g_assert(!g_thread_supported()); /* assert threads aren't initialized yet */
|
||||
# endif
|
||||
g_assert(curl_global_init(CURL_GLOBAL_ALL) == 0);
|
||||
#endif
|
||||
|
||||
- /* And set up glib's threads */
|
||||
-#if defined(G_THREADS_ENABLED) && !defined(G_THREADS_IMPL_NONE)
|
||||
- if (g_thread_supported()) {
|
||||
- return;
|
||||
- }
|
||||
- g_thread_init(NULL);
|
||||
-#endif
|
||||
-
|
||||
/* do a version check */
|
||||
#if GLIB_CHECK_VERSION(2,6,0)
|
||||
{
|
||||
@@ -71,6 +60,17 @@
|
||||
}
|
||||
}
|
||||
#endif
|
||||
+
|
||||
+ /* Initialize glib's type system. On glib >= 2.24, this will initialize
|
||||
+ * threads, so it must be done after curl is initialized. */
|
||||
+ g_type_init();
|
||||
+
|
||||
+ /* And set up glib's threads */
|
||||
+#if defined(G_THREADS_ENABLED) && !defined(G_THREADS_IMPL_NONE)
|
||||
+ if (!g_thread_supported())
|
||||
+ g_thread_init(NULL);
|
||||
+#endif
|
||||
+
|
||||
}
|
||||
|
||||
typedef enum {
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user