svn commit: r364938 - in head: devel/libmba devel/libmba/files textproc/domc textproc/rtfx

[John Marino]

Author: marino
Date: Fri Aug 15 06:55:11 2014
New Revision: 364938
URL: http://svnweb.freebsd.org/changeset/ports/364938
QAT: https://qat.redports.org/buildarchive/r364938/

Log:
  devel/libmba: Fix wrong embedded DT_SONAME
  
   * Use single digit for soversion
   * Support DragonFly
   * Drop unnecessary sed lines by adjusting MAKE_ARGS
   * Bump dependent ports
  
  PR:		192666
  Submitted by:	Jan Beich
  Approved by:	portmgr (implicit, dependent port unstaged)

Added:
  head/devel/libmba/files/
  head/devel/libmba/files/patch-mktool.c   (contents, props changed)
Modified:
  head/devel/libmba/Makefile
  head/textproc/domc/Makefile
  head/textproc/rtfx/Makefile

Modified: head/devel/libmba/Makefile
==============================================================================
--- head/devel/libmba/Makefile	Fri Aug 15 06:37:17 2014	(r364937)
+++ head/devel/libmba/Makefile	Fri Aug 15 06:55:11 2014	(r364938)
@@ -3,6 +3,7 @@
 
 PORTNAME=	libmba
 PORTVERSION=	0.9.1
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.ioplex.com/~miallen/libmba/dl/ \
 		${MASTER_SITE_LOCAL}
@@ -13,12 +14,10 @@ COMMENT=	Collection of C modules potenti
 
 MAKE_JOBS_UNSAFE=	yes
 USE_LDCONFIG=	yes
-MAKE_ARGS=	PREFIX=${STAGEDIR}${PREFIX}
+MAKE_ARGS=	prefix="${STAGEDIR}${PREFIX}"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,-g,$$(CFLAGS),' \
-		-e '/^prefix/s/=/?=/' \
-		-e 's/prefix/PREFIX/' \
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -Ee 's,"g?cc","${CC}",' \
 		${WRKSRC}/mktool.c

Added: head/devel/libmba/files/patch-mktool.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/libmba/files/patch-mktool.c	Fri Aug 15 06:55:11 2014	(r364938)
@@ -0,0 +1,23 @@
+--- mktool.c~
++++ mktool.c
+@@ -89,18 +89,18 @@ static const char *arg_array[32] = {
+ 		"lib%n.%1.%2.%3.dylib",
+ 		"lib%n.%1.%2.dylib",
+ 		"lib%n.dylib",
+ 		"darwin",
+-#elif defined(__FreeBSD__) || defined(__NetBSD__)
++#elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__)
+ 		"gcc",
+ 		" -g",
+ 		" -Wall -W",
+ 		" -Wall -W -ansi -pedantic",
+ 		" -std=c99",
+ 		" -std=c89",
+ 		" -fpic",
+ 		" -fPIC",
+-		" -Wl,-soname,lib%n.so.%1.%2",
++		" -Wl,-soname,lib%n.so.%1",
+ 		"",
+ 		" -shared",
+ 		" -Wl,-rpath,%s",
+ 		"lib%n.so.%1",

Modified: head/textproc/domc/Makefile
==============================================================================
--- head/textproc/domc/Makefile	Fri Aug 15 06:37:17 2014	(r364937)
+++ head/textproc/domc/Makefile	Fri Aug 15 06:55:11 2014	(r364938)
@@ -3,7 +3,7 @@
 
 PORTNAME=	domc
 PORTVERSION=	0.8.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.ioplex.com/~miallen/domc/dl/
 

Modified: head/textproc/rtfx/Makefile
==============================================================================
--- head/textproc/rtfx/Makefile	Fri Aug 15 06:37:17 2014	(r364937)
+++ head/textproc/rtfx/Makefile	Fri Aug 15 06:55:11 2014	(r364938)
@@ -3,6 +3,7 @@
 
 PORTNAME=	rtfx
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://memberwebs.com/stef/software/rtfx/