[NEW] sysutils/xorriso-1.4.6

classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

[NEW] sysutils/xorriso-1.4.6

SASANO Takayoshi
Hello,

here is the port of xorriso, iso9660 file manipulator.

For my mistake, I already imported this to CVS tree.
Sorry and if there is serious problem please remove it on CVS.

--
SASANO Takayoshi (JG1UAA) <[hidden email]>


diff -uNpr sysutils.orig/Makefile sysutils/Makefile
--- sysutils.orig/Makefile Fri Jun 30 22:51:47 2017
+++ sysutils/Makefile Fri Jun 30 22:54:31 2017
@@ -322,7 +322,6 @@
      SUBDIR += xbatt
      SUBDIR += xbattbar
      SUBDIR += xjobs
-     SUBDIR += xorriso
      SUBDIR += xps
      SUBDIR += xstatbar
      SUBDIR += xuvmstat
diff -uNpr sysutils.orig/xorriso/Makefile sysutils/xorriso/Makefile
--- sysutils.orig/xorriso/Makefile Thu Jan  1 09:00:00 1970
+++ sysutils/xorriso/Makefile Fri Jun 30 21:28:00 2017
@@ -0,0 +1,26 @@
+# $OpenBSD$
+
+COMMENT = ISO 9660 Rock Ridge Filesystem Manipulator
+
+DISTNAME = xorriso-1.4.6
+REVISION = 0
+
+CATEGORIES = sysutils
+
+HOMEPAGE = https://www.gnu.org/software/xorriso/
+
+# GPLv2+
+PERMIT_PACKAGE_CDROM = Yes
+
+WANTLIB = c curses pthread readline z bz2 iconv
+
+MASTER_SITES = ${MASTER_SITE_GNU:=xorriso/}
+
+LIB_DEPENDS = archivers/bzip2 \
+ converters/libiconv
+
+CONFIGURE_STYLE = gnu
+
+NO_TEST = Yes
+
+.include <bsd.port.mk>
diff -uNpr sysutils.orig/xorriso/distinfo sysutils/xorriso/distinfo
--- sysutils.orig/xorriso/distinfo Thu Jan  1 09:00:00 1970
+++ sysutils/xorriso/distinfo Fri Jun 30 06:36:39 2017
@@ -0,0 +1,2 @@
+SHA256 (xorriso-1.4.6.tar.gz) = Um9yjH7ub4xLafvzkXiebICAYZfChhz1kiz3z+EDV4Q=
+SIZE (xorriso-1.4.6.tar.gz) = 2652285
diff -uNpr sysutils.orig/xorriso/patches/patch-configure sysutils/xorriso/patches/patch-configure
--- sysutils.orig/xorriso/patches/patch-configure Thu Jan  1 09:00:00 1970
+++ sysutils/xorriso/patches/patch-configure Fri Jun 30 22:15:58 2017
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- configure.orig Fri Sep 16 22:51:36 2016
++++ configure Fri Jun 30 00:29:56 2017
+@@ -2529,6 +2529,10 @@ test -n "$target_alias" &&
+
+
+ case $target_os in
++openbsd*)
++        LDFLAGS="$LDFLAGS -L/usr/local/lib"
++        CPPFLAGS="$CPPFLAGS -I/usr/local/include"
++        ;;
+ freebsd*)
+         LDFLAGS="$LDFLAGS -L/usr/local/lib"
+         CPPFLAGS="$CPPFLAGS -I/usr/local/include"
diff -uNpr sysutils.orig/xorriso/patches/patch-libisofs_eltorito_c sysutils/xorriso/patches/patch-libisofs_eltorito_c
--- sysutils.orig/xorriso/patches/patch-libisofs_eltorito_c Thu Jan  1 09:00:00 1970
+++ sysutils/xorriso/patches/patch-libisofs_eltorito_c Fri Jun 30 22:16:00 2017
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- libisofs/eltorito.c.orig Fri Sep 16 22:51:34 2016
++++ libisofs/eltorito.c Fri Jun 30 00:35:09 2017
+@@ -315,7 +315,7 @@ int iso_tree_add_boot_node(IsoDir *parent, const char
+
+ /* Get start and size from "%d_start_%lus_size_%lud" */
+ static
+-void iso_parse_start_size(char *text, unsigned long *part_start,
++void iso_parse_start_size(const char *text, unsigned long *part_start,
+                           unsigned long *part_size)
+ {
+     char *cpt;
diff -uNpr sysutils.orig/xorriso/pkg/DESCR sysutils/xorriso/pkg/DESCR
--- sysutils.orig/xorriso/pkg/DESCR Thu Jan  1 09:00:00 1970
+++ sysutils/xorriso/pkg/DESCR Fri Jun 30 21:26:01 2017
@@ -0,0 +1,2 @@
+xorriso copies files info Rock Ridge enhanced ISO 9660 filesystems,
+and vice versa.
diff -uNpr sysutils.orig/xorriso/pkg/PLIST sysutils/xorriso/pkg/PLIST
--- sysutils.orig/xorriso/pkg/PLIST Thu Jan  1 09:00:00 1970
+++ sysutils/xorriso/pkg/PLIST Fri Jun 30 06:40:36 2017
@@ -0,0 +1,12 @@
+@comment $OpenBSD$
+bin/osirrox
+bin/xorrecord
+@bin bin/xorriso
+bin/xorriso-tcltk
+bin/xorrisofs
+@info info/xorrecord.info
+@info info/xorriso.info
+@info info/xorrisofs.info
+@man man/man1/xorrecord.1
+@man man/man1/xorriso.1
+@man man/man1/xorrisofs.1

Reply | Threaded
Open this post in threaded view
|

Re: [NEW] sysutils/xorriso-1.4.6

Jeremie Courreges-Anglas-2
SASANO Takayoshi <[hidden email]> writes:

> Hello,
>
> here is the port of xorriso, iso9660 file manipulator.
>
> For my mistake, I already imported this to CVS tree.
> Sorry and if there is serious problem please remove it on CVS.

No need to remove it IMO.

The port looks good.  Some tweaks:
- no need to set REVISION for a new port.  Since xorriso is currently
  unhooked, we can safely kill it.
- patch-configure can go away if we tweak CPPFLAGS and LDFLAGS through
  the environment.
- NO_TEST should only be used if tests fail because there are no tests.
  This is not the case here.
- I suggest using upstream's description for DESCR

With the diff below committed, ok jca@ to hook up xorriso in
sysutils/Makefile.


Index: Makefile
===================================================================
RCS file: /d/cvs/ports/sysutils/xorriso/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile 30 Jun 2017 13:26:43 -0000 1.1.1.1
+++ Makefile 30 Jun 2017 15:36:02 -0000
@@ -3,7 +3,6 @@
 COMMENT = ISO 9660 Rock Ridge Filesystem Manipulator
 
 DISTNAME = xorriso-1.4.6
-REVISION = 0
 
 CATEGORIES = sysutils
 
@@ -20,7 +19,7 @@ LIB_DEPENDS = archivers/bzip2 \
  converters/libiconv
 
 CONFIGURE_STYLE = gnu
-
-NO_TEST = Yes
+CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"
 
 .include <bsd.port.mk>
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 30 Jun 2017 13:26:43 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-configure,v 1.1.1.1 2017/06/30 13:26:43 uaa Exp $
---- configure.orig Fri Sep 16 22:51:36 2016
-+++ configure Fri Jun 30 00:29:56 2017
-@@ -2529,6 +2529,10 @@ test -n "$target_alias" &&
-
-
- case $target_os in
-+openbsd*)
-+        LDFLAGS="$LDFLAGS -L/usr/local/lib"
-+        CPPFLAGS="$CPPFLAGS -I/usr/local/include"
-+        ;;
- freebsd*)
-         LDFLAGS="$LDFLAGS -L/usr/local/lib"
-         CPPFLAGS="$CPPFLAGS -I/usr/local/include"
Index: pkg/DESCR
===================================================================
RCS file: /d/cvs/ports/sysutils/xorriso/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- pkg/DESCR 30 Jun 2017 13:26:43 -0000 1.1.1.1
+++ pkg/DESCR 30 Jun 2017 15:34:04 -0000
@@ -1,2 +1,5 @@
-xorriso copies files info Rock Ridge enhanced ISO 9660 filesystems,
-and vice versa.
+xorriso copies file objects from POSIX compliant filesystems into Rock
+Ridge enhanced ISO 9660 filesystems and allows session-wise manipulation
+of such filesystems. It can load the management information of existing
+ISO images and it writes the session results to optical media or to
+filesystem objects.


--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Reply | Threaded
Open this post in threaded view
|

Re: [NEW] sysutils/xorriso-1.4.6

Jeremie Courreges-Anglas-2
Jeremie Courreges-Anglas <[hidden email]> writes:

> SASANO Takayoshi <[hidden email]> writes:
>
>> Hello,
>>
>> here is the port of xorriso, iso9660 file manipulator.
>>
>> For my mistake, I already imported this to CVS tree.
>> Sorry and if there is serious problem please remove it on CVS.
>
> No need to remove it IMO.
>
> The port looks good.  Some tweaks:
> - no need to set REVISION for a new port.  Since xorriso is currently
>   unhooked, we can safely kill it.
> - patch-configure can go away if we tweak CPPFLAGS and LDFLAGS through
>   the environment.
> - NO_TEST should only be used if tests fail because there are no tests.
>   This is not the case here.
> - I suggest using upstream's description for DESCR
>
> With the diff below committed, ok jca@ to hook up xorriso in
> sysutils/Makefile.

Here's a refreshed diff.


Index: Makefile
===================================================================
RCS file: /d/cvs/ports/sysutils/xorriso/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile 1 Jul 2017 15:13:10 -0000 1.2
+++ Makefile 1 Jul 2017 17:08:02 -0000
@@ -3,7 +3,6 @@
 COMMENT = ISO 9660 Rock Ridge Filesystem Manipulator
 
 DISTNAME = xorriso-1.4.6
-REVISION = 0
 
 CATEGORIES = sysutils
 
@@ -20,8 +19,8 @@ LIB_DEPENDS = archivers/bzip2 \
  converters/libiconv
 
 CONFIGURE_STYLE = gnu
-
-NO_TEST = Yes
+CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"
 
 pre-configure:
  ${SUBST_CMD} ${WRKSRC}/configure
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 30 Jun 2017 13:26:43 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-configure,v 1.1.1.1 2017/06/30 13:26:43 uaa Exp $
---- configure.orig Fri Sep 16 22:51:36 2016
-+++ configure Fri Jun 30 00:29:56 2017
-@@ -2529,6 +2529,10 @@ test -n "$target_alias" &&
-
-
- case $target_os in
-+openbsd*)
-+        LDFLAGS="$LDFLAGS -L/usr/local/lib"
-+        CPPFLAGS="$CPPFLAGS -I/usr/local/include"
-+        ;;
- freebsd*)
-         LDFLAGS="$LDFLAGS -L/usr/local/lib"
-         CPPFLAGS="$CPPFLAGS -I/usr/local/include"
Index: pkg/DESCR
===================================================================
RCS file: /d/cvs/ports/sysutils/xorriso/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- pkg/DESCR 30 Jun 2017 13:26:43 -0000 1.1.1.1
+++ pkg/DESCR 30 Jun 2017 15:34:04 -0000
@@ -1,2 +1,5 @@
-xorriso copies files info Rock Ridge enhanced ISO 9660 filesystems,
-and vice versa.
+xorriso copies file objects from POSIX compliant filesystems into Rock
+Ridge enhanced ISO 9660 filesystems and allows session-wise manipulation
+of such filesystems. It can load the management information of existing
+ISO images and it writes the session results to optical media or to
+filesystem objects.

--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Reply | Threaded
Open this post in threaded view
|

Re: [NEW] sysutils/xorriso-1.4.6

SASANO Takayoshi
Hi,

I just committed.

Thanks to jca@ and ajacoutot@. Regards.


On Sun, 02 Jul 2017 02:14:32 +0900,
Jeremie Courreges-Anglas wrote:

>
> Jeremie Courreges-Anglas <[hidden email]> writes:
>
> > SASANO Takayoshi <[hidden email]> writes:
> >
> >> Hello,
> >>
> >> here is the port of xorriso, iso9660 file manipulator.
> >>
> >> For my mistake, I already imported this to CVS tree.
> >> Sorry and if there is serious problem please remove it on CVS.
> >
> > No need to remove it IMO.
> >
> > The port looks good.  Some tweaks:
> > - no need to set REVISION for a new port.  Since xorriso is currently
> >   unhooked, we can safely kill it.
> > - patch-configure can go away if we tweak CPPFLAGS and LDFLAGS through
> >   the environment.
> > - NO_TEST should only be used if tests fail because there are no tests.
> >   This is not the case here.
> > - I suggest using upstream's description for DESCR
> >
> > With the diff below committed, ok jca@ to hook up xorriso in
> > sysutils/Makefile.
>
> Here's a refreshed diff.
>
>
> Index: Makefile
> ===================================================================
> RCS file: /d/cvs/ports/sysutils/xorriso/Makefile,v
> retrieving revision 1.2
> diff -u -p -r1.2 Makefile
> --- Makefile 1 Jul 2017 15:13:10 -0000 1.2
> +++ Makefile 1 Jul 2017 17:08:02 -0000
> @@ -3,7 +3,6 @@
>  COMMENT = ISO 9660 Rock Ridge Filesystem Manipulator
>  
>  DISTNAME = xorriso-1.4.6
> -REVISION = 0
>  
>  CATEGORIES = sysutils
>  
> @@ -20,8 +19,8 @@ LIB_DEPENDS = archivers/bzip2 \
>   converters/libiconv
>  
>  CONFIGURE_STYLE = gnu
> -
> -NO_TEST = Yes
> +CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
> + LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"
>  
>  pre-configure:
>   ${SUBST_CMD} ${WRKSRC}/configure
> Index: patches/patch-configure
> ===================================================================
> RCS file: patches/patch-configure
> diff -N patches/patch-configure
> --- patches/patch-configure 30 Jun 2017 13:26:43 -0000 1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,14 +0,0 @@
> -$OpenBSD: patch-configure,v 1.1.1.1 2017/06/30 13:26:43 uaa Exp $
> ---- configure.orig Fri Sep 16 22:51:36 2016
> -+++ configure Fri Jun 30 00:29:56 2017
> -@@ -2529,6 +2529,10 @@ test -n "$target_alias" &&
> -
> -
> - case $target_os in
> -+openbsd*)
> -+        LDFLAGS="$LDFLAGS -L/usr/local/lib"
> -+        CPPFLAGS="$CPPFLAGS -I/usr/local/include"
> -+        ;;
> - freebsd*)
> -         LDFLAGS="$LDFLAGS -L/usr/local/lib"
> -         CPPFLAGS="$CPPFLAGS -I/usr/local/include"
> Index: pkg/DESCR
> ===================================================================
> RCS file: /d/cvs/ports/sysutils/xorriso/pkg/DESCR,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 DESCR
> --- pkg/DESCR 30 Jun 2017 13:26:43 -0000 1.1.1.1
> +++ pkg/DESCR 30 Jun 2017 15:34:04 -0000
> @@ -1,2 +1,5 @@
> -xorriso copies files info Rock Ridge enhanced ISO 9660 filesystems,
> -and vice versa.
> +xorriso copies file objects from POSIX compliant filesystems into Rock
> +Ridge enhanced ISO 9660 filesystems and allows session-wise manipulation
> +of such filesystems. It can load the management information of existing
> +ISO images and it writes the session results to optical media or to
> +filesystem objects.
>
> --
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE
>

--
SASANO Takayoshi (JG1UAA) <[hidden email]>