Browse files

Sync with marcuscom repo

  • Loading branch information...
1 parent 2326f41 commit 2ae29a341eecc2f5622c2dab713676c2afaaffe9 @kmoore134 kmoore134 committed Mar 19, 2014
View
18 devel/glib20/Makefile
@@ -1,10 +1,10 @@
# Created by: Vanilla I. Shu <vanilla@FreeBSD.org>
-# $FreeBSD$
-# $MCom: ports/trunk/devel/glib20/Makefile 18994 2014-02-03 21:20:14Z kwm $
+# $FreeBSD: head/devel/glib20/Makefile 344586 2014-02-16 15:40:34Z kwm $
+# $MCom: ports/trunk/devel/glib20/Makefile 19135 2014-03-15 13:51:43Z kwm $
PORTNAME= glib
PORTVERSION= 2.38.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -24,7 +24,10 @@ LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre \
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USES= gettext gmake iconv libtool pathfix perl5 pkgconfig shebangfix
+# iconv:wchar_t - our iconv in base doesn't support utf-8 -> wchar_t (boooo)
+# (wchar_t is used by glibmm, rawtherapee triggered this)
+USES= gettext gmake iconv:wchar_t libtool pathfix perl5 pkgconfig \
+ shebangfix
USE_PYTHON= yes
CONFIGURE_ARGS= --disable-gtk-doc --with-html-dir=${PREFIX}/share/doc \
--disable-man --without-xml-catalog \
@@ -33,6 +36,7 @@ CONFIGURE_ARGS= --disable-gtk-doc --with-html-dir=${PREFIX}/share/doc \
CONFIGURE_ENV= ac_cv_header_sys_inotify_h=
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
+INSTALL_TARGET= install-strip
SHEBANG_FILES= */*.pl glib/gen-iswide-table.py
@@ -94,6 +98,8 @@ PLIST_SUB+= GDB="@comment "
.if ${PORT_OPTIONS:MDEBUG}
CONFIGURE_ARGS+= --enable-debug=yes \
--disable-silent-rules
+.else
+CONFIGURE_ARGS+= --disable-modular-tests
.endif
post-patch:
@@ -106,13 +112,9 @@ post-patch:
@${REINPLACE_CMD} -e 's|inotify_support=yes|inotify_support=no| ; \
s|-Werror|| ; \
s|#define HAVE_SYS_INOTIFY_H 1||' ${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's|-2.0.so.0.$$(LT_CURRENT).$$(LT_REVISION)-gdb.py|-2.0.so.0-gdb.py|g' \
- ${WRKSRC}/glib/Makefile.in \
- ${WRKSRC}/gobject/Makefile.in
post-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/share/GConf/gsettings
- @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so.${LIBVERSION}
.include <bsd.port.post.mk>
View
10 devel/glib20/files/patch-gobject_gtype.h
@@ -0,0 +1,10 @@
+--- gobject/gtype.h.orig 2014-03-08 01:02:56.790527382 +0000
++++ gobject/gtype.h 2014-03-08 01:03:33.934524502 +0000
+@@ -1674,6 +1674,7 @@
+ \
+ _G_DEFINE_TYPE_EXTENDED_CLASS_INIT(TypeName, type_name) \
+ \
++G_GNUC_UNUSED \
+ static inline gpointer \
+ type_name##_get_instance_private (TypeName *self) \
+ { \
View
4 lang/vala/distinfo
@@ -1,2 +1,2 @@
-SHA256 (vala-0.20.1.tar.xz) = 9cb7ecd18a23525e401c204d4d08341c7d911cd5d78078eee10b747ecb45e481
-SIZE (vala-0.20.1.tar.xz) = 2627808
+SHA256 (vala-0.22.1.tar.xz) = 92c61b94a427f281ba2537b69135a3be23248b153268057d7195003dd6aba28c
+SIZE (vala-0.22.1.tar.xz) = 2690324
View
2 lang/vala/pkg-plist
@@ -62,6 +62,8 @@ share/devhelp/books/vala-%%VERSION%%/vala-%%VERSION%%.devhelp2
%%DATADIR%%-%%VERSION%%/vapi/enchant.vapi
%%DATADIR%%-%%VERSION%%/vapi/fuse.deps
%%DATADIR%%-%%VERSION%%/vapi/fuse.vapi
+%%DATADIR%%-%%VERSION%%/vapi/geocode-glib-1.0.deps
+%%DATADIR%%-%%VERSION%%/vapi/geocode-glib-1.0.vapi
%%DATADIR%%-%%VERSION%%/vapi/gconf-2.0.vapi
%%DATADIR%%-%%VERSION%%/vapi/gdk-2.0.deps
%%DATADIR%%-%%VERSION%%/vapi/gdk-2.0.vapi
View
10 sysutils/accountsservice/Makefile
@@ -1,10 +1,9 @@
# Created by: Koop Mast <kwm@FreeBSD.org>
# $FreeBSD$
-# $MCom: ports/trunk/sysutils/accountsservice/Makefile 18965 2013-12-20 11:02:42Z kwm $
+# $MCom: ports/trunk/sysutils/accountsservice/Makefile 19139 2014-03-15 14:48:11Z kwm $
PORTNAME= accountsservice
-PORTVERSION= 0.6.24
-PORTREVISION= 3
+PORTVERSION= 0.6.35
CATEGORIES= sysutils devel
MASTER_SITES= http://www.freedesktop.org/software/${PORTNAME}/
@@ -14,12 +13,11 @@ COMMENT= D-Bus interface for user account query and manipulation
LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit
-USE_XZ= yes
USE_GNOME= glib20 gnomehier intlhack introspection:build libxslt
-USES= gettext gmake pathfix pkgconfig
+USES= gettext gmake libtool pathfix pkgconfig tar:xz
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-CONFIGURE_ARGS= --disable-systemd --localstatedir=/var/ --disable-vala
+CONFIGURE_ARGS= --disable-systemd --localstatedir=/var/
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
View
4 sysutils/accountsservice/distinfo
@@ -1,2 +1,2 @@
-SHA256 (accountsservice-0.6.24.tar.xz) = f2c0886c5d6d80453eebd4a91e6081231cde6cc436d55b9425d2cc0332a85623
-SIZE (accountsservice-0.6.24.tar.xz) = 332928
+SHA256 (accountsservice-0.6.35.tar.xz) = 65a1c7013c9c6785c7feb710ee940bb297207dabdb93561fdfdd140e0dfd3038
+SIZE (accountsservice-0.6.35.tar.xz) = 360824
View
21 sysutils/accountsservice/files/patch-configure
@@ -0,0 +1,21 @@
+--- configure.orig 2014-03-15 15:02:28.000000000 +0100
++++ configure 2014-03-15 15:03:01.000000000 +0100
+@@ -14527,6 +14527,18 @@
+ done
+
+
++for ac_func in fgetpwent
++do :
++ ac_fn_c_check_func "$LINENO" "fgetpwent" "ac_cv_func_fgetpwent"
++if test "x$ac_cv_func_fgetpwent" = xyes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_FGETPWENT 1
++_ACEOF
++
++fi
++done
++
++
+
+
+
View
13 sysutils/accountsservice/files/patch-src_Makefile.in
@@ -0,0 +1,13 @@
+--- src/Makefile.in.orig 2014-03-15 15:02:34.000000000 +0100
++++ src/Makefile.in 2014-03-15 15:03:04.000000000 +0100
+@@ -435,6 +435,10 @@
+ libaccounts-generated.la \
+ $(POLKIT_LIBS)
+
++EXTRA_DIST = \
++ fgetpwent.c \
++ $(NULL)
++
+ CLEANFILES = \
+ $(BUILT_SOURCES) \
+ *.gcda \
View
107 sysutils/accountsservice/files/patch-src_daemon.c
@@ -1,34 +1,58 @@
---- src/daemon.c.orig 2012-08-16 19:03:51.000000000 +0000
-+++ src/daemon.c 2012-10-08 19:05:09.000000000 +0000
-@@ -68,6 +68,7 @@
- "nobody4",
- "noaccess",
- "postgres",
-+ "pgsql",
- "pvm",
- "rpm",
- "nfsnobody",
-@@ -77,6 +78,7 @@
- "games",
- "man",
- "at",
-+ "saned",
- NULL
- };
+--- src/daemon.c.orig 2013-10-15 22:25:19.000000000 +0200
++++ src/daemon.c 2014-03-15 15:33:49.000000000 +0100
+@@ -50,9 +50,8 @@
+ #define PATH_PASSWD "/etc/passwd"
+ #define PATH_SHADOW "/etc/shadow"
+ #define PATH_GROUP "/etc/group"
+-#define PATH_GDM_CUSTOM "/etc/gdm/custom.conf"
++#define PATH_GDM_CUSTOM "/usr/local/etc/gdm/custom.conf"
+ #ifdef HAVE_UTMPX_H
+-#define PATH_WTMP _PATH_WTMPX
+ #endif
-@@ -304,7 +306,11 @@
+ enum {
+@@ -73,7 +72,7 @@
+ GFileMonitor *group_monitor;
+ GFileMonitor *gdm_monitor;
+ #ifdef HAVE_UTMPX_H
+- GFileMonitor *wtmp_monitor;
++// GFileMonitor *wtmp_monitor;
+ #endif
- /* Every iteration */
- fp = *state;
-+#ifdef HAVE_FGETPWENT
- pwent = fgetpwent (fp);
-+#else
-+ pwent = getpwent ();
+ guint reload_id;
+@@ -162,6 +161,10 @@
+ g_free (previous_login);
+ }
+
++#ifndef HAVE_FGETPWENT
++#include "fgetpwent.c"
+#endif
- if (pwent != NULL) {
- return pwent;
- }
-@@ -1030,20 +1036,18 @@
++
+ static struct passwd *
+ entry_generator_wtmp (GHashTable *users,
+ gpointer *state)
+@@ -183,7 +186,7 @@
+ return NULL;
+ }
+ #else
+- utmpxname (PATH_WTMP);
++// utmpxname (PATH_WTMP);
+ setutxent ();
+ #endif
+ *state = g_new (WTmpGeneratorState, 1);
+@@ -697,11 +700,6 @@
+ PATH_GROUP,
+ on_users_monitor_changed);
+
+-#ifdef HAVE_UTMPX_H
+- daemon->priv->wtmp_monitor = setup_monitor (daemon,
+- PATH_WTMP,
+- on_users_monitor_changed);
+-#endif
+
+ daemon->priv->gdm_monitor = setup_monitor (daemon,
+ PATH_GDM_CUSTOM,
+@@ -1061,20 +1059,18 @@
sys_log (context, "create user '%s'", cd->user_name);
@@ -44,11 +68,11 @@
+ argv[5] = cd->real_name;
if (cd->account_type == ACCOUNT_TYPE_ADMINISTRATOR) {
- argv[4] = "-G";
-- argv[5] = "wheel";
+- argv[5] = ADMIN_GROUP;
- argv[6] = "--";
- argv[7] = cd->user_name;
+ argv[6] = "-G";
-+ argv[7] = "wheel";
++ argv[7] = ADMIN_GROUP;
argv[8] = NULL;
}
else if (cd->account_type == ACCOUNT_TYPE_STANDARD) {
@@ -57,26 +81,3 @@
argv[6] = NULL;
}
else {
-@@ -1250,16 +1254,15 @@
- g_remove (filename);
- g_free (filename);
-
-- argv[0] = "/usr/sbin/userdel";
-+ argv[0] = "/usr/sbin/pw";
- if (ud->remove_files) {
-- argv[1] = "-f";
-- argv[2] = "-r";
-- argv[3] = "--";
-- argv[4] = pwent->pw_name;
-- argv[5] = NULL;
-+ argv[1] = "userdel";
-+ argv[2] = pwent->pw_name;
-+ argv[3] = "-r";
-+ argv[4] = NULL;
- }
- else {
-- argv[1] = "--";
-+ argv[1] = "userdel";
- argv[2] = pwent->pw_name;
- argv[3] = NULL;
- }
View
111 sysutils/accountsservice/files/patch-src_fgetpwent.c
@@ -0,0 +1,111 @@
+--- src/fgetpwent.c.orig 2014-03-15 15:05:11.000000000 +0100
++++ src/fgetpwent.c 2014-03-15 15:02:41.000000000 +0100
+@@ -0,0 +1,108 @@
++/*
++ * Copyright (C) 2013 Canonical Limited
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 3 of the licence, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
++ *
++ * Authors: Ryan Lortie <desrt@desrt.ca>
++ */
++
++static gchar *
++fgetpwent_getline (FILE *fp)
++{
++ static GString str;
++
++ /* We could be "more clever" here and avoid the strlen() but this is a
++ * clear case of dumb is better.
++ */
++ str.len = 0;
++ while (!str.len || str.str[str.len - 1] != '\n')
++ {
++ if (str.allocated_len < str.len + 32)
++ {
++ str.allocated_len = str.len + 32;
++ str.str = g_realloc (str.str, str.allocated_len);
++ }
++
++ if (fgets (str.str + str.len, str.allocated_len - str.len, fp) == NULL)
++ return NULL;
++
++ str.len = strlen (str.str + str.len) + str.len;
++ }
++
++ /* chomp the '\n' */
++ str.str[str.len - 1] = '\0';
++
++ return str.str;
++}
++
++static struct passwd *
++fgetpwent (FILE *fp)
++{
++ static struct passwd pw;
++ guint64 intval;
++ gchar *line;
++
++ /* In case of failure, we ignore the line and start again */
++again:
++ line = fgetpwent_getline (fp);
++ if (!line)
++ return NULL;
++
++ while (g_ascii_isspace (*line))
++ line++;
++
++ /* comments, empty lines */
++ if (line[0] == '#' || line[0] == '\0')
++ goto again;
++
++ /* username */
++ pw.pw_name = line;
++ if (!(line = strchr (line, ':')))
++ goto again;
++ *line++ = '\0';
++
++ /* password */
++ pw.pw_passwd = line;
++ if (!(line = strchr (line, ':')))
++ goto again;
++ *line++ = '\0';
++
++ /* uid */
++ pw.pw_uid = intval = g_ascii_strtoull (line, &line, 10);
++ if (pw.pw_uid != intval || *line++ != ':')
++ goto again;
++
++ /* gid */
++ pw.pw_gid = intval = g_ascii_strtoull (line, &line, 10);
++ if (pw.pw_gid != intval || *line++ != ':')
++ goto again;
++
++ /* gecos */
++ pw.pw_gecos = line;
++ if (!(line = strchr (line, ':')))
++ goto again;
++ *line++ = '\0';
++
++ /* home directory */
++ pw.pw_dir = line;
++ if (!(line = strchr (line, ':')))
++ goto again;
++ *line++ = '\0';
++
++ /* shell */
++ pw.pw_shell = line;
++
++ return &pw;
++}
View
18 sysutils/accountsservice/files/patch-src_user-classify.c
@@ -0,0 +1,18 @@
+--- src/user-classify.c.orig 2014-03-15 15:09:59.000000000 +0100
++++ src/user-classify.c 2014-03-15 15:11:06.000000000 +0100
+@@ -44,6 +44,7 @@
+ "nobody4",
+ "noaccess",
+ "postgres",
++ "pgsql",
+ "pvm",
+ "rpm",
+ "nfsnobody",
+@@ -53,6 +54,7 @@
+ "games",
+ "man",
+ "at",
++ "saned",
+ "gdm",
+ "gnome-initial-setup"
+ };
View
42 sysutils/accountsservice/files/patch-src_user.c
@@ -1,6 +1,6 @@
---- src/user.c.orig 2012-08-16 19:03:51.000000000 +0000
-+++ src/user.c 2012-10-08 19:13:02.000000000 +0000
-@@ -546,11 +546,11 @@
+--- src/user.c.orig 2014-03-15 15:16:49.000000000 +0100
++++ src/user.c 2014-03-15 15:31:57.000000000 +0100
+@@ -873,11 +873,11 @@
"change real name of user '%s' (%d) to '%s'",
user->user_name, user->uid, name);
@@ -17,7 +17,7 @@
argv[5] = NULL;
error = NULL;
-@@ -620,11 +620,11 @@
+@@ -947,11 +947,11 @@
"change name of user '%s' (%d) to '%s'",
old_name, user->uid, name);
@@ -34,7 +34,27 @@
argv[5] = NULL;
error = NULL;
-@@ -964,11 +964,11 @@
+@@ -1229,13 +1229,12 @@
+ "change home directory of user '%s' (%d) to '%s'",
+ user->user_name, user->uid, home_dir);
+
+- argv[0] = "/usr/sbin/usermod";
+- argv[1] = "-m";
+- argv[2] = "-d";
+- argv[3] = home_dir;
+- argv[4] = "--";
+- argv[5] = user->user_name;
+- argv[6] = NULL;
++ argv[0] = "/usr/sbin/pw";
++ argv[1] = "-d";
++ argv[2] = home_dir;
++ argv[3] = "-n";
++ argv[4] = user->user_name;
++ argv[5] = NULL;
+
+ error = NULL;
+ if (!spawn_with_login_uid (context, argv, &error)) {
+@@ -1291,11 +1290,11 @@
"change shell of user '%s' (%d) to '%s'",
user->user_name, user->uid, shell);
@@ -51,7 +71,7 @@
argv[5] = NULL;
error = NULL;
-@@ -1224,11 +1224,10 @@
+@@ -1551,11 +1550,10 @@
sys_log (context,
"%s account of user '%s' (%d)",
locked ? "locking" : "unlocking", user->user_name, user->uid);
@@ -67,7 +87,7 @@
error = NULL;
if (!spawn_with_login_uid (context, argv, &error)) {
-@@ -1315,11 +1314,11 @@
+@@ -1664,11 +1662,11 @@
g_free (groups);
@@ -84,7 +104,7 @@
argv[5] = NULL;
g_string_free (str, FALSE);
-@@ -1386,10 +1385,8 @@
+@@ -1735,10 +1733,8 @@
mode == PASSWORD_MODE_NONE) {
argv[0] = "/usr/bin/passwd";
@@ -97,7 +117,7 @@
error = NULL;
if (!spawn_with_login_uid (context, argv, &error)) {
-@@ -1399,12 +1396,11 @@
+@@ -1748,12 +1744,11 @@
}
if (mode == PASSWORD_MODE_SET_AT_LOGIN) {
@@ -114,7 +134,7 @@
error = NULL;
if (!spawn_with_login_uid (context, argv, &error)) {
-@@ -1428,11 +1424,10 @@
+@@ -1777,11 +1772,10 @@
}
}
else if (user->locked) {
@@ -130,7 +150,7 @@
error = NULL;
if (!spawn_with_login_uid (context, argv, &error)) {
-@@ -1503,12 +1498,11 @@
+@@ -1852,12 +1846,11 @@
g_object_freeze_notify (G_OBJECT (user));
View
21 sysutils/accountsservice/pkg-plist
@@ -8,12 +8,26 @@ lib/libaccountsservice.a
lib/libaccountsservice.la
lib/libaccountsservice.so
lib/libaccountsservice.so.0
+lib/libaccountsservice.so.0.0.0
libdata/pkgconfig/accountsservice.pc
libexec/accounts-daemon
share/dbus-1/interfaces/org.freedesktop.Accounts.User.xml
share/dbus-1/interfaces/org.freedesktop.Accounts.xml
share/dbus-1/system-services/org.freedesktop.Accounts.service
share/gir-1.0/AccountsService-1.0.gir
+share/gtk-doc/html/libaccountsservice/ActUser.html
+share/gtk-doc/html/libaccountsservice/ActUserManager.html
+share/gtk-doc/html/libaccountsservice/annotation-glossary.html
+share/gtk-doc/html/libaccountsservice/api-index-full.html
+share/gtk-doc/html/libaccountsservice/ch01.html
+share/gtk-doc/html/libaccountsservice/home.png
+share/gtk-doc/html/libaccountsservice/index.html
+share/gtk-doc/html/libaccountsservice/index.sgml
+share/gtk-doc/html/libaccountsservice/left.png
+share/gtk-doc/html/libaccountsservice/libaccountsservice.devhelp2
+share/gtk-doc/html/libaccountsservice/right.png
+share/gtk-doc/html/libaccountsservice/style.css
+share/gtk-doc/html/libaccountsservice/up.png
share/locale/ar/LC_MESSAGES/accounts-service.mo
share/locale/bg_BG/LC_MESSAGES/accounts-service.mo
share/locale/bn_IN/LC_MESSAGES/accounts-service.mo
@@ -34,9 +48,11 @@ share/locale/gl/LC_MESSAGES/accounts-service.mo
share/locale/he/LC_MESSAGES/accounts-service.mo
share/locale/hi/LC_MESSAGES/accounts-service.mo
share/locale/hu/LC_MESSAGES/accounts-service.mo
+share/locale/ia/LC_MESSAGES/accounts-service.mo
share/locale/id/LC_MESSAGES/accounts-service.mo
share/locale/it/LC_MESSAGES/accounts-service.mo
share/locale/ja/LC_MESSAGES/accounts-service.mo
+share/locale/ka/LC_MESSAGES/accounts-service.mo
share/locale/kk/LC_MESSAGES/accounts-service.mo
share/locale/ko/LC_MESSAGES/accounts-service.mo
share/locale/lt/LC_MESSAGES/accounts-service.mo
@@ -66,12 +82,17 @@ share/polkit-1/actions/org.freedesktop.accounts.policy
@dirrmtry share/locale/sr@latin
@dirrmtry share/locale/kk/LC_MESSAGES
@dirrmtry share/locale/kk
+@dirrmtry share/locale/ia/LC_MESSAGES
+@dirrmtry share/locale/ia
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
@dirrmtry share/locale/ca@valencia
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/bg_BG/LC_MESSAGES
@dirrmtry share/locale/bg_BG
+@dirrmtry share/gtk-doc/html/libaccountsservice
+@dirrmtry share/gtk-doc/html
+@dirrmtry share/gtk-doc
@dirrm include/accountsservice-1.0/act
@dirrm include/accountsservice-1.0
@cwd /
View
6 www/webkit-gtk3/Makefile
@@ -1,6 +1,6 @@
# Created by: Michael Johnson <ahze@FreeBSD.org>
# $FreeBSD$
-# $MCom: ports/trunk/www/webkit-gtk3/Makefile 19011 2014-03-06 11:32:09Z gusi $
+# $MCom: ports/trunk/www/webkit-gtk3/Makefile 19191 2014-03-18 17:34:38Z kwm $
PORTNAME= webkit
PORTVERSION= 2.0.3
@@ -118,7 +118,7 @@ PLIST_SUB+= WEBKIT2=""
CXXFLAGS+= -stdlib=libc++
LDFLAGS+= -stdlib=libc++
. if ${OSVERSION}<1000019
-BUILD_DEPENDS+= clang>=3.3_1:${PORTSDIR}/lang/clang33 \
+BUILD_DEPENDS+= clang33>=3.3_1:${PORTSDIR}/lang/clang33 \
libc++>=0:${PORTSDIR}/devel/libc++
RUN_DEPENDS+= libc++>=0:${PORTSDIR}/devel/libc++
CC= clang33
@@ -129,7 +129,7 @@ CONFIGURE_ENV+= CC=${CC} CXX=${CXX} CPP=${CPP}
.else
# we need clang also for !Webkit2 builds
. if ${OSVERSION}<1000019
-BUILD_DEPENDS+= clang>=3.3_1:${PORTSDIR}/lang/clang33
+BUILD_DEPENDS+= clang33>=3.3_1:${PORTSDIR}/lang/clang33
CC= clang33
CXX= clang++33
CPP= clang-cpp33
View
15 x11-fm/nemo/files/patch-src_nemo-notebook.c
@@ -0,0 +1,15 @@
+--- src/nemo-notebook.c.orig 2014-03-08 01:46:16.347348229 +0000
++++ src/nemo-notebook.c 2014-03-08 01:56:25.092307128 +0000
+@@ -51,12 +51,6 @@
+ static void nemo_notebook_remove (GtkContainer *container,
+ GtkWidget *tab_widget);
+
+-static const GtkTargetEntry url_drag_types[] =
+-{
+- { NEMO_ICON_DND_GNOME_ICON_LIST_TYPE, 0, NEMO_ICON_DND_GNOME_ICON_LIST },
+- { NEMO_ICON_DND_URI_LIST_TYPE, 0, NEMO_ICON_DND_URI_LIST },
+-};
+-
+ enum
+ {
+ TAB_CLOSE_REQUEST,
View
6 x11-toolkits/pango/Makefile
@@ -1,6 +1,6 @@
# Created by: Maxim Sobolev <sobomax@FreeBSD.org>
# $FreeBSD$
-# $MCom: ports/trunk/x11-toolkits/pango/Makefile 19012 2014-03-08 07:21:34Z kwm $
+# $MCom: ports/trunk/x11-toolkits/pango/Makefile 19132 2014-03-15 13:17:22Z kwm $
PORTNAME= pango
PORTVERSION= 1.36.1
@@ -12,7 +12,7 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Open-source framework for the layout and rendering of i18n text
-USE_XZ= yes
+USES= tar:xz
.if !defined(REFERENCE_PORT)
@@ -24,7 +24,7 @@ LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \
RUN_DEPENDS= ${FONTSCALE}:${PORTSDIR}/x11-fonts/xorg-fonts-truetype \
${FONTENCOD}:${PORTSDIR}/x11-fonts/encodings
-USES= gettext gmake libtool pathfix pkgconfig
+USES+= gettext gmake libtool pathfix pkgconfig
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
USE_GNOME= cairo glib20 introspection:build referencehack
View
5 x11-toolkits/pango/pkg-plist
@@ -1,4 +1,3 @@
-@unexec /bin/rm %D/etc/pango/pango.modules
bin/pango-querymodules
bin/pango-view
include/pango-1.0/pango/pango-attributes.h
@@ -137,10 +136,10 @@ share/gtk-doc/html/pango/up.png
@dirrm share/gtk-doc/html/pango
@dirrmtry share/gtk-doc/html
@dirrmtry share/gtk-doc
+@unexec /bin/rm %D/lib/pango/%%VERSION%%/modules.cache
@dirrm lib/pango/%%VERSION%%/modules
@dirrm lib/pango/%%VERSION%%
@dirrm lib/pango
@dirrm include/pango-1.0/pango
@dirrm include/pango-1.0
-@dirrm etc/pango
-@exec %%LOCALBASE%%/bin/pango-querymodules > %D/etc/pango/pango.modules
+@exec %%LOCALBASE%%/bin/pango-querymodules --update-cache

0 comments on commit 2ae29a3

Please sign in to comment.