- Fix build on AMD (hopefully)

- Remove extra-patch in favour of USE_LIBTOOL
- Remove two-line plist

PR:		ports/77563
Submitted by:	Kay Lehmann (maintainer)

4 files changed, 14 insertions, 21 deletions

diff --git a/sysutils/lineak-defaultplugin/Makefile b/sysutils/lineak-defaultplugin/Makefile
index 91229c7fcfc4..520fb47ea89b 100644
--- a/sysutils/lineak-defaultplugin/Makefile
+++ b/sysutils/lineak-defaultplugin/Makefile
@@ -17,6 +17,7 @@ COMMENT=	Default plugins for lineakd
 
 LIB_DEPENDS=	lineak.8:${PORTSDIR}/sysutils/lineakd
 
+USE_LIBTOOL_VER=15
 USE_GMAKE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
@@ -24,6 +25,8 @@ CONFIGURE_ARGS+=	--program-prefix=''
 USE_REINPLACE=	yes
 
 MAN1=		lineak_defaultplugin.1
+PLIST_FILES=	lib/lineakd/plugins/defaultplugin.so \
+		lib/lineakd/plugins/mediadetectplugin.so
 
 .include <bsd.port.pre.mk>
 
@@ -31,9 +34,6 @@ MAN1=		lineak_defaultplugin.1
 # lineakd is compiled with 3.4 on FreeBSD 4.x, so plugins must be too
 USE_GCC=	3.4
 GNU_CONFIGURE=	yes
-EXTRA_PATCHES=	${FILESDIR}/extra-patch-ltmain.sh
-.else
-USE_LIBTOOL_VER=15
 .endif
 
 post-patch:
diff --git a/sysutils/lineak-defaultplugin/files/extra-patch-ltmain.sh b/sysutils/lineak-defaultplugin/files/extra-patch-ltmain.sh
deleted file mode 100644
index 7c1686005ce3..000000000000
--- a/sysutils/lineak-defaultplugin/files/extra-patch-ltmain.sh
+++ /dev/null
@@ -1,15 +0,0 @@
---- admin/ltmain.sh.orig	Fri Mar 19 14:14:27 2004
-+++ admin/ltmain.sh	Fri Mar 19 14:14:40 2004
-@@ -5425,10 +5425,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false ; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/sysutils/lineak-defaultplugin/files/patch-mdloader.cpp b/sysutils/lineak-defaultplugin/files/patch-mdloader.cpp
new file mode 100644
index 000000000000..f4414e23dedb
--- /dev/null
+++ b/sysutils/lineak-defaultplugin/files/patch-mdloader.cpp
@@ -0,0 +1,11 @@
+--- default_plugin/mdloader.cpp.orig	Tue Feb 15 18:31:13 2005
++++ default_plugin/mdloader.cpp	Tue Feb 15 18:31:41 2005
+@@ -109,7 +109,7 @@
+ 	   // Handle empty lines.
+ 	   loc = tmp.find('=');
+            // empty line
+-   	   if (loc == string::npos)
++   	   if (loc == (unsigned int)string::npos)
+    	     continue;
+ 
+ 	   // key == the name of the key.
diff --git a/sysutils/lineak-defaultplugin/pkg-plist b/sysutils/lineak-defaultplugin/pkg-plist
deleted file mode 100644
index 4549312e8ee2..000000000000
--- a/sysutils/lineak-defaultplugin/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $FreeBSD$
-lib/lineakd/plugins/defaultplugin.so
-lib/lineakd/plugins/mediadetectplugin.so