Attachment #56383 for bug #85120




#

PORTNAME=	libelf
PORTVERSION=	0.8.6
PORTREVISION=	1
CATEGORIES=	devel
MASTER_SITES=	http://www.mr511.de/software/ \
		${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR=	libs .

MAINTAINER=	roam@FreeBSD.org

USE_GETTEXT=	yes

NOMAN=		defined

USE_REINPLACE=	yes

FILES_TO_PATCH=lib/32.fsize.c lib/64.xlatetof.c lib/cook.c lib/gelf.h lib/gelftrans.c

post-patch:
	@(cd ${WRKSRC} && ${REINPLACE_CMD} \
	-e 's/Elf64_Xword/Elf64_Word/g' \
	-e 's/Elf64_Sxword/Elf64_Sword/g' \
	${FILES_TO_PATCH})

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)libelf/distinfo (-2 / +2 lines)
1	MD5 (libelf-0.8.5.tar.gz) = c1daf069367871350ece779b7de20047	1	MD5 (libelf-0.8.6.tar.gz) = d444fb0068cdfed01bb1fd1e91d29270
2	SIZE (libelf-0.8.5.tar.gz) = 132111	2	SIZE (libelf-0.8.6.tar.gz) = 144198

Line 0 Link Here

(-)libelf/files/patch-Makefile.in (+11 lines)
	1	--- Makefile.in.orig Fri Aug 19 16:51:51 2005
	2	+++ Makefile.in Fri Aug 19 16:52:13 2005
	3	@@ -23,7 +23,7 @@
	4	exec_prefix = @exec_prefix@
	5	libdir = @libdir@
	6
	7	-pkgdir = $(libdir)/pkgconfig
	8	+pkgdir = $(prefix)/libdata/pkgconfig
	9
	10	MV = mv -f
	11	RM = rm -f




--- configure.orig	Fri Aug 19 16:00:37 2005
+++ configure	Fri Aug 19 16:05:31 2005
@@ -1142,7 +1142,7 @@
--- configure.old	Sun Dec 14 14:11:54 2003
+++ configure	Sun Dec 14 14:13:28 2003
@@ -1139,7 +1139,7 @@
 
 fi
 
-for ac_hdr in unistd.h stdint.h fcntl.h
+for ac_hdr in unistd.h stdint.h fcntl.h elf.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -3218,7 +3218,7 @@
 fi
 
     case "$host" in

 	if test "$GCC" = yes; then
 	  
   
@@ -3273,13 +3273,12 @@
 	    PICFLAGS='-fPIC -DPIC'
 	    if test "$mr_enable_gnu_names" = yes
 	    then SHLIB_SFX='-$(VERSION).so'
-	    else SHLIB_SFX='.so.$(VERSION)'
+	    else SHLIB_SFX='.so.$(MAJOR)'
 	    fi
 	    SHLINK_SFX='.so'
 	    SONAME_SFX='.so.$(MAJOR)'

Lines 6-10 Link Here

(-)libelf/pkg-plist (+1 lines)
6	lib/libelf.a	6	lib/libelf.a
7	lib/libelf.so	7	lib/libelf.so
8	lib/libelf.so.%%LIBVER%%	8	lib/libelf.so.%%LIBVER%%
		9	libdata/pkgconfig/libelf.pc
9	share/locale/de/LC_MESSAGES/libelf.mo	10	share/locale/de/LC_MESSAGES/libelf.mo
10	@dirrm include/libelf	11	@dirrm include/libelf

Return to bug 85120

Lines 6-16 Link Here

(-)libelf/Makefile (-4 / +13 lines)
6	#	6	#
7		7
8	PORTNAME= libelf	8	PORTNAME= libelf
9	PORTVERSION= 0.8.5	9	PORTVERSION= 0.8.6
10	PORTREVISION= 1
11	CATEGORIES= devel	10	CATEGORIES= devel
12	MASTER_SITES= ${MASTER_SITE_SUNSITE} \	11	MASTER_SITES= http://www.mr511.de/software/ \
13	http://www.mr511.de/software/	12	${MASTER_SITE_SUNSITE}
14	MASTER_SITE_SUBDIR= libs .	13	MASTER_SITE_SUBDIR= libs .
15		14
16	MAINTAINER= roam@FreeBSD.org	15	MAINTAINER= roam@FreeBSD.org
Lines 25-29 Link Here
25	USE_GETTEXT= yes	24	USE_GETTEXT= yes
26		25
27	NOMAN= defined	26	NOMAN= defined
		27
		28	USE_REINPLACE= yes
		29
		30	FILES_TO_PATCH=lib/32.fsize.c lib/64.xlatetof.c lib/cook.c lib/gelf.h lib/gelftrans.c
		31
		32	post-patch:
		33	@(cd ${WRKSRC} && ${REINPLACE_CMD} \
		34	-e 's/Elf64_Xword/Elf64_Word/g' \
		35	-e 's/Elf64_Sxword/Elf64_Sword/g' \
		36	${FILES_TO_PATCH})
28		37
29	.include <bsd.port.mk>	38	.include <bsd.port.mk>

Lines 1-18 Link Here

(-)libelf/files/patch-configure (-15 / +12 lines)
1		1	--- configure.orig Fri Aug 19 16:00:37 2005
2	$FreeBSD: ports/devel/libelf/files/patch-configure,v 1.4 2003/12/14 14:35:46 roam Exp $	2	+++ configure Fri Aug 19 16:05:31 2005
3		3	@@ -1142,7 +1142,7 @@
4	--- configure.old Sun Dec 14 14:11:54 2003
5	+++ configure Sun Dec 14 14:13:28 2003
6	@@ -1139,7 +1139,7 @@
7		4
8	fi	5	fi
9		6
10	-for ac_hdr in unistd.h fcntl.h elf.h sys/elf.h link.h sys/link.h	7	-for ac_hdr in unistd.h stdint.h fcntl.h
11	+for ac_hdr in unistd.h fcntl.h sys/elf.h link.h sys/link.h	8	+for ac_hdr in unistd.h stdint.h fcntl.h elf.h
12	do	9	do
13	ac_safe=`echo "$ac_hdr" \| sed 'y%./+-%__p_%'`	10	ac_safe=`echo "$ac_hdr" \| sed 'y%./+-%__p_%'`
14	echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6	11	echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
15	@@ -3055,7 +3055,7 @@	12	@@ -3218,7 +3218,7 @@
16	fi	13	fi
17		14
18	case "$host" in	15	case "$host" in
Lines 21-32 Link Here
21	if test "$GCC" = yes; then	18	if test "$GCC" = yes; then
22		19
23		20
24	@@ -3112,13 +3112,12 @@	21	@@ -3273,13 +3273,12 @@
25	then	22	PICFLAGS='-fPIC -DPIC'
26	SHLIB_SFX='-$(VERSION).so'	23	if test "$mr_enable_gnu_names" = yes
27	else	24	then SHLIB_SFX='-$(VERSION).so'
28	- SHLIB_SFX='.so.$(VERSION)'	25	- else SHLIB_SFX='.so.$(VERSION)'
29	+ SHLIB_SFX='.so.$(MAJOR)'	26	+ else SHLIB_SFX='.so.$(MAJOR)'
30	fi	27	fi
31	SHLINK_SFX='.so'	28	SHLINK_SFX='.so'
32	SONAME_SFX='.so.$(MAJOR)'	29	SONAME_SFX='.so.$(MAJOR)'