sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-17 17:29:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Don't bother patching the configure output.

Browse source 
* Don't patch configure.ac (which triggers an automake run that clobbers
  the effects of USE_GNOME=gnomehack).
* Don't install the documentation a second time in post-install.

gnomehack now correctly takes care of pkgconfig, and htmldocdir is
overridden from MAKE_ARGS.

Reported by:	Mamoru Iwaki <1wkmmr@gmail.com>
This commit is contained in:
Christian Weisgerber 2011-08-31 10:39:50 +00:00
parent d2b93068f0
commit 0d3d766872
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=280837
3 changed files with 2 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
audio/libsamplerate/Makefile
View file

@ -7,6 +7,7 @@
PORTNAME= libsamplerate
PORTVERSION= 0.1.8
PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://www.mega-nerd.com/SRC/
@ -22,13 +23,6 @@ LIB_DEPENDS+= sndfile.1:${PORTSDIR}/audio/libsndfile \
USE_GNOME= gnomehack pkgconfig
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
post-install:
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/doc/*.css ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/doc/*.png ${DOCSDIR}
.endif
MAKE_ARGS= htmldocdir=${PREFIX}/share/doc/libsamplerate
.include <bsd.port.mk>

40
audio/libsamplerate/files/patch-configure
View file

@ -1,40 +0,0 @@
--- configure.orig 2011-08-24 08:46:26.000000000 -0300
+++ configure 2011-08-24 08:47:26.000000000 -0300
@@ -17137,12 +17137,12 @@
;;
esac
-htmldocdir=$prefix/share/doc/libsamplerate0-dev/html
+htmldocdir=$prefix/share/doc/libsamplerate
if test $prefix = "NONE" ; then
- htmldocdir=/usr/local/share/doc/libsamplerate0-dev/html
+ htmldocdir=/usr/local/share/doc/libsamplerate
else
- htmldocdir=$prefix/share/doc/libsamplerate0-dev/html
+ htmldocdir=$prefix/share/doc/libsamplerate
fi
#====================================================================================
@@ -20124,18 +20124,18 @@
Library directory : ........... ${prefix}/lib
Program directory : ........... ${prefix}/bin
- Pkgconfig directory : ......... ${prefix}/lib/pkgconfig
+ Pkgconfig directory : ......... ${prefix}/libdata/pkgconfig
" >&5
$as_echo " Installation directories :
Library directory : ........... ${prefix}/lib
Program directory : ........... ${prefix}/bin
- Pkgconfig directory : ......... ${prefix}/lib/pkgconfig
+ Pkgconfig directory : ......... ${prefix}/libdata/pkgconfig
" >&6; }
if test x$prefix != "x/usr" ; then
echo "Compiling some other packages against ${PACKAGE} may require "
- echo -e "the addition of \"${prefix}/lib/pkgconfig\" to the "
+ echo -e "the addition of \"${prefix}/libdata/pkgconfig\" to the "
echo -e "PKG_CONFIG_PATH environment variable.\n"
fi

33
audio/libsamplerate/files/patch-configure.ac
View file

@ -1,33 +0,0 @@
--- configure.ac.orig 2011-08-24 08:46:32.000000000 -0300
+++ configure.ac 2011-08-24 08:48:08.000000000 -0300
@@ -262,12 +262,12 @@
;;
esac
-htmldocdir=$prefix/share/doc/libsamplerate0-dev/html
+htmldocdir=$prefix/share/doc/libsamplerate/html
if test $prefix = "NONE" ; then
- htmldocdir=/usr/local/share/doc/libsamplerate0-dev/html
+ htmldocdir=/usr/local/share/doc/libsamplerate
else
- htmldocdir=$prefix/share/doc/libsamplerate0-dev/html
+ htmldocdir=$prefix/share/doc/libsamplerate
fi
#====================================================================================
@@ -331,12 +331,12 @@
Library directory : ........... ${prefix}/lib
Program directory : ........... ${prefix}/bin
- Pkgconfig directory : ......... ${prefix}/lib/pkgconfig
+ Pkgconfig directory : ......... ${prefix}/libdata/pkgconfig
])
if test x$prefix != "x/usr" ; then
echo "Compiling some other packages against ${PACKAGE} may require "
- echo -e "the addition of \"${prefix}/lib/pkgconfig\" to the "
+ echo -e "the addition of \"${prefix}/libdata/pkgconfig\" to the "
echo -e "PKG_CONFIG_PATH environment variable.\n"
fi