Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 20 May 2014 19:41:33 +0000 (UTC)
From:      Tijl Coosemans <tijl@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r354674 - head/net-im/libpurple
Message-ID:  <201405201941.s4KJfXEs051526@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tijl
Date: Tue May 20 19:41:32 2014
New Revision: 354674
URL: http://svnweb.freebsd.org/changeset/ports/354674
QAT: https://qat.redports.org/buildarchive/r354674/

Log:
  - Remove "${FIND} ${WRKSRC} -type f | ${XARGS} ${TOUCH}" from post-patch.
    It was added to prevent running autotools in a previous version of the
    port but is no longer needed and may actually cause autotools to run
    because not all files get the same timestamp.
  - Remove some other things from older versions.
  
  Reported by:	many
  PR:		ports/189938

Modified:
  head/net-im/libpurple/Makefile

Modified: head/net-im/libpurple/Makefile
==============================================================================
--- head/net-im/libpurple/Makefile	Tue May 20 19:35:30 2014	(r354673)
+++ head/net-im/libpurple/Makefile	Tue May 20 19:41:32 2014	(r354674)
@@ -20,10 +20,6 @@ CONFIGURE_ARGS?=--disable-gtkui \
 		--with-dynamic-prpls=${PRPL_MODULES:S/,$//} \
 		--enable-static \
 		--disable-nm
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
-		PTHREAD_LIB="${PTHREAD_LIBS}"
-CFLAGS+=	-D_XOPEN_SOURCE_EXTENDED
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 
 .if !defined(PIDGIN_SLAVE)
 # Pidgin slave ports that require the following functionality, must explicitly
@@ -83,8 +79,6 @@ PLIST_SUB+=	CONSOLEUI=""
 PLIST_SUB+=	CONSOLEUI="@comment not installed: "
 .endif
 
-OPTIONSFILE=	${PORT_DBDIR}/${UNIQUENAME}/options
-
 CONFIGURE_ARGS+=--disable-doxygen
 
 .include <bsd.port.options.mk>
@@ -319,24 +313,13 @@ pre-everything::
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthreads|${PTHREAD_LIBS:S/"//g}|g' \
-		-e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
-		-e 's|-lpanel |-lpanel -lncurses|g' \
+	@${REINPLACE_CMD} \
 		-e 's|-lpthread|${PTHREAD_LIBS:S/"//g}|g' \
 		-e 's|-lsilc -lsilcclient ${PTHREAD_LIBS} $$LIBDL|-lsilc -lsilcclient ${PTHREAD_LIBS} ${ICONV_LIB}|' \
-		-e 's|TCL_VERSION found but 8.3 required|TCL_VERSION found but ${TCL_VER} required|g' \
-		-e 's|TCL_MINOR_VERSION" -ne 3|TCL_MINOR_VERSION" -ne ${TCL_VER:E}|' \
 			${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|/bin/bash|${SH}|' \
-			${WRKSRC}/libpurple/purple-send \
-			${WRKSRC}/libpurple/purple-send-async
-	@${REINPLACE_CMD} -e 's|/python|/env python|' \
-	    		${WRKSRC}/libpurple/purple-remote \
-			${WRKSRC}/libpurple/purple-url-handler
 .if defined(PIDGIN_SLAVE)
 	@${FIND} ${BUILD_WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
 		's|$$(top_builddir)/libpurple/libpurple.la|-lpurple|'
 .endif
-	@${FIND} ${WRKSRC} -type f | ${XARGS} ${TOUCH}
 
 .include <bsd.port.post.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405201941.s4KJfXEs051526>