- Switch to USES=autoreconf

- Add LICENSE_FILE

5 files changed, 50 insertions, 40 deletions

diff --git a/multimedia/camserv/Makefile b/multimedia/camserv/Makefile
index a020e8b11718..a6b8e469366c 100644
--- a/multimedia/camserv/Makefile
+++ b/multimedia/camserv/Makefile
@@ -12,11 +12,11 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Free program to do streaming video via the web
 
 LICENSE=	GPLv2 # (or later)
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl
 
-USES=		jpeg libtool
-USE_AUTOTOOLS=	autoconf
+USES=		autoreconf jpeg libtool
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 
@@ -37,9 +37,7 @@ V4L_BUILD_DEPENDS=	v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat
 V4L_CONFIGURE_OFF=	ac_cv_header_linux_videodev_h=no
 
 post-patch:
-	@${REINPLACE_CMD} -e \
-		'/^camserv_DEP/s|=.*|=|' ${WRKSRC}/camserv/Makefile.in
-.for i in common/Makefile.in relay/Makefile.in
+.for i in common/Makefile.am relay/Makefile.am
 	@${REINPLACE_CMD} -e \
 		'/^CFLAGS/s|-g||' ${WRKSRC}/${i}
 .endfor
diff --git a/multimedia/camserv/files/patch-Makefile.am b/multimedia/camserv/files/patch-Makefile.am
new file mode 100644
index 000000000000..5eb08d011cab
--- /dev/null
+++ b/multimedia/camserv/files/patch-Makefile.am
@@ -0,0 +1,26 @@
+--- Makefile.am.orig	2002-03-11 00:52:29 UTC
++++ Makefile.am
+@@ -1,18 +1,19 @@
++ACLOCAL_AMFLAGS = -I macros
++
+ if VALID_VIDEO
+ camserv_subdir = camserv
+ endif
+ 
+ datadir = @datadir@/camserv
+ 
+-SUBDIRS = 	libltdl \
+-		common \
++SUBDIRS = 	common \
+ 		${camserv_subdir} \
+ 		include \
+ 		macros  \
+ 		relay
+ 
+-data_DATA = camserv.cfg defpage.html
++data_DATA = camserv.cfg.dist defpage.html
+ EXTRA_DIST = camserv.cfg.in javascript.txt BUGS camserv.spec defpage.html
+ 
+-camserv.cfg: camserv.cfg.in
++camserv.cfg.dist: camserv.cfg.in
+ 	@sed -e s%CAMSERV_MODDIR%$(CAMSERV_MODDIR)%g < camserv.cfg.in > $@ 
diff --git a/multimedia/camserv/files/patch-Makefile.in b/multimedia/camserv/files/patch-Makefile.in
deleted file mode 100644
index 56d8922a1a77..000000000000
--- a/multimedia/camserv/files/patch-Makefile.in
+++ /dev/null
@@ -1,29 +0,0 @@
---- Makefile.in.orig	Mon Sep 16 00:28:04 2002
-+++ Makefile.in	Fri Mar 19 19:35:48 2004
-@@ -99,15 +99,14 @@
- install_sh = @install_sh@
- @VALID_VIDEO_TRUE@camserv_subdir = camserv
- 
--SUBDIRS = libltdl \
--		common \
-+SUBDIRS = common \
- 		${camserv_subdir} \
- 		include \
- 		macros  \
- 		relay
- 
- 
--data_DATA = camserv.cfg defpage.html
-+data_DATA = camserv.cfg.dist defpage.html
- EXTRA_DIST = camserv.cfg.in javascript.txt BUGS camserv.spec defpage.html
- subdir = .
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -463,7 +462,7 @@
- 	uninstall-info-recursive uninstall-recursive
- 
- 
--camserv.cfg: camserv.cfg.in
-+camserv.cfg.dist: camserv.cfg.in
- 	@sed -e s%CAMSERV_MODDIR%$(CAMSERV_MODDIR)%g < camserv.cfg.in > $@ 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/multimedia/camserv/files/patch-camserv_Makefile.am b/multimedia/camserv/files/patch-camserv_Makefile.am
new file mode 100644
index 000000000000..6ca47dc903dc
--- /dev/null
+++ b/multimedia/camserv/files/patch-camserv_Makefile.am
@@ -0,0 +1,12 @@
+--- camserv/Makefile.am.orig	2002-09-15 22:17:54 UTC
++++ camserv/Makefile.am
+@@ -5,8 +5,7 @@ CPPFLAGS = @CPPFLAGS@ -DDATDIR=\"${datad
+ LDFLAGS  = @LDFLAGS@ -export-dynamic
+ 
+ bin_PROGRAMS = camserv
+-camserv_LDADD        = $(LIBLTDL) $(top_srcdir)/common/libcommon.a
+-camserv_DEPENDENCIES = $(LIBLTDL)
++camserv_LDADD        = -lltdl $(top_srcdir)/common/libcommon.a
+ camserv_SOURCES= \
+ 	camconfig.c	\
+ 	camserv.c	\
diff --git a/multimedia/camserv/files/patch-configure.in b/multimedia/camserv/files/patch-configure.in
index d643cbf3ab2a..476c7b0583ee 100644
--- a/multimedia/camserv/files/patch-configure.in
+++ b/multimedia/camserv/files/patch-configure.in
@@ -1,8 +1,11 @@
---- configure.in.orig	2002-05-13 03:06:12.000000000 +0900
-+++ configure.in	2014-01-04 04:57:50.000000000 +0900
-@@ -12,12 +12,12 @@
- AM_ACLOCAL_INCLUDE(macros)
+--- configure.in.orig	2002-05-12 18:06:12 UTC
++++ configure.in
+@@ -9,15 +9,13 @@ AM_INIT_AUTOMAKE(camserv,$CAMSERV_VER_MA
+ AM_CONFIG_HEADER(include/camserv_config.h:config.in)
+ AM_MAINTAINER_MODE
  
+-AM_ACLOCAL_INCLUDE(macros)
+-
  AC_PROG_CC
 -AC_LIBLTDL_CONVENIENCE
 +AC_LIBLTDL_INSTALLABLE
@@ -16,7 +19,7 @@
  
  AC_CHECK_LIB(m,sqrt)
  AC_CHECK_LIB(jpeg,jpeg_start_compress)
-@@ -55,7 +55,7 @@
+@@ -55,7 +53,7 @@ AC_PATH_PROG(GDKPIXBUF_CONFIG,gdk-pixbuf
  if test "$GDKPIXBUF_CONFIG"x != "x"; then
  	GDKPIXBUF_VERSION=`$GDKPIXBUF_CONFIG --version`
  	case "$GDKPIXBUF_VERSION" in
@@ -25,7 +28,7 @@
  		 GDKPIXBUF_CFLAGS=`$GDKPIXBUF_CONFIG --cflags`
  		 GDKPIXBUF_LIBS=`$GDKPIXBUF_CONFIG --libs`
  		 CFLAGS="$CFLAGS $GDKPIXBUF_CFLAGS"
-@@ -93,7 +93,7 @@
+@@ -93,7 +91,7 @@ AC_CHECK_HEADERS(linux/videodev.h,
  [video_v4l=yes],[video_v4l=no])
  AM_CONDITIONAL(VIDEO_V4L, test $video_v4l = yes)