5 files changed, 32 insertions, 13 deletions

diff --git a/net-im/hotot/Makefile b/net-im/hotot/Makefile
index da3c440c5817..be6f9e1404f1 100644
--- a/net-im/hotot/Makefile
+++ b/net-im/hotot/Makefile
@@ -22,6 +22,7 @@ USE_GNOME=	intltool
 INSTALLS_ICONS=	yes
 
 CFLAGS+=	-I${LOCALBASE}/include		# does not uphold CPPFLAGS
+LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 
 OPTIONS_DEFINE=	GTK2 QT4 KDE4
 OPTIONS_DEFAULT=	GTK2 QT4
diff --git a/net-im/imspector/files/patch-Makefile b/net-im/imspector/files/patch-Makefile
index 4a2e2b5f1e84..2a6dd7e0163f 100644
--- a/net-im/imspector/files/patch-Makefile
+++ b/net-im/imspector/files/patch-Makefile
@@ -8,7 +8,7 @@
  
  ##########
  # Comment this out if you dont want SSL
-@@ -7,11 +7,11 @@
+@@ -7,27 +7,27 @@
  
  ##########
  # Location of openssl installation
@@ -22,7 +22,12 @@
  
  # For any distro
  #ADD_PLUGINS = mysqlloggingplugin.so sqliteloggingplugin.so postgresqlloggingplugin.so dbfilterplugin.so dbresponderplugin.so
-@@ -23,11 +23,11 @@
+ ##########
+ 
+ ifdef SSL
+-SSL_LIBS = -L$(SSL_DIR)/lib -lssl
++SSL_LIBS = -L$(SSL_DIR)/lib -lssl -lcrypto
+ SSL_FLAGS = -I$(SSL_DIR)/include -DHAVE_SSL
  SSL_OBJS = sslstate.o
  endif
  
diff --git a/net-im/imspector/pkg-plist b/net-im/imspector/pkg-plist
index f05d5b0ef660..7a1bf7d14a83 100644
--- a/net-im/imspector/pkg-plist
+++ b/net-im/imspector/pkg-plist
@@ -1,12 +1,6 @@
-@unexec if cmp -s %D/%%ETCDIR%%/acl.txt.sample %D/%%ETCDIR%%/acl.txt; then rm -f %D/%%ETCDIR%%/acl.txt; fi
-%%ETCDIR%%/acl.txt.sample
-@exec if [ ! -f %D/%%ETCDIR%%/acl.txt ] ; then cp -p %D/%F %B/acl.txt; fi
-@unexec if cmp -s %D/%%ETCDIR%%/badwords.txt.sample %D/%%ETCDIR%%/badwords.txt; then rm -f %D/%%ETCDIR%%/badwords.txt; fi
-%%ETCDIR%%/badwords.txt.sample
-@exec if [ ! -f %D/%%ETCDIR%%/badwords.txt ] ; then cp -p %D/%F %B/badwords.txt; fi
-@unexec if cmp -s %D/%%ETCDIR%%/imspector.conf.sample %D/%%ETCDIR%%/imspector.conf; then rm -f %D/%%ETCDIR%%/imspector.conf; fi
-%%ETCDIR%%/imspector.conf.sample
-@exec if [ ! -f %D/%%ETCDIR%%/imspector.conf ] ; then cp -p %D/%F %B/imspector.conf; fi
+@sample %%ETCDIR%%/acl.txt.sample
+@sample %%ETCDIR%%/badwords.txt.sample
+@sample %%ETCDIR%%/imspector.conf.sample
 @exec /bin/mkdir -p /var/lib/imspector
 @exec /bin/mkdir -p /var/log/imspector
 lib/imspector/aclfilterplugin.so
diff --git a/net-im/vqcc-gtk/Makefile b/net-im/vqcc-gtk/Makefile
index c23544344cfa..ad044a44b7e9 100644
--- a/net-im/vqcc-gtk/Makefile
+++ b/net-im/vqcc-gtk/Makefile
@@ -14,9 +14,10 @@ LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification
 
 USES=		pathfix gmake gettext pkgconfig
 USE_GNOME=	gnomeprefix gtk20
+USE_XORG=	x11 xext xscrnsaver
 GNU_CONFIGURE=	yes
 
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lintl
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git a/net-im/zephyr/files/patch-zhm__Makefile.in b/net-im/zephyr/files/patch-zhm__Makefile.in
new file mode 100644
index 000000000000..45bc1f432d63
--- /dev/null
+++ b/net-im/zephyr/files/patch-zhm__Makefile.in
@@ -0,0 +1,18 @@
+--- zhm/Makefile.in.orig	2014-08-21 09:11:35 UTC
++++ zhm/Makefile.in
+@@ -27,13 +27,14 @@ CFLAGS=@CFLAGS@
+ ALL_CFLAGS=${CFLAGS} -I${top_srcdir}/h -I${BUILDTOP}/h ${CPPFLAGS}
+ LDFLAGS=@LDFLAGS@
+ HESIOD_LIBS=@HESIOD_LIBS@
++LIBS=${LIBZEPHYR} -lcom_err ${HESIOD_LIBS} @LIBS@
+ 
+ OBJS=	timer.o queue.o zhm.o zhm_client.o zhm_server.o
+ 
+ all: zhm
+ 
+ zhm: ${OBJS} ${LIBZEPHYR}
+-	${LIBTOOL} --mode=link ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBZEPHYR} ${HESIOD_LIBS}
++	${LIBTOOL} --mode=link ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
+ 
+ .c.o:
+ 	${CC} -c ${ALL_CFLAGS} $<