aboutsummaryrefslogtreecommitdiffstats
path: root/misc
diff options
context:
space:
mode:
Diffstat (limited to 'misc')
-rw-r--r--misc/amanda26-server/files/patch-common-src::glib-util.c19
-rw-r--r--misc/amanda26-server/files/patch-common-src_glib-util.h9
-rw-r--r--misc/amanda32-server/files/patch-common-src_glib-util.c18
-rw-r--r--misc/amanda32-server/files/patch-common-src_glib-util.h10
-rw-r--r--misc/bigboard/Makefile2
-rw-r--r--misc/gnome-mime-data/Makefile7
-rw-r--r--misc/gnomehier/Makefile15
-rw-r--r--misc/gnomehier/files/dirlist29
-rw-r--r--misc/metalink-tools/Makefile1
-rw-r--r--misc/salias/Makefile1
-rw-r--r--misc/shared-mime-info/Makefile2
-rw-r--r--misc/xdelta/Makefile1
12 files changed, 87 insertions, 27 deletions
diff --git a/misc/amanda26-server/files/patch-common-src::glib-util.c b/misc/amanda26-server/files/patch-common-src::glib-util.c
index 1d3b00558e0d..eb92dddcfc54 100644
--- a/misc/amanda26-server/files/patch-common-src::glib-util.c
+++ b/misc/amanda26-server/files/patch-common-src::glib-util.c
@@ -1,5 +1,5 @@
---- common-src/glib-util.c.orig 2008-12-01 22:17:19.000000000 +0100
-+++ common-src/glib-util.c 2011-06-25 22:43:28.000000000 +0200
+--- common-src/glib-util.c.orig 2008-12-01 21:17:19.000000000 +0000
++++ common-src/glib-util.c 2013-02-07 15:54:40.000000000 +0000
@@ -38,26 +38,15 @@
if (did_glib_init) return;
did_glib_init = TRUE;
@@ -46,7 +46,7 @@
}
typedef enum {
-@@ -107,29 +107,19 @@
+@@ -107,38 +107,19 @@
return to;
}
@@ -76,7 +76,16 @@
g_slist_free(list);
}
+-
+-void g_queue_free_full(GQueue * queue) {
+- while (!g_queue_is_empty(queue)) {
+- gpointer data;
+- data = g_queue_pop_head(queue);
+- amfree(data);
+- }
+- g_queue_free(queue);
+-}
+#endif
- void g_queue_free_full(GQueue * queue) {
- while (!g_queue_is_empty(queue)) {
+ void g_ptr_array_free_full(GPtrArray * array) {
+ size_t i;
diff --git a/misc/amanda26-server/files/patch-common-src_glib-util.h b/misc/amanda26-server/files/patch-common-src_glib-util.h
index 7e26de023ff5..913e150674ee 100644
--- a/misc/amanda26-server/files/patch-common-src_glib-util.h
+++ b/misc/amanda26-server/files/patch-common-src_glib-util.h
@@ -1,6 +1,6 @@
---- common-src/glib-util.h.orig 2011-06-25 22:39:20.000000000 +0200
-+++ common-src/glib-util.h 2011-06-25 22:40:39.000000000 +0200
-@@ -62,10 +62,16 @@ GValue* g_value_unset_init(GValue* val,
+--- common-src/glib-util.h.orig 2008-12-01 21:17:19.000000000 +0000
++++ common-src/glib-util.h 2013-02-07 15:54:27.000000000 +0000
+@@ -62,11 +62,16 @@
* Returns its second (reset) argument.*/
GValue* g_value_unset_copy(const GValue* from, GValue * to);
@@ -16,6 +16,7 @@
* pointers in the container before free()ing the container itself. */
-void g_list_free_full(GList * list);
-void g_slist_free_full(GSList * list);
- void g_queue_free_full(GQueue * queue);
+-void g_queue_free_full(GQueue * queue);
void g_ptr_array_free_full(GPtrArray * array);
+ /* g_value_compare() does what you expect. It returns TRUE if and
diff --git a/misc/amanda32-server/files/patch-common-src_glib-util.c b/misc/amanda32-server/files/patch-common-src_glib-util.c
new file mode 100644
index 000000000000..c1261d15f6e2
--- /dev/null
+++ b/misc/amanda32-server/files/patch-common-src_glib-util.c
@@ -0,0 +1,18 @@
+--- common-src/glib-util.c.orig 2013-02-07 15:57:30.000000000 +0000
++++ common-src/glib-util.c 2013-02-07 15:57:50.000000000 +0000
+@@ -120,15 +120,6 @@
+ }
+ #endif
+
+-void g_queue_free_full(GQueue * queue) {
+- while (!g_queue_is_empty(queue)) {
+- gpointer data;
+- data = g_queue_pop_head(queue);
+- amfree(data);
+- }
+- g_queue_free(queue);
+-}
+-
+ void g_ptr_array_free_full(GPtrArray * array) {
+ size_t i;
+
diff --git a/misc/amanda32-server/files/patch-common-src_glib-util.h b/misc/amanda32-server/files/patch-common-src_glib-util.h
new file mode 100644
index 000000000000..75839e8c75bf
--- /dev/null
+++ b/misc/amanda32-server/files/patch-common-src_glib-util.h
@@ -0,0 +1,10 @@
+--- common-src/glib-util.h.orig 2013-02-07 15:57:26.000000000 +0000
++++ common-src/glib-util.h 2013-02-07 15:57:54.000000000 +0000
+@@ -72,7 +72,6 @@
+
+ /* These functions all take a GLib container, and call free() on all the
+ * pointers in the container before free()ing the container itself. */
+-void g_queue_free_full(GQueue * queue);
+ void g_ptr_array_free_full(GPtrArray * array);
+
+ /* g_value_compare() does what you expect. It returns TRUE if and
diff --git a/misc/bigboard/Makefile b/misc/bigboard/Makefile
index 413cfcca6a1e..07ce56b6cfec 100644
--- a/misc/bigboard/Makefile
+++ b/misc/bigboard/Makefile
@@ -38,5 +38,7 @@ GCONF_SCHEMAS= bigboard.schemas
post-patch:
@${FIND} ${WRKSRC} -type f -exec fgrep -l '%%LOCALBASE%%' {} \; |${XARGS} ${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},g' -i .bak
+ @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \
+ ${WRKSRC}/bigboard/keybinder/tomboykeybinder.h
.include <bsd.port.mk>
diff --git a/misc/gnome-mime-data/Makefile b/misc/gnome-mime-data/Makefile
index f2ae701a85aa..f6a0cb3a1401 100644
--- a/misc/gnome-mime-data/Makefile
+++ b/misc/gnome-mime-data/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for: gnomemimedata
-# Date created: 22 January 2002
-# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
-#
+# Created by: Maxim Sobolev <sobomax@FreeBSD.org>
# $FreeBSD$
# $MCom: ports/misc/gnome-mime-data/Makefile,v 1.14 2007/05/22 04:59:18 marcus Exp $
@@ -19,7 +16,7 @@ COMMENT= A MIME and Application database for GNOME
USE_BZIP2= yes
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_GNOME= gnomeprefix gnomehack intlhack pkgconfig
+USE_GNOME= gnomeprefix gnomehack intlhack
GNU_CONFIGURE= yes
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lintl"
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/misc/gnomehier/Makefile b/misc/gnomehier/Makefile
index 8774c9c39048..226b807325bb 100644
--- a/misc/gnomehier/Makefile
+++ b/misc/gnomehier/Makefile
@@ -1,15 +1,10 @@
-# New ports collection makefile for: gnomehier
-# Date created: 2 July 2002
-# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
-#
+# Created by: Maxim Sobolev <sobomax@FreeBSD.org>
# $FreeBSD$
-# $MCom: ports/misc/gnomehier/Makefile,v 1.34 2009/04/09 03:24:08 mezz Exp $
-#
+# $MCom: ports/misc/gnomehier/Makefile,v 1.39 2012/12/10 10:58:06 kwm Exp $
# !!DON'T BUMP PORTREVISION ON MTREE CHANGES ANYMORE!!
PORTNAME= gnomehier
-PORTVERSION= 2.3
-PORTREVISION= 12
+PORTVERSION= 3.0
CATEGORIES= misc gnome
MASTER_SITES= # none
DISTFILES= # none
@@ -18,7 +13,7 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= A utility port that creates the GNOME directory tree
NO_BUILD= yes
-PLIST?= ${WRKDIR}/pkg-plist
+PLIST= ${WRKDIR}/pkg-plist
PKGINSTALL= ${WRKDIR}/pkg-install
GNOME_MTREE= BSD.gnome.dist
@@ -44,8 +39,6 @@ pre-install:
< ${FILESDIR}/pkg-install.in > ${PKGINSTALL}
pre-su-install:
- ${CHGRP} games ${WRKSRC}/share/games
- ${CHMOD} g=rwXs ${WRKSRC}/share/games
cd ${WRKSRC} && \
${MTREE_CMD} -U -d -n -i -c -k "uname, gname, mode" | \
${SED} -e 's|uname=[A-Za-z0-9_]*|uname=root|' \
diff --git a/misc/gnomehier/files/dirlist b/misc/gnomehier/files/dirlist
index 9ef1b4c8f0f6..1e48a75d2eec 100644
--- a/misc/gnomehier/files/dirlist
+++ b/misc/gnomehier/files/dirlist
@@ -4,6 +4,9 @@ etc/X11
etc/X11/serverconfig
etc/X11/starthere
etc/X11/sysconfig
+etc/dconf
+etc/dconf/db
+etc/dconf/profile
etc/gconf
etc/gconf/gconf.xml.defaults
etc/gconf/gconf.xml.mandatory
@@ -13,6 +16,11 @@ etc/gnome
etc/gnome-vfs-2.0
etc/gnome-vfs-2.0/modules
etc/gnome/config
+etc/mateconf
+etc/mateconf/mateconf.xml.defaults
+etc/mateconf/mateconf.xml.mandatory
+etc/mateconf/mateconf.xml.system
+etc/mateconf/schemas
etc/sound
etc/sound/events
etc/vfs
@@ -26,12 +34,23 @@ lib/GConf
lib/bonobo
lib/bonobo/monikers
lib/bonobo/plugin
+lib/girepository-1.0
lib/gnome-vfs-2.0
lib/gnome-vfs-2.0/modules
+lib/mate-vfs-2.0
+lib/mate-vfs-2.0/modules
+lib/matecomponent
+lib/matecomponent-2.0
+lib/matecomponent-2.0/samples
+lib/matecomponent/monikers
lib/vfs
lib/vfs/modules
libdata/bonobo
libdata/bonobo/servers
+libdata/matecomponent
+libdata/matecomponent/servers
+share/MateConf
+share/MateConf/gsettings
share/applets
share/applets/Amusements
share/applets/Clocks
@@ -50,14 +69,16 @@ share/control-center/Peripherals
share/control-center/Session
share/control-center/capplets
share/control-center/keybindings
+share/control-center/keybindings/gtk-modules
share/doc/libgda
-share/games
+share/gir-1.0
share/gnome
share/gnome-2.0
share/gnome-2.0/ui
share/gnome-about
share/gnome-control-center
share/gnome-control-center/keybindings
+share/gnome-settings-daemon-3.0
share/gnome/apps
share/gnome/apps/Applications
share/gnome/apps/Audio
@@ -85,6 +106,12 @@ share/gnome/panel
share/gnome/ui
share/gnome/wm-properties
share/images
+share/mate
+share/mate-2.0
+share/mate-2.0/ui
+share/mate-control-center
+share/mate-control-center/keybindings
+share/mate/help
share/mc
share/mc/templates
share/mime-info
diff --git a/misc/metalink-tools/Makefile b/misc/metalink-tools/Makefile
index ff4d28bc222c..deccf4912de9 100644
--- a/misc/metalink-tools/Makefile
+++ b/misc/metalink-tools/Makefile
@@ -25,6 +25,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
USE_GNOME= glib20
GNU_CONFIGURE= yes
+USE_PKGCONFIG= build
CONFIGURE_ENV+= AWK="${AWK}"
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/misc/salias/Makefile b/misc/salias/Makefile
index ea95ccec8207..2aa97175e2b9 100644
--- a/misc/salias/Makefile
+++ b/misc/salias/Makefile
@@ -17,6 +17,7 @@ COMMENT= A command-line tool to alias arguments of other programs
USE_BZIP2= yes
USE_GNOME= glib20
+USE_PKGCONFIG= build
GNU_CONFIGURE= yes
MAN1= salias.1
diff --git a/misc/shared-mime-info/Makefile b/misc/shared-mime-info/Makefile
index 7df7c71e89e2..53ff1807869b 100644
--- a/misc/shared-mime-info/Makefile
+++ b/misc/shared-mime-info/Makefile
@@ -16,7 +16,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-update-mimedb
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_GNOME= glib20 libxml2 intltool gnomehack intlhack pkgconfig
+USE_GNOME= glib20 libxml2 intltool gnomehack intlhack
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
MAKE_JOBS_UNSAFE= yes
diff --git a/misc/xdelta/Makefile b/misc/xdelta/Makefile
index 8581ed0cb31e..07ef2e8d8027 100644
--- a/misc/xdelta/Makefile
+++ b/misc/xdelta/Makefile
@@ -16,6 +16,7 @@ COMMENT= A diff/patch utility for binary files
USE_AUTOTOOLS= libtool
USE_GNOME= glib20
+USE_PKGCONFIG= build
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
generated by cgit (git 2.34.1) at 2024-11-25 00:49:11 +0800