svn commit: r379763 - in head/devel: libosmo-abis libosmo-sccp libosmo-sccp/files libosmocore libosmocore/files

[Jan Beich]

Author: jbeich
Date: Tue Feb 24 08:00:58 2015
New Revision: 379763
URL: https://svnweb.freebsd.org/changeset/ports/379763
QAT: https://qat.redports.org/buildarchive/r379763/

Log:
  - Unbreak on DragonFly
  - Unbreak on big-endian archs [1]
  - Unbreak and rename DOCS option [2]
  - Convert to USES=autoreconf
  - Convert to USES=pathfix
  - Convert to INSTALL_TARGET=install-strip
  - Convert to PORTDOCS
  - Fix whitespace
  - Bump PORTREVISION for [1], [2]
  
  Differential Revision:	https://reviews.freebsd.org/D1947
  PR:		197948
  Reviewed by:	marino, pi
  Approved by:	Nikola Kolev <koue at chaosophia.net> (maintainer)

Deleted:
  head/devel/libosmo-sccp/files/
  head/devel/libosmocore/files/patch-Makefile.am
Modified:
  head/devel/libosmo-abis/Makefile
  head/devel/libosmo-sccp/Makefile
  head/devel/libosmocore/Makefile

Modified: head/devel/libosmo-abis/Makefile
==============================================================================
--- head/devel/libosmo-abis/Makefile	Tue Feb 24 07:46:51 2015	(r379762)
+++ head/devel/libosmo-abis/Makefile	Tue Feb 24 08:00:58 2015	(r379763)
@@ -15,19 +15,13 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libosmocore.so:${PORTSDIR}/devel/libosmocore \
 		libortp.so:${PORTSDIR}/net/ortp
 
-USES=		gmake libtool pkgconfig
-
-USE_AUTOTOOLS=	aclocal autoconf automake libtoolize autoheader
-AUTOMAKE_ARGS=	--gnu --add-missing --copy
+USES=		autoreconf gmake libtool pathfix pkgconfig
+PATHFIX_MAKEFILEIN=Makefile.am
+GNU_CONFIGURE=	yes
+INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 post-patch:
-	${REINPLACE_CMD} -e 's|pkgconfigdir.*|pkgconfigdir = ${PREFIX}/libdata/pkgconfig|g' \
-		${WRKSRC}/Makefile.am
 	${ECHO_CMD} ${PORTVERSION} > ${WRKSRC}/.tarball-version
 
-post-stage:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libosmoabis.so.4
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libosmotrau.so.0
-
 .include <bsd.port.mk>

Modified: head/devel/libosmo-sccp/Makefile
==============================================================================
--- head/devel/libosmo-sccp/Makefile	Tue Feb 24 07:46:51 2015	(r379762)
+++ head/devel/libosmo-sccp/Makefile	Tue Feb 24 08:00:58 2015	(r379763)
@@ -2,9 +2,9 @@
 
 PORTNAME=	libosmo-sccp
 PORTVERSION=	0.0.6.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
-MASTER_SITES=   http://chaosophia.net/downloads/osmocom/${PORTNAME}/ \
+MASTER_SITES=	http://chaosophia.net/downloads/osmocom/${PORTNAME}/ \
 		http://ns1.chaosophia.net/downloads/osmocom/${PORTNAME}/
 
 MAINTAINER=	koue at chaosophia.net
@@ -15,14 +15,17 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libosmocore.so:${PORTSDIR}/devel/libosmocore
 
-USES=		gmake pkgconfig
-
-USE_AUTOTOOLS=	aclocal autoconf automake libtoolize
-AUTOMAKE_ARGS=	--gnu --add-missing --copy
+USES=		autoreconf gmake pathfix pkgconfig
+PATHFIX_MAKEFILEIN=Makefile.am
+GNU_CONFIGURE=	yes
 
 post-patch:
-	${REINPLACE_CMD} -e 's|pkgconfigdir.*|pkgconfigdir = ${PREFIX}/libdata/pkgconfig|g' \
-		${WRKSRC}/Makefile.am
+	${REINPLACE_CMD} -e 's,endian\.h,sys/endian.h,' \
+		-e 's,__BYTE_ORDER,BYTE_ORDER,' \
+		-e 's,__LITTLE_ENDIAN,LITTLE_ENDIAN,' \
+		-e 's,__BIG_ENDIAN,BIG_ENDIAN,' \
+		${WRKSRC}/include/mtp/mtp_level3.h \
+		${WRKSRC}/include/sccp/sccp_types.h
 	${ECHO_CMD} ${PORTVERSION} > ${WRKSRC}/.tarball-version
 
 .include <bsd.port.mk>

Modified: head/devel/libosmocore/Makefile
==============================================================================
--- head/devel/libosmocore/Makefile	Tue Feb 24 07:46:51 2015	(r379762)
+++ head/devel/libosmocore/Makefile	Tue Feb 24 08:00:58 2015	(r379763)
@@ -2,6 +2,7 @@
 
 PORTNAME=	libosmocore
 PORTVERSION=	0.8.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://git.osmocom.org/libosmocore/snapshot/ \
 		http://chaosophia.net/downloads/osmocom/${PORTNAME}/
@@ -14,39 +15,20 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpcsclite.so:${PORTSDIR}/devel/pcsc-lite
 
-USES=		gmake libtool pkgconfig execinfo
-USE_AUTOTOOLS=	aclocal autoconf automake libtoolize autoheader
-AUTOMAKE_ARGS=	--gnu --add-missing --copy
+USES=		alias autoreconf execinfo gmake libtool pathfix pkgconfig
+PATHFIX_MAKEFILEIN=Makefile.am
+GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib -lexecinfo
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
+PORTDOCS=	*
 
-OPTIONS_DEFINE=	DOCS
-DOCS_DESC=	Build documentation
-OPTIONS_UNSET=	DOCS
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen \
-		dot:${PORTSDIR}/graphics/graphviz
-.endif
+OPTIONS_DEFINE=	DOXYGEN
+DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen \
+			dot:${PORTSDIR}/graphics/graphviz
+DOXYGEN_CONFIGURE_ENV_OFF=ac_cv_path_DOXYGEN=false
 
 post-patch:
-.if ${PORT_OPTIONS:MDOCS}
-	${CP} ${WRKSRC}/Makefile.am.orig ${WRKSRC}/Makefile.am
-.endif
-	${REINPLACE_CMD} -e 's|pkgconfigdir.*|pkgconfigdir = ${PREFIX}/libdata/pkgconfig|g' \
-		${WRKSRC}/Makefile.am
 	${ECHO_CMD} ${PORTVERSION} > ${WRKSRC}/.tarball-version
 
-.if ${PORT_OPTIONS:MDOCS}
-post-install:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for i in codec core gsm vty
-	${FIND} ${WRKSRC}/doc/${i}/html -not -type d | ${SED} \
-	  's,^${WRKSRC}/doc/${i}/html,${DOCSDIR_REL}/${i}/html,' >> ${TMPPLIST}
-.endfor
-.endif
-
 .include <bsd.port.mk>