[Midnightbsd-cvs] mports [23742] trunk/devel/readline: fix build on midnightbsd current

[laffer1 at midnightbsd.org]

Revision: 23742
          http://svnweb.midnightbsd.org/mports/?rev=23742
Author:   laffer1
Date:     2018-08-18 13:25:13 -0400 (Sat, 18 Aug 2018)
Log Message:
-----------
fix build on midnightbsd current

Modified Paths:
--------------
    trunk/devel/readline/Makefile
    trunk/devel/readline/files/patch-support-shlib-install
    trunk/devel/readline/files/patch-support-shobj-conf

Added Paths:
-----------
    trunk/devel/readline/files/patch-support-config.sub

Modified: trunk/devel/readline/Makefile
===================================================================
--- trunk/devel/readline/Makefile	2018-08-18 17:08:42 UTC (rev 23741)
+++ trunk/devel/readline/Makefile	2018-08-18 17:25:13 UTC (rev 23742)
@@ -23,6 +23,8 @@
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
+CONFIGURE_ARGS+=	--enable-shared
+
 INFO=		readline rluserman history
 
 PATCHES=	1 2 3 4 5 6 7 8
@@ -34,6 +36,7 @@
 .include <bsd.mport.options.mk>
 
 pre-configure:
+	${REINPLACE_CMD} -e "s/dragonfly/midnightbsd/g" ${WRKSRC}/shlib/Makefile.in
 .if ${PORT_OPTIONS:MTERMCAP}
 	${REINPLACE_CMD} "s/SHOBJ_LDFLAGS =/SHOBJ_LDFLAGS = -ltermcap/" ${WRKSRC}/shlib/Makefile.in
 .endif

Added: trunk/devel/readline/files/patch-support-config.sub
===================================================================
--- trunk/devel/readline/files/patch-support-config.sub	                        (rev 0)
+++ trunk/devel/readline/files/patch-support-config.sub	2018-08-18 17:25:13 UTC (rev 23742)
@@ -0,0 +1,11 @@
+--- support/config.sub.orig	2018-08-18 13:23:30.677379000 -0400
++++ support/config.sub	2018-08-18 13:24:02.177961000 -0400
+@@ -1360,7 +1360,7 @@
+ 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+ 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+ 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+-	      | -bitrig* | -openbsd* | -solidbsd* \
++	      | -bitrig* | -openbsd* | -solidbsd* | -midnightbsd* \
+ 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+ 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \


Property changes on: trunk/devel/readline/files/patch-support-config.sub
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/devel/readline/files/patch-support-shlib-install
===================================================================
--- trunk/devel/readline/files/patch-support-shlib-install	2018-08-18 17:08:42 UTC (rev 23741)
+++ trunk/devel/readline/files/patch-support-shlib-install	2018-08-18 17:25:13 UTC (rev 23742)
@@ -1,11 +1,11 @@
---- support/shlib-install.orig	2009-10-28 14:30:18.000000000 +0100
-+++ support/shlib-install	2011-11-05 19:06:58.000000000 +0100
-@@ -155,7 +155,7 @@
+--- support/shlib-install.orig	2018-08-18 13:22:02.536256000 -0400
++++ support/shlib-install	2018-08-18 13:22:15.180491000 -0400
+@@ -178,7 +178,7 @@
+ 	fi
+ 	;;
  
- 
- # FreeBSD 3.x and above can have either a.out or ELF shared libraries
--freebsd3*|freebsdaout*)
-+freebsd3.*|freebsdaout*)
- 	if [ -x /usr/bin/objformat ] && [ "`/usr/bin/objformat`" = "elf" ]; then
- 		# libname.so -> libname.so.M
- 		${echo} ${RM} ${INSTALLDIR}/$LINK1
+-freebsd[4-9]*|freebsd1[0-9]*|freebsdelf*|dragonfly*)
++freebsd[4-9]*|freebsd1[0-9]*|freebsdelf*|dragonfly*|midnightbsd*)
+ 	# libname.so -> libname.so.M
+ 	${echo} ${RM} ${INSTALLDIR}/$LINK1
+ 	if [ -z "$uninstall" ]; then

Modified: trunk/devel/readline/files/patch-support-shobj-conf
===================================================================
--- trunk/devel/readline/files/patch-support-shobj-conf	2018-08-18 17:08:42 UTC (rev 23741)
+++ trunk/devel/readline/files/patch-support-shobj-conf	2018-08-18 17:25:13 UTC (rev 23742)
@@ -1,6 +1,6 @@
---- support/shobj-conf.orig	2009-10-28 14:20:21.000000000 +0100
-+++ support/shobj-conf	2011-11-05 18:02:22.000000000 +0100
-@@ -118,7 +118,7 @@
+--- support/shobj-conf.orig	2014-02-23 21:06:29.000000000 -0500
++++ support/shobj-conf	2018-08-18 13:17:57.475358000 -0400
+@@ -132,7 +132,7 @@
  	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
  	;;
  
@@ -9,7 +9,7 @@
  	SHOBJ_CFLAGS=-fpic
  	SHOBJ_LD=ld
  	SHOBJ_LDFLAGS='-x -Bshareable'
-@@ -128,25 +128,18 @@
+@@ -142,25 +142,18 @@
  	;;
  
  # FreeBSD-3.x ELF
@@ -32,7 +32,8 @@
  	;;
  
  # FreeBSD-4.x and later have only ELF
- freebsd[4-9]*|freebsd1[0-9]*|freebsdelf*|dragonfly*)
+-freebsd[4-9]*|freebsd1[0-9]*|freebsdelf*|dragonfly*)
++freebsd[4-9]*|freebsd1[0-9]*|freebsdelf*|dragonfly*|midnightbsd*)
  	SHOBJ_CFLAGS=-fPIC
  	SHOBJ_LD='${CC}'