- Fix libtool use (add -rpath)

- Use COPYTREE_SHARE to install include headers
- Add dos2unix so the patch can have svn:eol-style native

3 files changed, 31 insertions, 28 deletions

diff --git a/audio/libnoise/Makefile b/audio/libnoise/Makefile
index a88cb28fbf25..c714dfd1b374 100644
--- a/audio/libnoise/Makefile
+++ b/audio/libnoise/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libnoise
 DISTVERSION=	1.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20sources/${PORTVERSION}
 DISTNAME=	${PORTNAME}src-${DISTVERSION}
@@ -12,7 +12,8 @@ EXTRACT_SUFX=	.zip
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Generates three-dimensional coherent noise
 
-USES=		gmake libtool:build zip
+USES=		dos2unix gmake libtool:build zip
+DOS2UNIX_FILES=	${WRKSRC}/src/Makefile
 USE_LDCONFIG=	yes
 CXXFLAGS+=	-O3 -fomit-frame-pointer
 WRKSRC=		${WRKDIR}/noise
@@ -24,12 +25,11 @@ post-patch:
 		${WRKSRC}/Makefile
 
 do-install:
-	${CP} -R ${WRKSRC}/src/${PORTNAME}.* ${STAGEDIR}${PREFIX}/lib/
-	${INSTALL_LIB} ${WRKSRC}/src/.libs/${PORTNAME}.so.* ${STAGEDIR}${PREFIX}/lib/
-	@${INSTALL} -d ${STAGEDIR}${PREFIX}/include/noise
-	${CP} -R ${WRKSRC}/include/ ${STAGEDIR}${PREFIX}/include/noise/
+	${MKDIR} ${STAGEDIR}${PREFIX}/lib
+	(cd ${WRKSRC}/src && ${LOCALBASE}/bin/libtool --mode=install \
+		${INSTALL_LIB} libnoise.la ${STAGEDIR}${PREFIX}/lib)
+	(cd ${WRKSRC}/include && \
+		${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/noise)
 	${RM} -f ${STAGEDIR}${PREFIX}/include/noise/Makefile
-#	This line is here to preserve the old behavior of the port.
-	${LN} -sf libnoise.so.0 ${STAGEDIR}${PREFIX}/lib/libnoise.so.0.3
 
 .include <bsd.port.mk>
diff --git a/audio/libnoise/files/patch-src_Makefile b/audio/libnoise/files/patch-src_Makefile
index 6bf567fbb7d4..5ab2fdcd73e3 100644
--- a/audio/libnoise/files/patch-src_Makefile
+++ b/audio/libnoise/files/patch-src_Makefile
@@ -1,19 +1,22 @@
---- src/Makefile.orig	2004-10-24 21:21:12.000000000 +0200
-+++ src/Makefile	2009-07-16 11:31:48.000000000 +0200
-@@ -12,12 +12,12 @@
- 

- # hooks for future makefiles being able to make multiple SOs, or older SOs

- libnoise: libnoise.so libnoise.a libnoise.la

--libnoise.so: libnoise.so.0

--libnoise.so.0: libnoise.so.0.3

-+#libnoise.so: libnoise.so.0

-+#libnoise.so.0: libnoise.so.0.3

- 

- # Real build targets

--libnoise.so.0.3: $(OBJECTS)

--	$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -shared -Wl,-soname=libnoise.so.0 -o $@ $(OBJECTS:.o=.lo)

-+libnoise: $(OBJECTS)

-+	$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -shared -o $@.la $(OBJECTS:.o=.lo) -rpath %%LOCALBASE%%/lib

- 

- libnoise.a: $(OBJECTS)

- 	$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $(OBJECTS)

+--- src/Makefile.orig	2014-09-15 11:57:34 UTC
++++ src/Makefile
+@@ -11,7 +11,7 @@
+ .PHONY: all clean cleandeps cleanobjs cleanlib libnoise libnoise.so libnoise.so.0
+ 
+ # hooks for future makefiles being able to make multiple SOs, or older SOs
+-libnoise: libnoise.so libnoise.a libnoise.la
++libnoise: libnoise.la
+ libnoise.so: libnoise.so.0
+ libnoise.so.0: libnoise.so.0.3
+ 
+@@ -21,8 +21,8 @@
+ 
+ libnoise.a: $(OBJECTS)
+ 	$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $(OBJECTS)
+-libnoise.la: $(OBJECTS)
+-	$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $(OBJECTS:.o=.lo)
++libnoise.la: $(OBJECTS:.o=.lo)
++	$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -rpath $(PREFIX)/lib -o $@ $(OBJECTS:.o=.lo)
+ 
+ clean:	cleandeps cleanobjs cleanlib
+ cleandeps:
diff --git a/audio/libnoise/pkg-plist b/audio/libnoise/pkg-plist
index 49589a46a82e..7e044c8b3ca6 100644
--- a/audio/libnoise/pkg-plist
+++ b/audio/libnoise/pkg-plist
@@ -43,8 +43,8 @@ include/noise/noise.h
 include/noise/noisegen.h
 include/noise/vectortable.h
 lib/libnoise.a
+lib/libnoise.so
 lib/libnoise.so.0
-lib/libnoise.so.0.3
 @dirrm include/noise/model
 @dirrm include/noise/module
 @dirrm include/noise