Attachment 156485 Details for Bug 200041 – hamlib.patch

[patch] hamlib.patch

hamlib.patch (text/plain), 8.05 KB, created by takefu on 2015-05-08 01:16:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: takefu

Created: 2015-05-08 01:16:12 UTC

Size: 8.05 KB

patch

obsolete

>diff -ruN /usr/ports/comms/hamlib/Makefile ./Makefile
>--- /usr/ports/comms/hamlib/Makefile	2014-11-26 13:08:24.000000000 +0000
>+++ ./Makefile	2015-05-06 03:38:10.000000000 +0000
>@@ -15,10 +15,9 @@
> BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13
> LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl
> 
>-USES=		perl5 libtool:keepla pkgconfig pathfix python tcl
>+USES=		perl5 libtool pkgconfig pathfix python tcl compiler:env
> USE_PERL5=	build run
> USE_GNOME=	libxml2
>-USE_AUTOTOOLS=	autoconf
> USE_LDCONFIG=	yes
> CPPFLAGS+=	-I${LOCALBASE}/include
> LIBS+=		-L${LOCALBASE}/lib
>@@ -27,9 +26,17 @@
> 		--enable-tcl-binding --with-tcl=${TCL_LIBDIR} \
> 		--with-python-binding --without-rigmatrix
> PLIST_SUB=	VER=${PORTVERSION} TCL_VER=${TCL_VER}
>+INSTALL_TARGET=	install-strip
> 
> OPTIONS_DEFINE=	DOCS
> 
>+.include <bsd.port.pre.mk>
>+
>+.if ${CHOSEN_COMPILER_TYPE} == clang
>+CXXFLAGS+=	-Wno-c++11-extensions # Shutup warning spam
>+CXXFLAGS+=	-Qunused-arguments
>+.endif
>+
> post-patch:
> 	${REINPLACE_CMD} -e 's|%%PYTHON_SITELIBDIR%%|${PYTHON_SITELIBDIR}|g' \
> 		-e 's|%%TCL_LIBDIR%%|${TCL_LIBDIR}/hamlib|g' \
>@@ -41,13 +48,16 @@
> 		${STAGEDIR}${WRKSRC}/bindings/Hamlib-pl.mk
> 
> post-install:
>+.if ${PORT_OPTIONS:MDOCS}
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
> .for d in ${WRKSRC}/AUTHORS ${WRKSRC}/COPYING ${WRKSRC}/COPYING.LIB \
> 	${WRKSRC}/ChangeLog ${WRKSRC}/INSTALL ${WRKSRC}/LICENSE \
> 	${WRKSRC}/NEWS ${WRKSRC}/PLAN ${WRKSRC}/README \
> 	${WRKSRC}/README.betatester ${WRKSRC}/README.win32 \
> 	${WRKSRC}/THANKS
>-	@${INSTALL_DATA} ${WRKSRC}/${d} ${STAGEDIR}${DOCSDIR}
>+	${INSTALL_DATA} ${WRKSRC}/${d} ${STAGEDIR}${DOCSDIR}
> .endfor
>+.endif
>+	${STRIP_CMD} ${STAGEDIR}${PACKLIST_DIR}/Hamlib/Hamlib.so
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>diff -ruN /usr/ports/comms/hamlib/files/patch-bindings_Makefile.in ./files/patch-bindings_Makefile.in
>--- /usr/ports/comms/hamlib/files/patch-bindings_Makefile.in	2014-01-22 17:40:44.000000000 +0000
>+++ ./files/patch-bindings_Makefile.in	2015-05-05 07:47:24.000000000 +0000
>@@ -1,6 +1,6 @@
>---- bindings/Makefile.in.orig	2012-11-01 16:28:09.000000000 -0500
>-+++ bindings/Makefile.in	2012-11-02 18:27:34.000000000 -0500
>-@@ -327,7 +327,7 @@
>+--- bindings/Makefile.in.orig	2012-11-01 21:28:09 UTC
>++++ bindings/Makefile.in
>+@@ -327,7 +327,7 @@ prefix = @prefix@
>  program_transform_name = @program_transform_name@
>  psdir = @psdir@
>  pyexecdir = @pyexecdir@
>@@ -9,7 +9,7 @@
>  sbindir = @sbindir@
>  sharedstatedir = @sharedstatedir@
>  srcdir = @srcdir@
>-@@ -347,7 +347,7 @@
>+@@ -347,7 +347,7 @@ MOSTLYCLEANFILES = $(am__append_2) hamli
>  	hamlibperl_wrap.c Hamlib.pm Hamlib.bs
>  AM_CFLAGS = -fno-strict-aliasing
>  @ENABLE_TCL_TRUE@tcl_ltlib = hamlibtcl.la
>diff -ruN /usr/ports/comms/hamlib/files/patch-configure.ac ./files/patch-configure.ac
>--- /usr/ports/comms/hamlib/files/patch-configure.ac	2015-01-25 20:03:32.000000000 +0000
>+++ ./files/patch-configure.ac	2015-05-05 07:47:31.000000000 +0000
>@@ -1,4 +1,4 @@
>---- configure.ac.orig	2015-01-25 12:10:35 UTC
>+--- configure.ac.orig	2012-11-01 21:27:27 UTC
> +++ configure.ac
> @@ -278,7 +278,7 @@ BINDING_LIB_TARGETS=""
>  dnl Check if cxx-binding not wanted, default is to build it
>diff -ruN /usr/ports/comms/hamlib/files/patch-src_Makefile.in ./files/patch-src_Makefile.in
>--- /usr/ports/comms/hamlib/files/patch-src_Makefile.in	2014-01-22 17:40:44.000000000 +0000
>+++ ./files/patch-src_Makefile.in	2015-05-05 07:47:39.000000000 +0000
>@@ -1,6 +1,6 @@
>---- src/Makefile.in.orig	2012-08-05 09:10:08.000000000 -0500
>-+++ src/Makefile.in	2012-08-07 06:59:39.000000000 -0500
>-@@ -103,7 +103,7 @@
>+--- src/Makefile.in.orig	2012-11-01 21:28:15 UTC
>++++ src/Makefile.in
>+@@ -103,7 +103,7 @@ am__v_lt_0 = --silent
>  libhamlib_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
>  	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libhamlib_la_CFLAGS) \
>  	$(CFLAGS) $(libhamlib_la_LDFLAGS) $(LDFLAGS) -o $@
>@@ -9,7 +9,7 @@
>  depcomp = $(SHELL) $(top_srcdir)/depcomp
>  am__depfiles_maybe = depfiles
>  am__mv = mv -f
>-@@ -193,7 +193,7 @@
>+@@ -193,7 +193,7 @@ LD = @LD@
>  LDFLAGS = @LDFLAGS@
>  LIBLTDL = @LIBLTDL@
>  LIBOBJS = @LIBOBJS@
>diff -ruN /usr/ports/comms/hamlib/pkg-plist ./pkg-plist
>--- /usr/ports/comms/hamlib/pkg-plist	2014-11-26 13:08:24.000000000 +0000
>+++ ./pkg-plist	2015-05-06 03:34:45.000000000 +0000
>@@ -13,137 +13,91 @@
> include/hamlib/rotclass.h
> include/hamlib/rotlist.h
> lib/hamlib/hamlib-adat.a
>-lib/hamlib/hamlib-adat.la
> lib/hamlib/hamlib-adat.so
> lib/hamlib/hamlib-alinco.a
>-lib/hamlib/hamlib-alinco.la
> lib/hamlib/hamlib-alinco.so
> lib/hamlib/hamlib-aor.a
>-lib/hamlib/hamlib-aor.la
> lib/hamlib/hamlib-aor.so
> lib/hamlib/hamlib-amsat.a
>-lib/hamlib/hamlib-amsat.la
> lib/hamlib/hamlib-amsat.so
> lib/hamlib/hamlib-ars.a
>-lib/hamlib/hamlib-ars.la
> lib/hamlib/hamlib-ars.so
> lib/hamlib/hamlib-celestron.a
>-lib/hamlib/hamlib-celestron.la
> lib/hamlib/hamlib-celestron.so
> lib/hamlib/hamlib-drake.a
>-lib/hamlib/hamlib-drake.la
> lib/hamlib/hamlib-drake.so
> lib/hamlib/hamlib-dummy.a
>-lib/hamlib/hamlib-dummy.la
> lib/hamlib/hamlib-dummy.so
> lib/hamlib/hamlib-easycomm.a
>-lib/hamlib/hamlib-easycomm.la
> lib/hamlib/hamlib-easycomm.so
> lib/hamlib/hamlib-flexradio.a
>-lib/hamlib/hamlib-flexradio.la
> lib/hamlib/hamlib-flexradio.so
> lib/hamlib/hamlib-fodtrack.a
>-lib/hamlib/hamlib-fodtrack.la
> lib/hamlib/hamlib-fodtrack.so
> lib/hamlib/hamlib-gs232a.so
>-lib/hamlib/hamlib-gs232a.la
> lib/hamlib/hamlib-gs232a.a
> lib/hamlib/hamlib-heathkit.so
>-lib/hamlib/hamlib-heathkit.la
> lib/hamlib/hamlib-heathkit.a
> lib/hamlib/hamlib-icom.a
>-lib/hamlib/hamlib-icom.la
> lib/hamlib/hamlib-icom.so
> lib/hamlib/hamlib-jrc.a
>-lib/hamlib/hamlib-jrc.la
> lib/hamlib/hamlib-jrc.so
> lib/hamlib/hamlib-kachina.a
>-lib/hamlib/hamlib-kachina.la
> lib/hamlib/hamlib-kachina.so
> lib/hamlib/hamlib-kenwood.a
>-lib/hamlib/hamlib-kenwood.la
> lib/hamlib/hamlib-kenwood.so
> lib/hamlib/hamlib-kit.a
>-lib/hamlib/hamlib-kit.la
> lib/hamlib/hamlib-kit.so
> lib/hamlib/hamlib-lowe.a
>-lib/hamlib/hamlib-lowe.la
> lib/hamlib/hamlib-lowe.so
> lib/hamlib/hamlib-m2.a
>-lib/hamlib/hamlib-m2.la
> lib/hamlib/hamlib-m2.so
> lib/hamlib/hamlib-pcr.a
>-lib/hamlib/hamlib-pcr.la
> lib/hamlib/hamlib-pcr.so
> lib/hamlib/hamlib-prm80.a
>-lib/hamlib/hamlib-prm80.la
> lib/hamlib/hamlib-prm80.so
> lib/hamlib/hamlib-racal.a
>-lib/hamlib/hamlib-racal.la
> lib/hamlib/hamlib-racal.so
> lib/hamlib/hamlib-rft.a
>-lib/hamlib/hamlib-rft.la
> lib/hamlib/hamlib-rft.so
> lib/hamlib/hamlib-rotorez.a
>-lib/hamlib/hamlib-rotorez.la
> lib/hamlib/hamlib-rotorez.so
> lib/hamlib/hamlib-rpcrig.a
>-lib/hamlib/hamlib-rpcrig.la
> lib/hamlib/hamlib-rpcrig.so
> lib/hamlib/hamlib-rpcrot.a
>-lib/hamlib/hamlib-rpcrot.la
> lib/hamlib/hamlib-rpcrot.so
> lib/hamlib/hamlib-rs.a
>-lib/hamlib/hamlib-rs.la
> lib/hamlib/hamlib-rs.so
> lib/hamlib/hamlib-sartek.a
>-lib/hamlib/hamlib-sartek.la
> lib/hamlib/hamlib-sartek.so
> lib/hamlib/hamlib-skanti.a
>-lib/hamlib/hamlib-skanti.la
> lib/hamlib/hamlib-skanti.so
> lib/hamlib/hamlib-spid.a
>-lib/hamlib/hamlib-spid.la
> lib/hamlib/hamlib-spid.so
> lib/hamlib/hamlib-tapr.a
>-lib/hamlib/hamlib-tapr.la
> lib/hamlib/hamlib-tapr.so
> lib/hamlib/hamlib-tentec.a
>-lib/hamlib/hamlib-tentec.la
> lib/hamlib/hamlib-tentec.so
> lib/hamlib/hamlib-ts7400.a
>-lib/hamlib/hamlib-ts7400.la
> lib/hamlib/hamlib-ts7400.so
> lib/hamlib/hamlib-tuner.a
>-lib/hamlib/hamlib-tuner.la
> lib/hamlib/hamlib-tuner.so
> lib/hamlib/hamlib-uniden.a
>-lib/hamlib/hamlib-uniden.la
> lib/hamlib/hamlib-uniden.so
> lib/hamlib/hamlib-winradio.a
>-lib/hamlib/hamlib-winradio.la
> lib/hamlib/hamlib-winradio.so
> lib/hamlib/hamlib-wj.a
>-lib/hamlib/hamlib-wj.la
> lib/hamlib/hamlib-wj.so
> lib/hamlib/hamlib-yaesu.a
>-lib/hamlib/hamlib-yaesu.la
> lib/hamlib/hamlib-yaesu.so
> lib/hamlibtcl-1.0.so
> lib/hamlibtcl.a
>-lib/hamlibtcl.la
> lib/hamlibtcl.so
> lib/tcl%%TCL_VER%%/hamlib/pkgIndex.tcl
>-lib/libhamlib++.so
>-lib/libhamlib++.so.2
>-lib/libhamlib++.so.2.0.16
>-lib/libhamlib++.a
>-lib/libhamlib++.la
> lib/libhamlib.so
> lib/libhamlib.so.2
> lib/libhamlib.so.2.0.16
> lib/libhamlib.a
>-lib/libhamlib.la
> libdata/pkgconfig/hamlib.pc
> sbin/rpc.rigd
> sbin/rpc.rotd
>@@ -152,7 +106,6 @@
> %%SITE_ARCH%%/Hamlib.pm
> %%SITE_ARCH%%/perltest.pl
> %%PYTHON_SITELIBDIR%%/_Hamlib.so
>-%%PYTHON_SITELIBDIR%%/_Hamlib.la
> %%PYTHON_SITELIBDIR%%/_Hamlib.a
> %%PYTHON_SITELIBDIR%%/Hamlib.py
> %%PYTHON_SITELIBDIR%%/Hamlib.pyc

Actions: View | Diff

Attachments on bug 200041: 156485