From 60bea3b31b3ab3f926341c31ecff680601013b76 Mon Sep 17 00:00:00 2001
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Wed, 23 Jul 2014 20:33:34 +0000
Subject: [PATCH] Remove patches added together with USES=libtool that are no
 longer needed after r362656.

---
 .../mjpegtools/files/patch-lavtools__Makefile.in  | 11 -----------
 .../mjpegtools/files/patch-y4mutils__Makefile.in  | 15 ---------------
 security/heimdal/Makefile                         |  2 --
 textproc/aiksaurus/Makefile                       |  4 ----
 textproc/stardict3/Makefile                       |  2 --
 www/libepc/Makefile                               |  7 -------
 6 files changed, 41 deletions(-)
 delete mode 100644 multimedia/mjpegtools/files/patch-lavtools__Makefile.in
 delete mode 100644 multimedia/mjpegtools/files/patch-y4mutils__Makefile.in

diff --git a/multimedia/mjpegtools/files/patch-lavtools__Makefile.in b/multimedia/mjpegtools/files/patch-lavtools__Makefile.in
deleted file mode 100644
index ae54d4089d8d..000000000000
--- a/multimedia/mjpegtools/files/patch-lavtools__Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- lavtools/Makefile.in.orig
-+++ lavtools/Makefile.in
-@@ -524,7 +524,7 @@
- lav2yuv_SOURCES = lav2yuv.c lav_common.c
- lav2yuv_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDV_CFLAGS)
- lav2yuv_LDADD = $(LIBMJPEGUTILS) \
--		liblavfile.la liblavjpeg.la
-+		liblavfile.la liblavjpeg.la $(LIBDV_LIBS)
- 
- jpeg2yuv_SOURCES = jpeg2yuv.c
- jpeg2yuv_CPPFLAGS = $(AM_CPPFLAGS) $(JPEG_CFLAGS)
diff --git a/multimedia/mjpegtools/files/patch-y4mutils__Makefile.in b/multimedia/mjpegtools/files/patch-y4mutils__Makefile.in
deleted file mode 100644
index 147f406d07c0..000000000000
--- a/multimedia/mjpegtools/files/patch-y4mutils__Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
---- y4mutils/Makefile.in.orig
-+++ y4mutils/Makefile.in
-@@ -334,10 +334,10 @@
- y4minterlace_LDADD = $(LIBMJPEGUTILS)
- @HAVE_LIBQUICKTIME_TRUE@y4mtoqt_SOURCES = y4mtoqt.c
- @HAVE_LIBQUICKTIME_TRUE@y4mtoqt_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/lavtools $(LIBQUICKTIME_CFLAGS)
--@HAVE_LIBQUICKTIME_TRUE@y4mtoqt_LDADD = $(LIBMJPEGUTILS) $(top_builddir)/lavtools/liblavfile.la
-+@HAVE_LIBQUICKTIME_TRUE@y4mtoqt_LDADD = $(LIBMJPEGUTILS) $(top_builddir)/lavtools/liblavfile.la $(LIBQUICKTIME_LIBS)
- @HAVE_LIBQUICKTIME_TRUE@qttoy4m_SOURCES = qttoy4m.c
- @HAVE_LIBQUICKTIME_TRUE@qttoy4m_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/lavtools $(LIBQUICKTIME_CFLAGS)
--@HAVE_LIBQUICKTIME_TRUE@qttoy4m_LDADD = $(LIBMJPEGUTILS) $(top_builddir)/lavtools/liblavfile.la
-+@HAVE_LIBQUICKTIME_TRUE@qttoy4m_LDADD = $(LIBMJPEGUTILS) $(top_builddir)/lavtools/liblavfile.la $(LIBQUICKTIME_LIBS)
- y4mtoyuv_SOURCES = y4mtoyuv.c
- y4mtoyuv_LDADD = $(LIBMJPEGUTILS)
- yuv4mpeg_SOURCES = yuv4mpeg.c
diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index 3b815b54d8f4..2317303ad07c 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -103,8 +103,6 @@ post-patch:
 .endif
 	@${REINPLACE_CMD} -e 's|$$ac_cv_header_fnmatch_h|yes|' \
 		${WRKSRC}/configure
-	@${REINPLACE_CMD} '/^kgetcred_LDADD =/s/$$/ $$(LIB_libintl)/' \
-		${WRKSRC}/kuser/Makefile.in
 	@${REINPLACE_CMD} -e 's|@LDFLAGS@|@LDFLAGS@ \$$\(PTHREADS_LIBADD\)|g' \
 		${WRKSRC}/lib/ipc/Makefile.in
 
diff --git a/textproc/aiksaurus/Makefile b/textproc/aiksaurus/Makefile
index b8da9cab1d17..3cdc3ffbfbf2 100644
--- a/textproc/aiksaurus/Makefile
+++ b/textproc/aiksaurus/Makefile
@@ -18,8 +18,4 @@ USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS?=--without-gtk
 
-post-patch:
-	@${REINPLACE_CMD} '/^gaiksaurus_LDADD =/s/$$/ $$(GTK_LIBS)/' \
-		${WRKSRC}/gtk/src/Makefile.in
-
 .include <bsd.port.mk>
diff --git a/textproc/stardict3/Makefile b/textproc/stardict3/Makefile
index d1b377cd3831..8deb12899673 100644
--- a/textproc/stardict3/Makefile
+++ b/textproc/stardict3/Makefile
@@ -54,8 +54,6 @@ post-patch:
 .endif
 	@${REINPLACE_CMD} -e 's,/usr/share,${PREFIX}/share,g' \
 		${WRKSRC}/dict/src/conf.cpp
-	@${REINPLACE_CMD} '/^stardict_LDADD =/s/$$/ -lgmodule-2.0/' \
-		${WRKSRC}/dict/src/Makefile.in
 
 pre-configure:
 	cd ${WRKSRC}/lib && \
diff --git a/www/libepc/Makefile b/www/libepc/Makefile
index 2b872d90d459..d0d5a3564855 100644
--- a/www/libepc/Makefile
+++ b/www/libepc/Makefile
@@ -22,11 +22,4 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--enable-static
 
-post-patch:
-	@${REINPLACE_CMD} \
-		-e '/^examples_server_credentials_LDADD =/s/$$/ $$(LIBEPC_UI_LIBS)/' \
-		-e '/^examples_service_browser_LDADD =/s/$$/ $$(LIBEPC_LIBS)/' \
-		-e '/^tests_test_progress_hooks_LDADD =/s/$$/ $$(LIBEPC_UI_LIBS)/' \
-		${WRKSRC}/Makefile.in
-
 .include <bsd.port.mk>