ports/176773: [PATCH] devel/libffi - install to standard path

[Zhihao Yuan]

>Number:         176773
>Category:       ports
>Synopsis:       [PATCH] devel/libffi - install to standard path
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Mar 09 01:40:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Zhihao Yuan
>Release:        FreeBSD 8.3-STABLE amd64
>Organization:
Rackspace Inc.
>Environment:
System: FreeBSD elitebook.hp 8.3-STABLE FreeBSD 8.3-STABLE #8 r247905: Thu Mar 7 01:25:21 EST 2013 lichray at elitebook.hp:/usr/obj/usr/src/sys/HOUKAGO amd64


	
>Description:
	This port is currently broken, because the pkg-plist does not
	match.  It actually installs libs to /usr/local/lib/x86_64

	
>How-To-Repeat:
	
>Fix:
	I moved both header files and libs to the standard paths.
	Need to use /usr/ports/UPDATING to inform users to update
	everything.

	

--- libffi_1.patch begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 313675)
+++ Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	libffi
 PORTVERSION=	3.0.12
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	SOURCEWARE
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -31,12 +32,6 @@
 
 MAN3=		ffi.3 ffi_call.3 ffi_prep_cif.3 ffi_prep_cif_var.3
 
-post-install:
-	@${LN} -sf ../lib/libffi-${PORTVERSION}/include/ffi.h \
-	    ${PREFIX}/include/
-	@${LN} -sf ../lib/libffi-${PORTVERSION}/include/ffitarget.h \
-	    ${PREFIX}/include/
-
 regression-test: build
 	@cd ${WRKSRC} && ${MAKE} check
 
Index: files/patch-configure
===================================================================
--- files/patch-configure	(revision 0)
+++ files/patch-configure	(working copy)
@@ -0,0 +1,14 @@
+--- configure~	2013-03-08 19:21:15.061491684 -0500
++++ configure	2013-03-08 19:22:04.160562821 -0500
+@@ -14826,11 +14826,6 @@ if test "x$GCC" = "xyes"; then
+     toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
+     toolexeclibdir='$(libdir)'
+   fi
+-  multi_os_directory=`$CC -print-multi-os-directory`
+-  case $multi_os_directory in
+-    .) ;; # Avoid trailing /.
+-    *) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
+-  esac
+ 
+ else
+   toolexeclibdir='$(libdir)'
Index: files/patch-include_Makefile.in
===================================================================
--- files/patch-include_Makefile.in	(revision 0)
+++ files/patch-include_Makefile.in	(working copy)
@@ -0,0 +1,11 @@
+--- ./include/Makefile.in.orig	2013-03-08 20:05:36.399293547 -0500
++++ ./include/Makefile.in	2013-03-08 20:11:58.496584139 -0500
+@@ -250,7 +250,7 @@ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = foreign
+ DISTCLEANFILES = ffitarget.h
+ EXTRA_DIST = ffi.h.in ffi_common.h
+-includesdir = $(libdir)/@PACKAGE_NAME at -@PACKAGE_VERSION@/include
++includesdir = @includedir@
+ nodist_includes_HEADERS = ffi.h ffitarget.h
+ all: all-am
+ 
Index: files/patch-libffi.pc.in
===================================================================
--- files/patch-libffi.pc.in	(revision 0)
+++ files/patch-libffi.pc.in	(working copy)
@@ -0,0 +1,11 @@
+--- libffi.pc.in~	2013-02-11 14:24:18.000000000 -0500
++++ libffi.pc.in	2013-03-08 17:39:40.867524670 -0500
+@@ -1,7 +1,7 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+-includedir=${libdir}/@PACKAGE_NAME at -@PACKAGE_VERSION@/include
++includedir=@includedir@
+ 
+ Name: @PACKAGE_NAME@
+ Description: Library supporting Foreign Function Interfaces
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 313675)
+++ pkg-plist	(working copy)
@@ -1,11 +1,7 @@
 include/ffi.h
 include/ffitarget.h
-lib/libffi-%%PORTVERSION%%/include/ffi.h
-lib/libffi-%%PORTVERSION%%/include/ffitarget.h
 lib/libffi.a
 lib/libffi.la
 lib/libffi.so
 lib/libffi.so.6
 libdata/pkgconfig/libffi.pc
- at dirrm lib/libffi-%%PORTVERSION%%/include
- at dirrm lib/libffi-%%PORTVERSION%%
--- libffi_1.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: