diff --git a/multimedia/lsdvd/Makefile b/multimedia/lsdvd/Makefile index 11b5d20c7c5..ad6cf587bc8 100644 --- a/multimedia/lsdvd/Makefile +++ b/multimedia/lsdvd/Makefile @@ -1,12 +1,11 @@ -# $OpenBSD: Makefile,v 1.6 2006/08/03 23:15:57 espie Exp $ +# $OpenBSD: Makefile,v 1.7 2007/07/29 16:32:15 ajacoutot Exp $ -COMMENT= "print information about the content and structure of a DVD" +COMMENT= print information about the content and structure of a DVD -DISTNAME= lsdvd-0.10 -PKGNAME= ${DISTNAME}p0 +DISTNAME= lsdvd-0.16 CATEGORIES= multimedia -HOMEPAGE= http://untrepid.com/acidrip/lsdvd.html +HOMEPAGE= http://untrepid.com/lsdvd.html # GPL PERMIT_PACKAGE_CDROM= Yes @@ -15,9 +14,9 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes WANTLIB= c -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=acidrip/} +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lsdvd/} -LIB_DEPENDS= dvdread.>=3.0::devel/libdvdread +LIB_DEPENDS= dvdread.>=3::devel/libdvdread CONFIGURE_STYLE=gnu CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/multimedia/lsdvd/distinfo b/multimedia/lsdvd/distinfo index bfe0fa06185..3c2721a211b 100644 --- a/multimedia/lsdvd/distinfo +++ b/multimedia/lsdvd/distinfo @@ -1,5 +1,5 @@ -MD5 (lsdvd-0.10.tar.gz) = f9ZZ+OJv15DsxJA9eWGYWg== -RMD160 (lsdvd-0.10.tar.gz) = o8cY26H2VWqOA9ZvRTSD8+UPICc= -SHA1 (lsdvd-0.10.tar.gz) = kQurljANreewe6p8sgN+9HPANdY= -SHA256 (lsdvd-0.10.tar.gz) = ec5X3ILmZYVVDxqGGLPqA6jkX2NRtZnb1uTvr9v8TVk= -SIZE (lsdvd-0.10.tar.gz) = 36206 +MD5 (lsdvd-0.16.tar.gz) = NA4avlxeWr9/+AMeePSe5w== +RMD160 (lsdvd-0.16.tar.gz) = /NCZOupq0iA8i+AZ7DG6fIZgyiU= +SHA1 (lsdvd-0.16.tar.gz) = 1cDTK/siCAfr3Av7sXZ55ylHkfQ= +SHA256 (lsdvd-0.16.tar.gz) = BK4+LYI+1CfjHVfzZ30o7Da987+YTTX3vfqwMNibIPE= +SIZE (lsdvd-0.16.tar.gz) = 100495 diff --git a/multimedia/lsdvd/patches/patch-Makefile_in b/multimedia/lsdvd/patches/patch-Makefile_in deleted file mode 100644 index 55f6c2ce1f3..00000000000 --- a/multimedia/lsdvd/patches/patch-Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-Makefile_in,v 1.1.1.1 2004/06/21 21:26:24 xsa Exp $ ---- Makefile.in.orig 2003-09-29 23:37:21.000000000 +0200 -+++ Makefile.in 2004-06-20 01:32:58.000000000 +0200 -@@ -78,7 +78,7 @@ lsdvd_OBJECTS = lsdvd.o - lsdvd_LDADD = $(LDADD) - lsdvd_DEPENDENCIES = - lsdvd_LDFLAGS = --CFLAGS = @CFLAGS@ -+CFLAGS += @CFLAGS@ - COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) - LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ diff --git a/multimedia/lsdvd/patches/patch-configure b/multimedia/lsdvd/patches/patch-configure index bb15742ca20..42fb221a685 100644 --- a/multimedia/lsdvd/patches/patch-configure +++ b/multimedia/lsdvd/patches/patch-configure @@ -1,11 +1,11 @@ -$OpenBSD: patch-configure,v 1.1 2006/02/19 17:42:36 espie Exp $ ---- configure.orig Sun Feb 19 18:37:06 2006 -+++ configure Sun Feb 19 18:37:25 2006 -@@ -1050,6 +1050,7 @@ echo "configure:1050: checking for dvdre - cat > conftest.$ac_ext <>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +#include #include - int main() { - + #include + int diff --git a/multimedia/lsdvd/patches/patch-lsdvd_c b/multimedia/lsdvd/patches/patch-lsdvd_c index 6725ff935e3..73f5e6acce2 100644 --- a/multimedia/lsdvd/patches/patch-lsdvd_c +++ b/multimedia/lsdvd/patches/patch-lsdvd_c @@ -1,95 +1,20 @@ -$OpenBSD: patch-lsdvd_c,v 1.2 2006/02/19 17:42:36 espie Exp $ ---- lsdvd.c.orig Mon Sep 29 23:01:00 2003 -+++ lsdvd.c Sun Feb 19 18:38:20 2006 +$OpenBSD: patch-lsdvd_c,v 1.3 2007/07/29 16:32:15 ajacoutot Exp $ +--- lsdvd.c.orig Thu Mar 2 14:48:11 2006 ++++ lsdvd.c Sun Jul 29 18:24:55 2007 @@ -13,6 +13,7 @@ * 2003-04-19 Cleanups get_title_name, added dvdtime2msec, added helper macros, - * output info structures in form of a Perl module, by Henk Vergonet. + * output info structures in form of a Perl module, by Henk Vergonet. */ +#include #include #include #include -@@ -133,21 +134,21 @@ int get_title_name(const char* dvd_devic - - if (! (filehandle = fopen(dvd_device, "r"))) { - fprintf(stderr, "Couldn't open %s for title\n", dvd_device); -- strcpy(title, "unknown"); -+ strlcpy(title, "unknown", sizeof(title)); - return -1; - } - - if ( fseek(filehandle, 32808, SEEK_SET )) { - fclose(filehandle); - fprintf(stderr, "Couldn't seek in %s for title\n", dvd_device); -- strcpy(title, "unknown"); -+ strlcpy(title, "unknown", sizeof(title)); - return -1; - } - - if ( 32 != (i = fread(title, 1, 32, filehandle)) ) { - fclose(filehandle); - fprintf(stderr, "Couldn't read enough bytes for title.\n"); -- strcpy(title, "unknown"); -+ strlcpy(title, "unknown", sizeof(strlcpy)); - return -1; - } - -@@ -194,7 +195,7 @@ int main(int argc, char *argv[]) +@@ -235,7 +236,7 @@ int main(int argc, char *argv[]) pgc_t *pgc; int i, j, c, titles, cell, vts_ttn, title_set_nr; - char lang_code[2]; + char lang_code[3]; - char *dvd_device = "/dev/dvd"; + char *dvd_device = "/dev/rcd0c"; int has_title = 0, ret = 0; - int max_length = 0, max_track = 0; + int max_length = 0, max_track = 0; struct stat dvd_stat; -@@ -349,7 +350,7 @@ int main(int argc, char *argv[]) - for (i=0; inr_of_vts_audio_streams; i++) - { - audio_attr = &vtsi_mat->vts_audio_attr[i]; -- sprintf(lang_code, "%c%c", audio_attr->lang_code>>8, audio_attr->lang_code & 0xff); -+ snprintf(lang_code, sizeof(lang_code), "%c%c", audio_attr->lang_code>>8, audio_attr->lang_code & 0xff); - if (!lang_code[0]) { lang_code[0] = 'x'; lang_code[1] = 'x'; } - HASH(0); - DEF("ix", "%d", i+1); -@@ -368,7 +369,7 @@ int main(int argc, char *argv[]) - for (i=0; inr_of_vts_audio_streams; i++) - { - audio_attr = &vtsi_mat->vts_audio_attr[i]; -- sprintf(lang_code, "%c%c", audio_attr->lang_code>>8, audio_attr->lang_code & 0xff); -+ snprintf(lang_code, sizeof(lang_code), "%c%c", audio_attr->lang_code>>8, audio_attr->lang_code & 0xff); - if (!lang_code[0]) { lang_code[0] = 'x'; lang_code[1] = 'x'; } - printf("\tAudio: %d, Language: %s - %s, ", i +1 , lang_code, lang_name(lang_code)); - printf("Format: %s, ", audio_format[audio_attr->audio_format]); -@@ -412,11 +413,11 @@ int main(int argc, char *argv[]) - if (i == pgc->nr_of_programs - 1) next = pgc->nr_of_cells + 1; - while (cell < next - 1) - { -- sprintf(hex, "%02x", pgc->cell_playback[cell].playback_time.second); -+ snprintf(hex, sizeof(hex), "%02x", pgc->cell_playback[cell].playback_time.second); - tmp = second + atoi(hex); - minute = minute + (tmp / 60); - second = tmp % 60; -- sprintf(hex, "%02x", pgc->cell_playback[cell].playback_time.minute); -+ snprintf(hex, sizeof(hex), "%02x", pgc->cell_playback[cell].playback_time.minute); - tmp = minute + atoi(hex); - hour = hour + (tmp / 60); - minute = tmp % 60; -@@ -455,7 +456,7 @@ int main(int argc, char *argv[]) - for (i=0; inr_of_vts_subp_streams; i++) - { - subp_attr = &vtsi_mat->vts_subp_attr[i]; -- sprintf(lang_code, "%c%c", subp_attr->lang_code>>8, subp_attr->lang_code & 0xff); -+ snprintf(lang_code, sizeof(lang_code), "%c%c", subp_attr->lang_code>>8, subp_attr->lang_code & 0xff); - if (!lang_code[0]) { lang_code[0] = 'x'; lang_code[1] = 'x'; } - - HASH(0); -@@ -470,7 +471,7 @@ int main(int argc, char *argv[]) - for (i=0; inr_of_vts_subp_streams; i++) - { - subp_attr = &vtsi_mat->vts_subp_attr[i]; -- sprintf(lang_code, "%c%c", subp_attr->lang_code>>8, subp_attr->lang_code & 0xff); -+ snprintf(lang_code, sizeof(lang_code), "%c%c", subp_attr->lang_code>>8, subp_attr->lang_code & 0xff); - if (!lang_code[0]) { lang_code[0] = 'x'; lang_code[1] = 'x'; } - printf("\tSubtitle: %02d, Language: %s - %s, ", i+1, lang_code, lang_name(lang_code)); - printf("Content: %s", subp_type[subp_attr->lang_extension]); diff --git a/multimedia/lsdvd/pkg/PLIST b/multimedia/lsdvd/pkg/PLIST index 02777a13cd7..e0b89e1252b 100644 --- a/multimedia/lsdvd/pkg/PLIST +++ b/multimedia/lsdvd/pkg/PLIST @@ -1,2 +1,3 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2004/06/21 21:26:24 xsa Exp $ +@comment $OpenBSD: PLIST,v 1.2 2007/07/29 16:32:15 ajacoutot Exp $ bin/lsdvd +@man man/man1/lsdvd.1