svn commit: r366343 - in head/emulators/hercules: . files

[Tijl Coosemans]

Author: tijl
Date: Wed Aug 27 19:55:11 2014
New Revision: 366343
URL: http://svnweb.freebsd.org/changeset/ports/366343
QAT: https://qat.redports.org/buildarchive/r366343/

Log:
  Convert to USES=libtool:keepla

Deleted:
  head/emulators/hercules/files/patch-libtool
Modified:
  head/emulators/hercules/Makefile
  head/emulators/hercules/pkg-plist

Modified: head/emulators/hercules/Makefile
==============================================================================
--- head/emulators/hercules/Makefile	Wed Aug 27 19:45:29 2014	(r366342)
+++ head/emulators/hercules/Makefile	Wed Aug 27 19:55:11 2014	(r366343)
@@ -3,36 +3,28 @@
 
 PORTNAME=	hercules
 PORTVERSION=	3.10
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://downloads.hercules-390.eu/
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	System/370, ESA/390, and z/Architecture Emulator
 
-USES=		iconv perl5 shebangfix
+# :keepla because port uses lt_dlopen
+USES=		iconv libtool:keepla perl5 shebangfix
 SHEBANG_FILES=	util/bldlvlck
-USE_AUTOTOOLS=	libtool libltdl
-CONFIGURE_ARGS=	--enable-optimization="no"
 USE_LDCONFIG=	yes
-
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-optimization
 
 OPTIONS_DEFINE=		DOCS
 
 .include <bsd.port.options.mk>
 
-post-extract:
-	@${RM} -f ${WRKSRC}/ltdl.h
-
 post-patch:
 	@${REINPLACE_CMD} -e \
-		'/LIBS/s|-lpthread|-pthread|g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e \
 		's|SOL_TCP|IPPROTO_TCP|g' ${WRKSRC}/hscutl.c
 	@${REINPLACE_CMD} -e \
 		'/^pkgdatadir/s|=.*|= $$(docdir)|' ${WRKSRC}/html/Makefile.in
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		'/^libherc_la_LIBADD/s|=|= -lltdl |g'
 
 .include <bsd.port.mk>

Modified: head/emulators/hercules/pkg-plist
==============================================================================
--- head/emulators/hercules/pkg-plist	Wed Aug 27 19:45:29 2014	(r366342)
+++ head/emulators/hercules/pkg-plist	Wed Aug 27 19:55:11 2014	(r366343)
@@ -28,7 +28,6 @@ bin/hetupd
 bin/tapecopy
 bin/tapemap
 bin/tapesplt
-lib/hercules/dyncrypt.a
 lib/hercules/dyncrypt.la
 lib/hercules/dyncrypt.so
 lib/hercules/dyngui.la
@@ -59,7 +58,6 @@ lib/hercules/hdteq.la
 lib/hercules/hdteq.so
 lib/hercules/hdtqeth.la
 lib/hercules/hdtqeth.so
-lib/libdecNumber.a
 lib/libdecNumber.la
 lib/libdecNumber.so
 lib/libherc.la
@@ -72,7 +70,6 @@ lib/libherct.la
 lib/libherct.so
 lib/libhercu.la
 lib/libhercu.so
-lib/libsoftfloat.a
 lib/libsoftfloat.la
 lib/libsoftfloat.so
 man/man1/cckddiag.1.gz