svn commit: r366240 - in head/lang/oo2c: . files

[Adam Weinberger]

Author: adamw
Date: Tue Aug 26 17:35:45 2014
New Revision: 366240
URL: http://svnweb.freebsd.org/changeset/ports/366240
QAT: https://qat.redports.org/buildarchive/r366240/

Log:
  Fix build.
  
  While here, fix some stage-qa failures. One of the adjunct utilities uses
  perl, but it seems silly to build in a run-time perl dependency just for it.
  So, set the perl path to something sensible and likely correct.

Added:
  head/lang/oo2c/files/
  head/lang/oo2c/files/patch-rsrc__OOC__oo2crc.xml.mk.in   (contents, props changed)
Modified:
  head/lang/oo2c/Makefile
  head/lang/oo2c/pkg-plist

Modified: head/lang/oo2c/Makefile
==============================================================================
--- head/lang/oo2c/Makefile	Tue Aug 26 17:22:50 2014	(r366239)
+++ head/lang/oo2c/Makefile	Tue Aug 26 17:35:45 2014	(r366240)
@@ -11,6 +11,8 @@ DISTNAME=	${PORTNAME}_${BITS}-${PORTVERS
 MAINTAINER=	johans at FreeBSD.org
 COMMENT=	Optimizing Oberon-2 compiler of University of Kaiserslautern, Germany
 
+LICENSE=	GPLv2
+
 BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
 RUN_DEPENDS=	libtool:${PORTSDIR}/devel/libtool
 LIB_DEPENDS=	libgc.so:${PORTSDIR}/devel/boehm-gc
@@ -31,6 +33,8 @@ OPTIONS_DEFINE=	DOCS
 post-patch:
 	@${REINPLACE_CMD} 's/dir=@/dir=$${DESTDIR}@/' \
 		 ${WRKSRC}/Makefile.config.in
+	@${REINPLACE_CMD} -e 's|@PERL@|${LOCALBASE}/bin/perl|' \
+		${WRKSRC}/rsrc/OOC/oobacktrace.in
 
 .include <bsd.port.pre.mk>
 

Added: head/lang/oo2c/files/patch-rsrc__OOC__oo2crc.xml.mk.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/oo2c/files/patch-rsrc__OOC__oo2crc.xml.mk.in	Tue Aug 26 17:35:45 2014	(r366240)
@@ -0,0 +1,11 @@
+--- ./rsrc/OOC/oo2crc.xml.mk.in.orig	2014-08-26 13:22:18.819656990 -0400
++++ ./rsrc/OOC/oo2crc.xml.mk.in	2014-08-26 13:22:32.780265990 -0400
+@@ -5,7 +5,7 @@
+     <set name='cppflags'>@CPPFLAGS@</set>
+     <set name='cflags'>@CFLAGS@</set>
+     <set name='ldflags'>@LDFLAGS@</set>
+-    <set name='libs'>-L%libdir%</set>
++    <set name='libs'>-L%libdir% -lm</set>
+ 
+     <set name='libtool'>@LIBTOOL@</set>
+     <set name='libdir'>%libdir%</set>

Modified: head/lang/oo2c/pkg-plist
==============================================================================
--- head/lang/oo2c/pkg-plist	Tue Aug 26 17:22:50 2014	(r366239)
+++ head/lang/oo2c/pkg-plist	Tue Aug 26 17:35:45 2014	(r366240)
@@ -646,7 +646,6 @@ lib/oo2c/sym/liboo2c.Doc
 lib/oo2c/sym/liboo2c.Sym
 lib/oo2c/sym/libxml.Doc
 lib/oo2c/sym/libxml.Sym
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/oo2c/sym/XML/UnicodeCodec
 @dirrm lib/oo2c/sym/XML/Builder
 @dirrm lib/oo2c/sym/XML/Basic