Index: head/net-mgmt/wmi-client/Makefile
===================================================================
--- head/net-mgmt/wmi-client/Makefile	(revision 385232)
+++ head/net-mgmt/wmi-client/Makefile	(revision 385233)
@@ -1,50 +1,46 @@
 # Created by: KIKUCHI Koichiro <koichiro@rworks.jp>
 # $FreeBSD$
 
 PORTNAME=	wmi
 PORTVERSION=	1.3.16
 PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://dev.zenoss.org/trac/export/26435/trunk/inst/externallibs/ \
 		http://www.openvas.org/download/wmi/ \
 		http://mirrors.rit.edu/zi/
 PKGNAMESUFFIX=	-client
 
 MAINTAINER=	koichiro@rworks.jp
 COMMENT=	DCOM/WMI client implementation
 
 OPTIONS_DEFINE=	PYTHON
 PYTHON_DESC=	Build Python bindings
 
 USE_AUTOTOOLS=	autoconf:env autoheader:env
 USES=		iconv gmake tar:bzip2
 
 MAKEFILE=	GNUmakefile
-MAKE_ARGS+=	ZENHOME="${PREFIX}"
+MAKE_ARGS+=	ZENHOME="${PREFIX}" INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
+		INSTALL_LIB="${INSTALL_LIB}"
 ALL_TARGET=	build
 
 PROGS=	bin/wmic bin/winexe
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPYTHON}
 USES+=		python
 MAKE_ARGS+=	PYTHON="${PYTHON_CMD}" PY_LIBDIR="${PYTHONPREFIX_SITELIBDIR}"
 PLIST_SUB+=	PYTHON=""
 .else
 PLIST_SUB+=	PYTHON="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MPYTHON}
-post-install:
-.for x in ${PROGS:S,^,${PREFIX}/,} ${PYTHONPREFIX_SITELIBDIR}/libasync_wmi_lib.so.0.0.2
-	@${STRIP_CMD} ${STAGEDIR}${x}
-.endfor
-.else
+.if !${PORT_OPTIONS:MPYTHON}
 do-install:
 .for x in ${PROGS}
 	@${INSTALL_PROGRAM} ${WRKSRC}/Samba/source/${x} ${STAGEDIR}${PREFIX}/${x}
 .endfor
 .endif
 
 .include <bsd.port.mk>
Index: head/net-mgmt/wmi-client/files/patch-GNUmakefile
===================================================================
--- head/net-mgmt/wmi-client/files/patch-GNUmakefile	(revision 385232)
+++ head/net-mgmt/wmi-client/files/patch-GNUmakefile	(revision 385233)
@@ -1,45 +1,63 @@
---- GNUmakefile.orig	2011-12-23 22:58:36.000000000 +0900
-+++ GNUmakefile	2014-08-21 13:05:52.000000000 +0900
-@@ -36,7 +36,7 @@
+--- GNUmakefile.orig	2011-12-23 13:58:36 UTC
++++ GNUmakefile
+@@ -36,7 +36,7 @@ endif
  # Install dir for libasync_wmi_lib.so.* and pysamba wrapper code.
  # e.g., Samba/source/bin/shared/libasync_wmi_lib.so.0.0.1 --> $(PY_LIBDIR)
  #
 -PY_LIBDIR     = $(ZENHOME)/lib/python
 +PY_LIBDIR?    = $(ZENHOME)/lib/python
  
  #-------------------------------------------------------------------------#
  # A key deliverable of this build process is the libasync_wmi shared      #
-@@ -70,7 +70,7 @@
+@@ -70,7 +70,7 @@ PATHED_LIBASYNC_WMI_LIB     := $(SAMBA_S
  #-------------------------------------------------------------------------#
  # Comment out the next line to disable google-breakpad dependency.
  ifneq ($(shell uname), Darwin)
 -USE_BREAKPAD = 1
 +#USE_BREAKPAD = 1
  endif
  
  ifneq ($(USE_BREAKPAD),)
-@@ -124,7 +124,7 @@
+@@ -124,7 +124,7 @@ ifneq ($(USE_BREAKPAD),)
  endif
  	@touch $@
  
 -install-prereqs:
 +install-prereqs: $(DESTDIR)$(PY_LIBDIR)
  	@echo
  	@echo "Checking prequisites for installing WMI"
  	$(call check,directory,$(ZENHOME),"ZENHOME")
-@@ -157,12 +157,12 @@
+@@ -158,27 +158,27 @@ endif
  $(SAMBA_SRCDIR)/Makefile: $(SAMBA_SRCDIR)/autogen.sh
  	cd $(SAMBA_SRCDIR) ;\
  	./autogen.sh ;\
 -	CPPFLAGS="$(WMI_CPPFLAGS)" ./configure --without-readline --enable-debug
 +	CPPFLAGS="$(WMI_CPPFLAGS)" SMB_GNUTLS=NO ./configure --prefix=$(PREFIX) --without-readline
  
  ifeq ($(USE_BREAKPAD),)
 -pywmi-build: build-prereqs $(LIBRPC_CONFIG_MK) $(SAMBA_SRCDIR)/Makefile
 +pywmi-build: $(LIBRPC_CONFIG_MK) $(SAMBA_SRCDIR)/Makefile
  else
 -pywmi-build: build-prereqs $(LIBRPC_CONFIG_MK) $(SAMBA_SRCDIR)/Makefile $(breakpad_LIB_SYMLINK)
 +pywmi-build: $(LIBRPC_CONFIG_MK) $(SAMBA_SRCDIR)/Makefile $(breakpad_LIB_SYMLINK)
  endif
  	cd $(SAMBA_SRCDIR);\
  	$(MAKE) $(WMI_BUILD_TARGETS) ;\
+ 	touch $@
+ 
+ pywmi-installed: install-prereqs $(DESTDIR)$(PY_LIBDIR) $(DESTDIR)$(ZENOSS_BINDIR) $(SAMBA_SRCDIR)/bin/wmic $(SAMBA_SRCDIR)/bin/winexe $(PATHED_LIBASYNC_WMI_LIB)
+-	cp $(SAMBA_SRCDIR)/bin/wmic   $(DESTDIR)$(ZENOSS_BINDIR)
+-	cp $(SAMBA_SRCDIR)/bin/winexe $(DESTDIR)$(ZENOSS_BINDIR)
++	$(INSTALL_PROGRAM) $(SAMBA_SRCDIR)/bin/wmic   $(DESTDIR)$(ZENOSS_BINDIR)
++	$(INSTALL_PROGRAM) $(SAMBA_SRCDIR)/bin/winexe $(DESTDIR)$(ZENOSS_BINDIR)
+ ifeq ($(shell uname), Darwin)
+ 	-(cd $(DESTDIR)$(PY_LIBDIR) && rm -f $(LIBASYNC_WMI_LIB_BASENAME)*)
+ 	cp $(PATHED_LIBASYNC_WMI_LIB) $(DESTDIR)$(PY_LIBDIR)/$(LIBASYNC_WMI_LIB_BASENAME).$(LIBASYNC_WMI_LIB_VERSION_nnn).dylib
+ 	(cd $(DESTDIR)$(PY_LIBDIR) && ln -sf $(LIBASYNC_WMI_LIB_BASENAME).$(LIBASYNC_WMI_LIB_VERSION_nnn).dylib $(LIBASYNC_WMI_LIB_BASENAME).dylib)
+ else
+ 	-(cd $(DESTDIR)$(PY_LIBDIR) && rm -f $(LIBASYNC_WMI_LIB_BASENAME)*)
+-	cp $(PATHED_LIBASYNC_WMI_LIB) $(DESTDIR)$(PY_LIBDIR)
++	$(INSTALL_LIB) $(PATHED_LIBASYNC_WMI_LIB) $(DESTDIR)$(PY_LIBDIR)
+ 	(cd $(DESTDIR)$(PY_LIBDIR) && ln -sf $(LIBASYNC_WMI_LIB) $(LIBASYNC_WMI_LIB_SO_N))
+ endif
+ 	rm -rf $(DESTDIR)$(PY_LIBDIR)/pysamba