Date: Mon, 3 Aug 2015 19:28:29 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r393487 - in head/multimedia/camserv: . files Message-ID: <201508031928.t73JSTsA068894@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Mon Aug 3 19:28:28 2015 New Revision: 393487 URL: https://svnweb.freebsd.org/changeset/ports/393487 Log: - Switch to USES=autoreconf - Add LICENSE_FILE Added: head/multimedia/camserv/files/patch-Makefile.am (contents, props changed) head/multimedia/camserv/files/patch-camserv_Makefile.am (contents, props changed) Deleted: head/multimedia/camserv/files/patch-Makefile.in Modified: head/multimedia/camserv/Makefile head/multimedia/camserv/files/patch-configure.in Modified: head/multimedia/camserv/Makefile ============================================================================== --- head/multimedia/camserv/Makefile Mon Aug 3 19:25:34 2015 (r393486) +++ head/multimedia/camserv/Makefile Mon Aug 3 19:28:28 2015 (r393487) @@ -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:${PORTSD 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 Added: head/multimedia/camserv/files/patch-Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/camserv/files/patch-Makefile.am Mon Aug 3 19:28:28 2015 (r393487) @@ -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 > $@ Added: head/multimedia/camserv/files/patch-camserv_Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/camserv/files/patch-camserv_Makefile.am Mon Aug 3 19:28:28 2015 (r393487) @@ -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 \ Modified: head/multimedia/camserv/files/patch-configure.in ============================================================================== --- head/multimedia/camserv/files/patch-configure.in Mon Aug 3 19:25:34 2015 (r393486) +++ head/multimedia/camserv/files/patch-configure.in Mon Aug 3 19:28:28 2015 (r393487) @@ -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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508031928.t73JSTsA068894>