minor fixes

6 files changed, 17 insertions, 25 deletions

diff --git a/package/neon/Makefile b/package/neon/Makefile
index 39f77a483..46c716770 100644
--- a/package/neon/Makefile
+++ b/package/neon/Makefile
@@ -32,10 +32,10 @@ neon-install:
 	$(CP) ${WRKINST}/usr/lib/libneon.so* ${IDIR_NEON}/usr/lib
 
 neon-dev-install:
-	${INSTALL_DIR} ${IDIR_NEON_DEV}/usr/lib/pkgconfig
 	${INSTALL_DIR} ${IDIR_NEON_DEV}/usr/include/neon
 	${INSTALL_DATA} ${WRKINST}/usr/include/neon/*.h \
 		${IDIR_NEON_DEV}/usr/include/neon
+	${INSTALL_DIR} ${IDIR_NEON_DEV}/usr/lib/pkgconfig
 	${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/neon.pc \
 		${IDIR_NEON_DEV}/usr/lib/pkgconfig
 
diff --git a/package/netcat/Makefile b/package/netcat/Makefile
index e8d344ad9..3171cbc41 100644
--- a/package/netcat/Makefile
+++ b/package/netcat/Makefile
@@ -21,5 +21,4 @@ post-install:
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/netcat \
 		$(IDIR_NETCAT)/usr/bin
 
-# please remove ALL above comments, before commiting
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/owfs/Makefile b/package/owfs/Makefile
index 567d355a8..c2a4d9326 100644
--- a/package/owfs/Makefile
+++ b/package/owfs/Makefile
@@ -17,7 +17,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,OWFS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TARGET_CFLAGS+=		-ldl -lrt
+TARGET_CFLAGS+=		-ldl -lrt -liconv
 CONFIGURE_ARGS+=	--enable-owfs \
 			--enable-usb \
 			--disable-swig \
diff --git a/package/rdesktop/Makefile b/package/rdesktop/Makefile
index 61a471e3b..410f73754 100644
--- a/package/rdesktop/Makefile
+++ b/package/rdesktop/Makefile
@@ -9,6 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		c6fcbed7f0ad7e60ac5fcb2d324d8b16
 PKG_DESCR:=		client for Windows Terminal Services
 PKG_SECTION:=		net
+PKG_BUILDDEP:=		libiconv openssl
 PKG_URL:=		http://www.rdesktop.org/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=rdesktop/}
 
@@ -16,6 +17,8 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,RDESKTOP,rdesktop,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIGURE_ARGS+=	--with-openssl="${STAGING_TARGET_DIR}/usr"
+
 post-install:
 	$(INSTALL_DIR) $(IDIR_RDESKTOP)/usr/bin
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/rdesktop \
diff --git a/package/subversion/Makefile b/package/subversion/Makefile
index 7d1cb3cb1..a9ac8a66c 100644
--- a/package/subversion/Makefile
+++ b/package/subversion/Makefile
@@ -18,17 +18,18 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,SUBVERSION,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_ARGS+=	--with-apr=${STAGING_TARGET_DIR}/usr/bin/apr-1-config
-CONFIGURE_ARGS+=	--with-apr-util=${STAGING_TARGET_DIR}/usr/bin/apr-1-config
-CONFIGURE_ARGS+=	--disable-mod-activation
-CONFIGURE_ARGS+=	--disable-keychain
-CONFIGURE_ARGS+=	--without-apxs
-CONFIGURE_ARGS+=	--without-swig
-CONFIGURE_ARGS+=	--disable-experimental-libtool
-CONFIGURE_ARGS+=	--without-jikes
-CONFIGURE_ARGS+=	--without-jdk
-CONFIGURE_ARGS+=	--disable-javahl
-CONFIGURE_ARGS+=	--without-berkeley-db
+CONFIGURE_ARGS+=	--with-apr=${STAGING_TARGET_DIR}/usr/bin/apr-1-config \
+			--with-apr-util=${STAGING_TARGET_DIR}/usr/bin/apr-1-config \
+			--with-neon=${STAGING_TARGET_DIR}/usr \
+			--disable-mod-activation \
+			--disable-keychain \
+			--without-apxs \
+			--without-swig \
+			--disable-experimental-libtool \
+			--without-jikes \
+			--without-jdk \
+			--disable-javahl \
+			--without-berkeley-db
 CONFIGURE_ENV+=		LIBS='-lsqlite3 -laprutil-1 -lapr-1 -lexpat -liconv'
 INSTALL_TARGET:=	external-install local-install
 
diff --git a/package/wdfs/patches/patch-configure b/package/wdfs/patches/patch-configure
deleted file mode 100644
index 45298cda5..000000000
--- a/package/wdfs/patches/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- wdfs-1.4.2.orig/configure	2007-04-17 22:43:31.000000000 +0200
-+++ wdfs-1.4.2/configure	2010-12-11 11:23:49.000000000 +0100
-@@ -4953,8 +4953,6 @@ else
- fi
- 
- 
--export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH
--
- 
- if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
- 	if test -n "$ac_tool_prefix"; then