svn commit: r368262 - in head/audio/libnoise: . files
Tijl Coosemans
tijl at FreeBSD.org
Mon Sep 15 12:02:29 UTC 2014
Author: tijl
Date: Mon Sep 15 12:02:28 2014
New Revision: 368262
URL: http://svnweb.freebsd.org/changeset/ports/368262
QAT: https://qat.redports.org/buildarchive/r368262/
Log:
- Fix libtool use (add -rpath)
- Use COPYTREE_SHARE to install include headers
- Add dos2unix so the patch can have svn:eol-style native
Modified:
head/audio/libnoise/Makefile
head/audio/libnoise/files/patch-src_Makefile (contents, props changed)
head/audio/libnoise/pkg-plist
Modified: head/audio/libnoise/Makefile
==============================================================================
--- head/audio/libnoise/Makefile Mon Sep 15 11:34:47 2014 (r368261)
+++ head/audio/libnoise/Makefile Mon Sep 15 12:02:28 2014 (r368262)
@@ -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 at 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>
Modified: head/audio/libnoise/files/patch-src_Makefile
==============================================================================
--- head/audio/libnoise/files/patch-src_Makefile Mon Sep 15 11:34:47 2014 (r368261)
+++ head/audio/libnoise/files/patch-src_Makefile Mon Sep 15 12:02:28 2014 (r368262)
@@ -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:
Modified: head/audio/libnoise/pkg-plist
==============================================================================
--- head/audio/libnoise/pkg-plist Mon Sep 15 11:34:47 2014 (r368261)
+++ head/audio/libnoise/pkg-plist Mon Sep 15 12:02:28 2014 (r368262)
@@ -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
More information about the svn-ports-head
mailing list