Index: head/multimedia/camserv/Makefile =================================================================== --- head/multimedia/camserv/Makefile (revision 393486) +++ head/multimedia/camserv/Makefile (revision 393487) @@ -1,52 +1,50 @@ # Created by: Chuck Hein & Jim Overholt # $FreeBSD$ PORTNAME= camserv PORTVERSION= 0.5.1 PORTREVISION= 19 PORTEPOCH= 1 CATEGORIES= multimedia MASTER_SITES= SF/cserv/${PORTNAME}/${PORTVERSION} 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 CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= IMLIB2 PIXBUF V4L DOCS OPTIONS_DEFAULT=IMLIB2 OPTIONS_SUB= yes IMLIB2_LIB_DEPENDS= libImlib2.so:${PORTSDIR}/graphics/imlib2 IMLIB2_CONFIGURE_OFF= ac_cv_path_IMLIB2_CONFIG=no PIXBUF_USE= GNOME=gdkpixbuf PIXBUF_CONFIGURE_OFF= ac_cv_path_GDKPIXBUF_CONFIG=no 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 post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} README javascript.txt \ ${STAGEDIR}${DOCSDIR}) .include Index: head/multimedia/camserv/files/patch-Makefile.in =================================================================== --- head/multimedia/camserv/files/patch-Makefile.in (revision 393486) +++ head/multimedia/camserv/files/patch-Makefile.in (nonexistent) @@ -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. Property changes on: head/multimedia/camserv/files/patch-Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/camserv/files/patch-Makefile.am =================================================================== --- head/multimedia/camserv/files/patch-Makefile.am (nonexistent) +++ head/multimedia/camserv/files/patch-Makefile.am (revision 393487) @@ -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 > $@ Property changes on: head/multimedia/camserv/files/patch-Makefile.am ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/multimedia/camserv/files/patch-camserv_Makefile.am =================================================================== --- head/multimedia/camserv/files/patch-camserv_Makefile.am (nonexistent) +++ head/multimedia/camserv/files/patch-camserv_Makefile.am (revision 393487) @@ -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 \ Property changes on: head/multimedia/camserv/files/patch-camserv_Makefile.am ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/multimedia/camserv/files/patch-configure.in =================================================================== --- head/multimedia/camserv/files/patch-configure.in (revision 393486) +++ head/multimedia/camserv/files/patch-configure.in (revision 393487) @@ -1,36 +1,39 @@ ---- 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 AC_LIBTOOL_DLOPEN -AM_PROG_LIBTOOL +AC_PROG_LIBTOOL AC_SUBST(LIBLTDL) +AC_SUBST(INCLTDL) -AC_CONFIG_SUBDIRS(libltdl) 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 - 0.14.*) have_gdkpixbuf=yes + 0.22.*) have_gdkpixbuf=yes 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) -AC_CHECK_HEADERS(machine/ioctl_bt848.h, +AC_CHECK_HEADERS(dev/bktr/ioctl_bt848.h, [video_fbsd_bttv=yes],[video_fbsd_bttv=no]) AM_CONDITIONAL(VIDEO_FBSD_BTTV, test $video_fbsd_bttv = yes)