From 9a8fcc098461a852d8b91321dd1deccdd9c28607 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Mon, 14 Nov 2011 13:28:04 +0000 Subject: [PATCH] Don't try to link with -lcrypt. --- x11/gnome/controlcenter/Makefile | 4 ++-- .../patch-panels_user-accounts_Makefile_in | 15 ++++++++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/x11/gnome/controlcenter/Makefile b/x11/gnome/controlcenter/Makefile index 70317587677..3c08a5c02ab 100644 --- a/x11/gnome/controlcenter/Makefile +++ b/x11/gnome/controlcenter/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.54 2011/11/13 10:28:19 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.55 2011/11/14 13:28:04 ajacoutot Exp $ # XXX Binary files patch-panels_info_hostnames-test_txt and # patch-panels_info_hostnames-test_txt.new differ @@ -11,7 +11,7 @@ COMMENT= GNOME control center GNOME_PROJECT= gnome-control-center GNOME_VERSION= 3.2.2 -REVISION= 0 +REVISION= 1 SHARED_LIBS += gnome-control-center 0.0 # 1.0 diff --git a/x11/gnome/controlcenter/patches/patch-panels_user-accounts_Makefile_in b/x11/gnome/controlcenter/patches/patch-panels_user-accounts_Makefile_in index 23bd1a6cad9..2de51bf0951 100644 --- a/x11/gnome/controlcenter/patches/patch-panels_user-accounts_Makefile_in +++ b/x11/gnome/controlcenter/patches/patch-panels_user-accounts_Makefile_in @@ -1,6 +1,6 @@ -$OpenBSD: patch-panels_user-accounts_Makefile_in,v 1.2 2011/09/27 12:15:23 ajacoutot Exp $ ---- panels/user-accounts/Makefile.in.orig Mon Sep 19 22:26:46 2011 -+++ panels/user-accounts/Makefile.in Mon Sep 26 14:01:06 2011 +$OpenBSD: patch-panels_user-accounts_Makefile_in,v 1.3 2011/11/14 13:28:04 ajacoutot Exp $ +--- panels/user-accounts/Makefile.in.orig Tue Nov 8 21:24:27 2011 ++++ panels/user-accounts/Makefile.in Mon Nov 14 14:18:50 2011 @@ -381,7 +381,7 @@ ccpanelsdir = $(PANELS_DIR) ccpanels_LTLIBRARIES = libuser-accounts.la AM_CPPFLAGS = -DDATADIR=\""$(datadir)"\" \ @@ -10,3 +10,12 @@ $OpenBSD: patch-panels_user-accounts_Makefile_in,v 1.2 2011/09/27 12:15:23 ajaco -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ -DUM_PIXMAP_DIR=\""$(pkgdatadir)/pixmaps"\" \ -I$(srcdir)/../common/ \ +@@ -424,7 +424,7 @@ libuser_accounts_la_SOURCES = \ + um-user-module.c + + libuser_accounts_la_LIBADD = $(PANEL_LIBS) $(USER_ACCOUNTS_PANEL_LIBS) \ +- $(top_builddir)/panels/common/liblanguage.la -lcrypt -lm \ ++ $(top_builddir)/panels/common/liblanguage.la -lm \ + $(am__append_2) + libuser_accounts_la_LDFLAGS = $(PANEL_LDFLAGS) + EXTRA_DIST = \