Attachment #81481 for bug #116687

View | Details | Raw Unified | Return to bug 116687
Collapse All | Expand All

Lines 7-12 Link Here

(-)devel/libedit/Makefile (-1 / +4 lines)
7		7
8	PORTNAME= libedit	8	PORTNAME= libedit
9	PORTVERSION= 2.6.10	9	PORTVERSION= 2.6.10
		10	PORTREVISION= 1
10	CATEGORIES= devel	11	CATEGORIES= devel
11	MASTER_SITES= ftp://ftp.astron.com/pub/libedit/ \	12	MASTER_SITES= ftp://ftp.astron.com/pub/libedit/ \
12	http://www.canonware.com/download/libedit/	13	http://www.canonware.com/download/libedit/
Lines 16-22 Link Here
16		17
17	GNU_CONFIGURE= yes	18	GNU_CONFIGURE= yes
18	USE_LDCONFIG= yes	19	USE_LDCONFIG= yes
19	CONFIGURE_ARGS= --disable-readline
20		20
21	MAN3= editline.3	21	MAN3= editline.3
22	MAN5= editrc.5	22	MAN5= editrc.5
Lines 39-44 Link Here
39	editline.3 history.3	39	editline.3 history.3
40	MANCOMPRESSED= no	40	MANCOMPRESSED= no
41		41
		42	post-extract:
		43	${MV} ${WRKSRC}/readline ${WRKSRC}/editline
		44
42	post-patch:	45	post-patch:
43	@${REINPLACE_CMD} -e 's\|CFLAGS -O\|CFLAGS\|g ; \	46	@${REINPLACE_CMD} -e 's\|CFLAGS -O\|CFLAGS\|g ; \
44	s\|MAJOR="2"\|MAJOR="6"\|g' ${WRKSRC}/configure	47	s\|MAJOR="2"\|MAJOR="6"\|g' ${WRKSRC}/configure




--- configure.orig	2006-11-24 18:13:57.000000000 +0100
+++ configure	2007-09-25 20:39:26.000000000 +0200
@@ -4601,7 +4601,7 @@
   LIB_S="libedit.so.$LIB_MAJOR"
   LIB_S_LINK="libedit.so"
   LIB_S_LINKS="$LIB_S $LIB_S_LINK"
-  S_LDFLAGS="-shared"
+  S_LDFLAGS="-shared -Wl,-soname=${LIB_S_LINK}.${LIB_MAJOR}"
 elif test "x$ABI" = "xaout" ; then
   LIB_S="libedit.so.$LIB_MAJOR.$LIB_MINOR"
   LIB_S_LINKS=
@@ -4623,17 +4623,9 @@
 
 if test "x$enable_readline" = "xyes" ; then
   CCSRCS="$CCSRCS readline.c"
-  IHDRS="$IHDRS readline/readline.h"
-  IHDR_LINKS="readline.h readline/history.h"
-  HDR_DIRS="$HDR_DIRS include/readline"
-  LIB_A_LINKS="$LIB_A_LINKS libedit.a libreadline.a"
-  if test "x$ABI" = "xelf" ; then
-    LIB_S_LINKS="$LIB_S_LINKS $LIB_S_LINK libreadline.so"
-  elif test "x$ABI" = "xaout" ; then
-    LIB_S_LINKS="$LIB_S_LINKS $LIB_S libreadline.so.$LIB_MAJOR.$LIB_MINOR"
-  elif test "x$ABI" = "xmacho" ; then
-    LIB_S_LINKS="$LIB_S_LINKS $LIB_S_LINK libreadline.dylib"
-  fi
+  IHDRS="$IHDRS editline/readline.h"
+  IHDR_LINKS="readline.h editline/history.h"
+  HDR_DIRS="$HDR_DIRS include/editline"
 fi
 
 case "${host}" in

Line 0 Link Here

(-)devel/libedit/files/patch-readline.c (+11 lines)
	1	--- readline.c.orig 2006-11-24 17:52:04.000000000 +0100
	2	+++ readline.c 2007-09-25 17:59:54.000000000 +0200
	3	@@ -61,7 +61,7 @@
	4	#include "el.h"
	5	#include "fcns.h" /* for EL_NUM_FCNS */
	6	#include "histedit.h"
	7	-#include "readline/readline.h"
	8	+#include "editline/readline.h"
	9	#include "filecomplete.h"
	10
	11	void rl_prep_terminal(int);

Lines 1-4 Link Here

(-)devel/libedit/pkg-plist (+3 lines)
		1	include/editline/history.h
		2	include/editline/readline.h
1	include/histedit.h	3	include/histedit.h
2	lib/libedit.a	4	lib/libedit.a
3	lib/libedit.so.6	5	lib/libedit.so.6
4	lib/libedit.so	6	lib/libedit.so
		7	@dirrm include/editline

Return to bug 116687

Line 0 Link Here

(-)devel/libedit/files/patch-configure (+32 lines)
	1	--- configure.orig 2006-11-24 18:13:57.000000000 +0100
	2	+++ configure 2007-09-25 20:39:26.000000000 +0200
	3	@@ -4601,7 +4601,7 @@
	4	LIB_S="libedit.so.$LIB_MAJOR"
	5	LIB_S_LINK="libedit.so"
	6	LIB_S_LINKS="$LIB_S $LIB_S_LINK"
	7	- S_LDFLAGS="-shared"
	8	+ S_LDFLAGS="-shared -Wl,-soname=${LIB_S_LINK}.${LIB_MAJOR}"
	9	elif test "x$ABI" = "xaout" ; then
	10	LIB_S="libedit.so.$LIB_MAJOR.$LIB_MINOR"
	11	LIB_S_LINKS=
	12	@@ -4623,17 +4623,9 @@
	13
	14	if test "x$enable_readline" = "xyes" ; then
	15	CCSRCS="$CCSRCS readline.c"
	16	- IHDRS="$IHDRS readline/readline.h"
	17	- IHDR_LINKS="readline.h readline/history.h"
	18	- HDR_DIRS="$HDR_DIRS include/readline"
	19	- LIB_A_LINKS="$LIB_A_LINKS libedit.a libreadline.a"
	20	- if test "x$ABI" = "xelf" ; then
	21	- LIB_S_LINKS="$LIB_S_LINKS $LIB_S_LINK libreadline.so"
	22	- elif test "x$ABI" = "xaout" ; then
	23	- LIB_S_LINKS="$LIB_S_LINKS $LIB_S libreadline.so.$LIB_MAJOR.$LIB_MINOR"
	24	- elif test "x$ABI" = "xmacho" ; then
	25	- LIB_S_LINKS="$LIB_S_LINKS $LIB_S_LINK libreadline.dylib"
	26	- fi
	27	+ IHDRS="$IHDRS editline/readline.h"
	28	+ IHDR_LINKS="readline.h editline/history.h"
	29	+ HDR_DIRS="$HDR_DIRS include/editline"
	30	fi
	31
	32	case "${host}" in