Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 28 Apr 2014 18:20:56 +0000 (UTC)
From:      Tijl Coosemans <tijl@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r352538 - head/x11-toolkits/open-motif
Message-ID:  <201404281820.s3SIKuia073376@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tijl
Date: Mon Apr 28 18:20:55 2014
New Revision: 352538
URL: http://svnweb.freebsd.org/changeset/ports/352538
QAT: https://qat.redports.org/buildarchive/r352538/

Log:
  - Convert to USES=libtool.
  - Replace autogen.sh in pre-configure with normal USE_AUTOTOOLS.  The
    script also ran ./configure so configure ran twice.
  - Remove --with-pic from CONFIGURE_ARGS.  Not needed.

Modified:
  head/x11-toolkits/open-motif/Makefile
  head/x11-toolkits/open-motif/pkg-plist

Modified: head/x11-toolkits/open-motif/Makefile
==============================================================================
--- head/x11-toolkits/open-motif/Makefile	Mon Apr 28 18:19:57 2014	(r352537)
+++ head/x11-toolkits/open-motif/Makefile	Mon Apr 28 18:20:55 2014	(r352538)
@@ -2,6 +2,7 @@
 
 PORTNAME=	open-motif
 PORTVERSION=	2.3.4
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 # MASTER_SITES=	SF/${PORTNAME}/Motif%202.3.4%20Source%20Code/
 MASTER_SITES=	SF/motif/Motif%202.3.4%20Source%20Code/
@@ -22,8 +23,11 @@ CONFLICTS=	lesstif-[0-9]*
 # WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 WRKSRC=		${WRKDIR}/motif-${PORTVERSION}
 
-USES=		iconv gmake pkgconfig
-USE_AUTOTOOLS=	libtool autoconf:env automake:env
+USES=		gmake iconv libtool:keepla pkgconfig
+USE_AUTOTOOLS=	libtoolize aclocal autoconf autoheader automake
+ACLOCAL_ARGS=	-I.
+AUTOMAKE_ARGS=	-a -c -f --foreign
+LIBTOOLIZE_ARGS=-i -c -f
 USE_XORG=	xaw xbitmaps xft
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
@@ -33,11 +37,7 @@ USE_CSTD=	gnu89
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "amd64" || ${ARCH} == "sparc64"
-CONFIGURE_ARGS+=	--with-pic
-.endif
+.include <bsd.port.options.mk>
 
 post-patch:
 # fix sections
@@ -52,13 +52,10 @@ post-patch:
 		 s|file formats|5|'
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/configure.ac
 
-pre-configure:
-	cd ${WRKSRC} && ./autogen.sh
-
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in BUGREPORT README RELNOTES
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/x11-toolkits/open-motif/pkg-plist
==============================================================================
--- head/x11-toolkits/open-motif/pkg-plist	Mon Apr 28 18:19:57 2014	(r352537)
+++ head/x11-toolkits/open-motif/pkg-plist	Mon Apr 28 18:20:55 2014	(r352538)
@@ -277,14 +277,17 @@ lib/libMrm.a
 lib/libMrm.la
 lib/libMrm.so
 lib/libMrm.so.4
+lib/libMrm.so.4.0.4
 lib/libUil.a
 lib/libUil.la
 lib/libUil.so
 lib/libUil.so.4
+lib/libUil.so.4.0.4
 lib/libXm.a
 lib/libXm.la
 lib/libXm.so
 lib/libXm.so.4
+lib/libXm.so.4.0.4
 man/man1/mwm.1.gz
 man/man1/uil.1.gz
 man/man1/xmbind.1.gz



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404281820.s3SIKuia073376>