Attachment #154873 for bug #198953

View | Details | Raw Unified | Return to bug 198953
Collapse All | Expand All




USES=		iconv gmake tar:bzip2

MAKEFILE=	GNUmakefile
MAKE_ARGS+=	ZENHOME="${PREFIX}" INSTALL_PROGRAM="${INSTALL_PROGRAM}" INSTALL_LIB="${INSTALL_LIB}"
ALL_TARGET=	build

PROGS=	bin/wmic bin/winexe

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
do-install:
.for x in ${PROGS}
	@${INSTALL_PROGRAM} ${WRKSRC}/Samba/source/${x} ${STAGEDIR}${PREFIX}/${x}




--- GNUmakefile.orig	2011-12-23 22:58:36.000000000 +0900
+++ GNUmakefile	2015-03-28 03:34:04.234178138 +0900
@@ -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)
 #

 
 #-------------------------------------------------------------------------#
 # A key deliverable of this build process is the libasync_wmi shared      #
@@ -70,7 +70,7 @@ PATHED_LIBASYNC_WMI_LIB     := $(SAMBA_S
 #-------------------------------------------------------------------------#
 # Comment out the next line to disable google-breakpad dependency.
 ifneq ($(shell uname), Darwin)

 endif
 
 ifneq ($(USE_BREAKPAD),)
@@ -124,7 +124,7 @@ ifneq ($(USE_BREAKPAD),)
 endif
 	@touch $@
 

 	@echo
 	@echo "Checking prequisites for installing WMI"
 	$(call check,directory,$(ZENHOME),"ZENHOME")
@@ -158,27 +158,27 @@ endif
 $(SAMBA_SRCDIR)/Makefile: $(SAMBA_SRCDIR)/autogen.sh
 	cd $(SAMBA_SRCDIR) ;\
 	./autogen.sh ;\

 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

Return to bug 198953

Lines 20-26 USE_AUTOTOOLS= autoconf:env autoheader:env Link Here

(-)b/net-mgmt/wmi-client/Makefile (-7 / +2 lines)
20	USES= iconv gmake tar:bzip2	20	USES= iconv gmake tar:bzip2
21		21
22	MAKEFILE= GNUmakefile	22	MAKEFILE= GNUmakefile
23	MAKE_ARGS+= ZENHOME="${PREFIX}"	23	MAKE_ARGS+= ZENHOME="${PREFIX}" INSTALL_PROGRAM="${INSTALL_PROGRAM}" INSTALL_LIB="${INSTALL_LIB}"
24	ALL_TARGET= build	24	ALL_TARGET= build
25		25
26	PROGS= bin/wmic bin/winexe	26	PROGS= bin/wmic bin/winexe
Lines 35-46 PLIST_SUB+= PYTHON="" Link Here
35	PLIST_SUB+= PYTHON="@comment "	35	PLIST_SUB+= PYTHON="@comment "
36	.endif	36	.endif
37		37
38	.if ${PORT_OPTIONS:MPYTHON}	38	.if !${PORT_OPTIONS:MPYTHON}
39	post-install:
40	.for x in ${PROGS:S,^,${PREFIX}/,} ${PYTHONPREFIX_SITELIBDIR}/libasync_wmi_lib.so.0.0.2
41	@${STRIP_CMD} ${STAGEDIR}${x}
42	.endfor
43	.else
44	do-install:	39	do-install:
45	.for x in ${PROGS}	40	.for x in ${PROGS}
46	@${INSTALL_PROGRAM} ${WRKSRC}/Samba/source/${x} ${STAGEDIR}${PREFIX}/${x}	41	@${INSTALL_PROGRAM} ${WRKSRC}/Samba/source/${x} ${STAGEDIR}${PREFIX}/${x}

Lines 1-6 Link Here

(-)b/net-mgmt/wmi-client/files/patch-GNUmakefile (-5 / +23 lines)
1	--- GNUmakefile.orig 2011-12-23 22:58:36.000000000 +0900	1	--- GNUmakefile.orig 2011-12-23 22:58:36.000000000 +0900
2	+++ GNUmakefile 2014-08-21 13:05:52.000000000 +0900	2	+++ GNUmakefile 2015-03-28 03:34:04.234178138 +0900
3	@@ -36,7 +36,7 @@	3	@@ -36,7 +36,7 @@ endif
4	# Install dir for libasync_wmi_lib.so.* and pysamba wrapper code.	4	# Install dir for libasync_wmi_lib.so.* and pysamba wrapper code.
5	# e.g., Samba/source/bin/shared/libasync_wmi_lib.so.0.0.1 --> $(PY_LIBDIR)	5	# e.g., Samba/source/bin/shared/libasync_wmi_lib.so.0.0.1 --> $(PY_LIBDIR)
6	#	6	#
Lines 9-15 Link Here
9		9
10	#-------------------------------------------------------------------------#	10	#-------------------------------------------------------------------------#
11	# A key deliverable of this build process is the libasync_wmi shared #	11	# A key deliverable of this build process is the libasync_wmi shared #
12	@@ -70,7 +70,7 @@	12	@@ -70,7 +70,7 @@ PATHED_LIBASYNC_WMI_LIB := $(SAMBA_S
13	#-------------------------------------------------------------------------#	13	#-------------------------------------------------------------------------#
14	# Comment out the next line to disable google-breakpad dependency.	14	# Comment out the next line to disable google-breakpad dependency.
15	ifneq ($(shell uname), Darwin)	15	ifneq ($(shell uname), Darwin)
Lines 18-24 Link Here
18	endif	18	endif
19		19
20	ifneq ($(USE_BREAKPAD),)	20	ifneq ($(USE_BREAKPAD),)
21	@@ -124,7 +124,7 @@	21	@@ -124,7 +124,7 @@ ifneq ($(USE_BREAKPAD),)
22	endif	22	endif
23	@touch $@	23	@touch $@
24		24
Lines 27-33 Link Here
27	@echo	27	@echo
28	@echo "Checking prequisites for installing WMI"	28	@echo "Checking prequisites for installing WMI"
29	$(call check,directory,$(ZENHOME),"ZENHOME")	29	$(call check,directory,$(ZENHOME),"ZENHOME")
30	@@ -157,12 +157,12 @@	30	@@ -158,27 +158,27 @@ endif
31	$(SAMBA_SRCDIR)/Makefile: $(SAMBA_SRCDIR)/autogen.sh	31	$(SAMBA_SRCDIR)/Makefile: $(SAMBA_SRCDIR)/autogen.sh
32	cd $(SAMBA_SRCDIR) ;\	32	cd $(SAMBA_SRCDIR) ;\
33	./autogen.sh ;\	33	./autogen.sh ;\
Lines 43-45 Link Here
43	endif	43	endif
44	cd $(SAMBA_SRCDIR);\	44	cd $(SAMBA_SRCDIR);\
45	$(MAKE) $(WMI_BUILD_TARGETS) ;\	45	$(MAKE) $(WMI_BUILD_TARGETS) ;\
		46	touch $@
		47
		48	pywmi-installed: install-prereqs $(DESTDIR)$(PY_LIBDIR) $(DESTDIR)$(ZENOSS_BINDIR) $(SAMBA_SRCDIR)/bin/wmic $(SAMBA_SRCDIR)/bin/winexe $(PATHED_LIBASYNC_WMI_LIB)
		49	- cp $(SAMBA_SRCDIR)/bin/wmic $(DESTDIR)$(ZENOSS_BINDIR)
		50	- cp $(SAMBA_SRCDIR)/bin/winexe $(DESTDIR)$(ZENOSS_BINDIR)
		51	+ $(INSTALL_PROGRAM) $(SAMBA_SRCDIR)/bin/wmic $(DESTDIR)$(ZENOSS_BINDIR)
		52	+ $(INSTALL_PROGRAM) $(SAMBA_SRCDIR)/bin/winexe $(DESTDIR)$(ZENOSS_BINDIR)
		53	ifeq ($(shell uname), Darwin)
		54	-(cd $(DESTDIR)$(PY_LIBDIR) && rm -f $(LIBASYNC_WMI_LIB_BASENAME)*)
		55	cp $(PATHED_LIBASYNC_WMI_LIB) $(DESTDIR)$(PY_LIBDIR)/$(LIBASYNC_WMI_LIB_BASENAME).$(LIBASYNC_WMI_LIB_VERSION_nnn).dylib
		56	(cd $(DESTDIR)$(PY_LIBDIR) && ln -sf $(LIBASYNC_WMI_LIB_BASENAME).$(LIBASYNC_WMI_LIB_VERSION_nnn).dylib $(LIBASYNC_WMI_LIB_BASENAME).dylib)
		57	else
		58	-(cd $(DESTDIR)$(PY_LIBDIR) && rm -f $(LIBASYNC_WMI_LIB_BASENAME)*)
		59	- cp $(PATHED_LIBASYNC_WMI_LIB) $(DESTDIR)$(PY_LIBDIR)
		60	+ $(INSTALL_LIB) $(PATHED_LIBASYNC_WMI_LIB) $(DESTDIR)$(PY_LIBDIR)
		61	(cd $(DESTDIR)$(PY_LIBDIR) && ln -sf $(LIBASYNC_WMI_LIB) $(LIBASYNC_WMI_LIB_SO_N))
		62	endif
		63	rm -rf $(DESTDIR)$(PY_LIBDIR)/pysamba