Date: Thu, 21 Mar 2013 09:46:03 +0000 (UTC) From: Koop Mast <kwm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r314832 - in head/net/opal3: . files Message-ID: <201303210946.r2L9k3dD018577@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kwm Date: Thu Mar 21 09:46:03 2013 New Revision: 314832 URL: http://svnweb.freebsd.org/changeset/ports/314832 Log: Remove stray BROKEN message, fix patching. Pointyhat to: kwm Modified: head/net/opal3/Makefile head/net/opal3/files/patch-Makefile.in Modified: head/net/opal3/Makefile ============================================================================== --- head/net/opal3/Makefile Thu Mar 21 09:28:29 2013 (r314831) +++ head/net/opal3/Makefile Thu Mar 21 09:46:03 2013 (r314832) @@ -137,7 +137,6 @@ CONFIGURE_ARGS+= --disable-h264 PLIST_SUB+= X264="@comment " .endif -BROKEN=chekc ffmpeg .if ${PORT_OPTIONS:MFFMPEG} LIB_DEPENDS+= avcodec:${PORTSDIR}/multimedia/ffmpeg CONFIGURE_ARGS+= --enable-ffmpeg --enable-ffmpeg-h263 @@ -267,7 +266,6 @@ post-patch: @${REINPLACE_CMD} -e 's?^EXTRALIBS = $(ILBC_LIBS)?EXTRALIBS = $(ILBC_LIBS) -L/usr/local/lib?' ${WRKSRC}/plugins/audio/iLBC/Makefile.in @${REINPLACE_CMD} -e 's?ILBC_CFLAGS=""?ILBC_CFLAGS="-L/usr/local/lib"?' ${WRKSRC}/plugins/configure @${REINPLACE_CMD} -e 's?^\(EXTRALIBS\)\(.*\)?\1\2 -L/usr/local/lib?' ${WRKSRC}/plugins/fax/fax_spandsp/Makefile.in -# @${REINPLACE_CMD} -e 's?/pkgconfig?data/pkgconfig?g' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's?@@SO_VER@@?'${PORTVERSION:C/.[0-9]+$//g}'.so.'${PORTVERSION:C/^[0-9]+.[0-9]+.//}'?g' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's?@@SO_MAJ@@?'${PORTVERSION:C/.[0-9]+$//g}'.so?g' ${WRKSRC}/Makefile.in .if ! ${PORT_OPTIONS:MDEBUG} Modified: head/net/opal3/files/patch-Makefile.in ============================================================================== --- head/net/opal3/files/patch-Makefile.in Thu Mar 21 09:28:29 2013 (r314831) +++ head/net/opal3/files/patch-Makefile.in Thu Mar 21 09:46:03 2013 (r314832) @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2009-09-11 02:47:07.000000000 +0400 -+++ Makefile.in 2009-09-11 03:06:15.000000000 +0400 -@@ -541,8 +541,9 @@ +--- Makefile.in.orig 2013-03-21 10:43:22.000000000 +0100 ++++ Makefile.in 2013-03-21 10:44:48.000000000 +0100 +@@ -549,8 +549,9 @@ install: mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir) $(INSTALL) -m 755 $(OPAL_LIBDIR)/$(LIB_FILENAME_STATIC) $(DESTDIR)$(libdir) @@ -9,6 +9,6 @@ + $(INSTALL) -m 755 $(OPAL_LIBDIR)/$(LIB_FILENAME_SHARED_PAT) $(DESTDIR)$(libdir)/$(RELEASE_LIB_NAME)-@@SO_VER@@ + ln -snf $(RELEASE_LIB_NAME)-@@SO_VER@@ $(DESTDIR)$(libdir)/$(RELEASE_LIB_NAME)-@@SO_MAJ@@ + ln -snf $(RELEASE_LIB_NAME)-@@SO_VER@@ $(DESTDIR)$(libdir)/$(RELEASE_LIB_NAME).so - mkdir -p $(DESTDIR)$(libdir)/pkgconfig ; chmod 755 $(DESTDIR)$(libdir)/pkgconfig - $(INSTALL) -m 644 opal.pc $(DESTDIR)$(libdir)/pkgconfig + mkdir -p $(DESTDIR)$(prefix)/libdata/pkgconfig ; chmod 755 $(DESTDIR)$(prefix)/libdata/pkgconfig + $(INSTALL) -m 644 opal.pc $(DESTDIR)$(prefix)/libdata/pkgconfig
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303210946.r2L9k3dD018577>