svn commit: r360257 - in head/textproc/openjade: . files

[Tijl Coosemans]

Author: tijl
Date: Wed Jul  2 20:33:20 2014
New Revision: 360257
URL: http://svnweb.freebsd.org/changeset/ports/360257
QAT: https://qat.redports.org/buildarchive/r360257/

Log:
  - Add USES=libtool
  - Remove hack for gcc 3.x

Modified:
  head/textproc/openjade/Makefile
  head/textproc/openjade/files/patch-ae
  head/textproc/openjade/pkg-plist

Modified: head/textproc/openjade/Makefile
==============================================================================
--- head/textproc/openjade/Makefile	Wed Jul  2 20:22:55 2014	(r360256)
+++ head/textproc/openjade/Makefile	Wed Jul  2 20:33:20 2014	(r360257)
@@ -3,7 +3,7 @@
 
 PORTNAME=	openjade
 PORTVERSION=	1.3.3p1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/1.3.3
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/p/-pre/}
@@ -14,8 +14,8 @@ COMMENT=	Object-oriented SGML/XML parser
 LIB_DEPENDS=	libosp.so:${PORTSDIR}/textproc/opensp
 RUN_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
 
+USES=		gettext gmake libtool perl5
 USE_LDCONFIG=	yes
-USES=		gettext gmake perl5
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-default-catalog=${PREFIX}/share/sgml/catalog \
 		--datadir=${DATADIR}
@@ -29,7 +29,6 @@ XMLCATMGR=	${LOCALBASE}/bin/xmlcatmgr
 DATADIR=	${PREFIX}/share/sgml/openjade
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|<iostream.h>|<iostream>|' ${WRKSRC}/style/MultiLineInlineNote.cxx
 
 post-install:
@@ -41,13 +40,4 @@ post-install:
 			"${WRKSRC}", $$3, "${STAGEDIR}${PREFIX}", $$4}' | \
 		${SH}
 
-.include <bsd.port.pre.mk>
-
-# This port cannot be CFLAGS safe, using optimizations such as
-# 'march=-mpentium -Os' produces core dumps with certain input files
-# Therefore, we'd better remove all machine optimizations and any -O
-# other than -O{0,1,}. Idea taken from palm/prc-tools-gcc.
-CPPFLAGS:=	-O ${CFLAGS:N-O*:N-m*}
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/textproc/openjade/files/patch-ae
==============================================================================
--- head/textproc/openjade/files/patch-ae	Wed Jul  2 20:22:55 2014	(r360256)
+++ head/textproc/openjade/files/patch-ae	Wed Jul  2 20:33:20 2014	(r360257)
@@ -21,11 +21,3 @@ $FreeBSD$
  echo "$as_me:$LINENO: checking for gettext" >&5
  echo $ECHO_N "checking for gettext... $ECHO_C" >&6
  if test "${ac_cv_func_gettext+set}" = set; then
-@@ -9792,6 +9796,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'

Modified: head/textproc/openjade/pkg-plist
==============================================================================
--- head/textproc/openjade/pkg-plist	Wed Jul  2 20:22:55 2014	(r360256)
+++ head/textproc/openjade/pkg-plist	Wed Jul  2 20:33:20 2014	(r360257)
@@ -1,16 +1,16 @@
 bin/openjade
 lib/libogrove.a
-lib/libogrove.la
 lib/libogrove.so
 lib/libogrove.so.0
+lib/libogrove.so.0.0.1
 lib/libospgrove.a
-lib/libospgrove.la
 lib/libospgrove.so
 lib/libospgrove.so.0
+lib/libospgrove.so.0.0.1
 lib/libostyle.a
-lib/libostyle.la
 lib/libostyle.so
 lib/libostyle.so.0
+lib/libostyle.so.0.0.1
 @unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove CATALOG openjade/catalog
 @comment INSTALL_DATA: dsssl/README.jadetex %%DATADIR%%/README.jadetex
 @comment INSTALL_DATA: dsssl/builtins.dsl %%DATADIR%%/builtins.dsl