4 files changed, 11 insertions, 20 deletions
diff --git a/package/portmap/Config.in b/package/portmap/Config.in
deleted file mode 100644
index cc5169ce9..000000000
--- a/package/portmap/Config.in
+++ /dev/null
@@ -1,14 +0,0 @@
-config ADK_PACKAGE_PORTMAP
-	prompt "portmap........................... RPC Portmapper"
-	tristate
-	default n
-	help
-	  Portmap is a server that converts RPC (Remote Procedure Call) program
-	  numbers into DARPA protocol port numbers.  It must be running in order
-	  to make RPC calls.  Services that use RPC include NFS and NIS.
-
-config ADK_PACKAGE_PORTMAP_LIBWRAP
-	bool "Use tcp_wrappers"
-	default n
-	depends on ADK_PACKAGE_PORTMAP
-	select ADK_PACKAGE_LIBWRAP
diff --git a/package/portmap/Makefile b/package/portmap/Makefile
index d6ffd9404..229143a6e 100644
--- a/package/portmap/Makefile
+++ b/package/portmap/Makefile
@@ -9,6 +9,10 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		ac108ab68bf0f34477f8317791aaf1ff
 PKG_DESCR:=		RPC portmapper
 PKG_SECTION:=		net
+ifneq ($(strip ${ADK_PACKAGE_PORTMAP_LIBWRAP}),)
+PKG_DEPENDS:=		libwrap
+PKG_BUILDDEP+=		tcp_wrappers
+endif
 PKG_URL:=		http://neil.brown.name/portmap
 PKG_SITES:=		http://neil.brown.name/portmap/
 
@@ -17,12 +21,11 @@ WRKDIST=		${WRKDIR}/${PKG_NAME}_${PKG_VERSION}
 
 include ${TOPDIR}/mk/package.mk
 
-ifneq ($(strip ${ADK_PACKAGE_PORTMAP_LIBWRAP}),)
-PKG_DEPENDS:=		libwrap
-endif
-
 $(eval $(call PKG_template,PORTMAP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIG_STYLE:=          manual
+INSTALL_STYLE:=         manual
+
 ifneq ($(strip ${ADK_PACKAGE_PORTMAP_LIBWRAP}),)
 MAKE_FLAGS+=		WRAP_LIB='-L${STAGING_DIR}/usr/lib -lwrap'
 else
@@ -30,7 +33,6 @@ MAKE_FLAGS+=		NO_TCP_WRAPPER=1
 endif
 TCPPFLAGS+=		-DDAEMON_UID=20 -DDAEMON_GID=20
 TCFLAGS+=		-fPIC
-BUILD_STYLE:=		auto
 MAKE_FLAGS+=		${TARGET_CONFIGURE_OPTS} \
 			CFLAGS='${TCFLAGS}'
 
diff --git a/package/portmap/files/portmap.init b/package/portmap/files/portmap.init
index a42c2e2e0..ad0c2b075 100644
--- a/package/portmap/files/portmap.init
+++ b/package/portmap/files/portmap.init
@@ -15,7 +15,7 @@ start)
 	portmap -t /tmp/.portmap
 	;;
 stop)
-	kill $(pidof portmap|cut -d ' ' -f 3)
+	pkill portmap
 	;;
 restart)
 	sh $0 stop
diff --git a/package/portmap/files/portmap.postinst b/package/portmap/files/portmap.postinst
index 1017d2251..b8b30f45b 100644
--- a/package/portmap/files/portmap.postinst
+++ b/package/portmap/files/portmap.postinst
@@ -3,3 +3,6 @@
 add_rcconf portmap
 add_group portmap 20
 add_user portmap 20 20 /tmp/.portmap
+add_service sunrpc 111/tcp
+add_service sunrpc 111/udp
+