Attachment 87760 Details for Bug 124402 – file.diff

[patch] file.diff

file.diff (text/plain), 7.11 KB, created by Alexander Logvinov on 2008-06-09 00:00:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Logvinov

Created: 2008-06-09 00:00:03 UTC

Size: 7.11 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/pcvs/ports/archivers/orange/Makefile,v
>retrieving revision 1.13
>diff -u -r1.13 Makefile
>--- Makefile	5 Jun 2008 20:29:26 -0000	1.13
>+++ Makefile	8 Jun 2008 22:48:27 -0000
>@@ -5,26 +5,68 @@
> # $FreeBSD: ports/archivers/orange/Makefile,v 1.13 2008/06/05 20:29:26 araujo Exp $
> #
> 
>-PORTNAME=	orange
>-PORTVERSION=	0.3
>-PORTREVISION= 	2
>+PORTNAME=	liborange
>+PORTVERSION=	0.3.2
> CATEGORIES=	archivers
> MASTER_SITES=	SF
> MASTER_SITE_SUBDIR=	synce
> 
> MAINTAINER=	ports@logvinov.com
>-COMMENT=	Extract Microsoft Cabinet files from self-extracting installers
>+COMMENT=	Library to extract CAB files from self-extracting installers
> 
>-LIB_DEPENDS=	synce.0:${PORTSDIR}/palm/synce-libsynce \
>-		rapi.2:${PORTSDIR}/palm/synce-librapi2 \
>-		dynamite.0:${PORTSDIR}/archivers/libdynamite \
>-		unshield.0:${PORTSDIR}/archivers/unshield
>+OPTIONS=	LIBSYNCE	"Build with libsynce support"			on \
>+		LIBDYNAMITE	"Build with libdynamite support"		on \
>+		LIBUNSHIELD	"Build with libunshield support"		on \
>+		INNO		"Build with expermential Inno Setup support"	off \
>+		VISE		"Build with expermential VISE support"		off \
>+		MSI		"Build with expermential MSI support"		off
> 
> USE_AUTOTOOLS=	libtool:15
> GNU_CONFIGURE=	yes
>-USE_GNOME=	gnometarget
>-CONFIGURE_ARGS=	--with-libsynce=${LOCALBASE}
>+USE_GNOME=	gnomehack gnometarget
> USE_ICONV=	yes
>+CFLAGS+=	-I${LOCALBASE}/include
>+LDFLAGS+=	-L${LOCALBASE}/lib
>+CONFIGURE_ENV=	CFLAGS="${CFLAGS}" \
>+		LDFLAGS="${LDFLAGS}"
> USE_LDCONFIG=	yes
> 
>-.include <bsd.port.mk>
>+MAN1=		orange.1
>+
>+.include <bsd.port.pre.mk>
>+
>+.if !defined(WITH_LIBSYNCE)
>+CONFIGURE_ARGS+=	--without-libsynce
>+.else
>+LIB_DEPENDS+=		synce.0:${PORTSDIR}/palm/synce-libsynce
>+CONFIGURE_ARGS+=	--with-libsynce=${LOCALBASE}
>+.endif
>+
>+.if !defined(WITH_LIBDYNAMITE)
>+CONFIGURE_ARGS+=	--without-libdynamite
>+.else
>+LIB_DEPENDS+=		dynamite.0:${PORTSDIR}/archivers/libdynamite
>+CONFIGURE_ARGS+=	--with-libdynamite=${LOCALBASE}
>+.endif
>+
>+.if !defined(WITH_LIBUNSHIELD)
>+CONFIGURE_ARGS+=	--without-libunshield
>+.else
>+LIB_DEPENDS+=		unshield.0:${PORTSDIR}/archivers/unshield
>+CONFIGURE_ARGS+=	--with-libunshield=${LOCALBASE}
>+.endif
>+
>+.if defined(WITH_INNO)
>+CONFIGURE_ARGS+=	--enable-inno
>+.endif
>+
>+.if defined(WITH_VISE)
>+CONFIGURE_ARGS+=	--enable-vise
>+.endif
>+
>+.if defined(WITH_MSI)
>+CONFIGURE_ARGS+=	--enable-msi --with-libgsf
>+LIB_DEPENDS+=		gsf-1.114:${PORTSDIR}/devel/libgsf
>+.endif
>+
>+.include <bsd.port.post.mk>
>Index: distinfo
>===================================================================
>RCS file: /home/pcvs/ports/archivers/orange/distinfo,v
>retrieving revision 1.3
>diff -u -r1.3 distinfo
>--- distinfo	22 Jan 2006 06:58:28 -0000	1.3
>+++ distinfo	8 Jun 2008 22:48:27 -0000
>@@ -1,3 +1,3 @@
>-MD5 (orange-0.3.tar.gz) = 90f6e822bb81af886dce5bdecd227655
>-SHA256 (orange-0.3.tar.gz) = 828cc7c7b7c21e0d8e5e3143b1428bbc1f4cfab7f9af934fe1b110fe7d333e41
>-SIZE (orange-0.3.tar.gz) = 336931
>+MD5 (liborange-0.3.2.tar.gz) = 52f9fb2b97ee08b4929079ed68ba16a0
>+SHA256 (liborange-0.3.2.tar.gz) = 5aed6ae32a2e103bd846c02a55b7d802fb1b6c2676207fba62d2a0ec944f57a1
>+SIZE (liborange-0.3.2.tar.gz) = 380034
>Index: pkg-descr
>===================================================================
>RCS file: /home/pcvs/ports/archivers/orange/pkg-descr,v
>retrieving revision 1.1
>diff -u -r1.1 pkg-descr
>--- pkg-descr	14 Jan 2005 00:13:20 -0000	1.1
>+++ pkg-descr	8 Jun 2008 22:48:27 -0000
>@@ -4,4 +4,4 @@
> 
> Supported installers include VISE, InstallShield, Setup Factory and more.
> 
>-WWW: http://synce.sourceforge.net
>+WWW: http://synce.sourceforge.net/
>Index: pkg-plist
>===================================================================
>RCS file: /home/pcvs/ports/archivers/orange/pkg-plist,v
>retrieving revision 1.3
>diff -u -r1.3 pkg-plist
>--- pkg-plist	23 Feb 2006 10:34:20 -0000	1.3
>+++ pkg-plist	8 Jun 2008 22:48:27 -0000
>@@ -1,6 +1,8 @@
> bin/orange
> include/liborange.h
>+include/liborange_stub.h
> lib/liborange.a
> lib/liborange.la
> lib/liborange.so
> lib/liborange.so.0
>+libdata/pkgconfig/liborange.pc
>Index: files/patch-inno.h
>===================================================================
>RCS file: /home/pcvs/ports/archivers/orange/files/patch-inno.h,v
>retrieving revision 1.1
>diff -u -r1.1 patch-inno.h
>--- files/patch-inno.h	14 Jan 2005 00:13:20 -0000	1.1
>+++ files/patch-inno.h	8 Jun 2008 22:48:27 -0000
>@@ -1,5 +1,5 @@
>---- lib/inno.h.orig	Mon Sep  8 17:17:28 2003
>-+++ lib/inno.h	Mon Jan 10 05:07:47 2005
>+--- lib/inno.h.orig	2008-05-22 15:55:23.000000000 +1000
>++++ lib/inno.h	2008-05-22 15:57:49.000000000 +1000
> @@ -3,7 +3,7 @@
>  #define __inno_h__
>  
>@@ -9,7 +9,7 @@
>  #include <stdio.h>
>  #include <zlib.h>
>  
>-@@ -100,7 +100,7 @@
>+@@ -99,7 +99,7 @@
>    uint32_t NumUninstallDeleteEntries; 
>    uint32_t NumRunEntries; 
>    uint32_t NumUninstallRunEntries;  
>@@ -18,7 +18,7 @@
>  } TSetupHeader;
>  
>  #define SETUP_HEADER_SIZE   0xd9
>-@@ -144,9 +144,9 @@
>+@@ -143,9 +143,9 @@
>  
>  typedef struct
>  {
>@@ -31,7 +31,7 @@
>  } TSetupVersionData;
>  
>  #if 0
>-@@ -173,12 +173,12 @@
>+@@ -172,12 +172,12 @@
>      char* InstallFontName;
>      char* Components; 
>      char* Tasks;
>@@ -47,21 +47,3 @@
>  #if 0
>      Options: set of (foConfirmOverwrite, foUninsNeverUninstall, foRestartReplace,
>        foDeleteAfterInstall, foRegisterServer, foRegisterTypeLib, foSharedFile,
>-@@ -191,7 +191,7 @@
>- #endif
>- } TSetupFileEntry;
>- 
>--P typedef struct
>-+typedef struct
>- {
>-   uint32_t FirstDisk;
>-   uint32_t LastDisk;
>-@@ -202,7 +202,7 @@
>-   uint32_t Date;
>-   uint32_t FileVersionMS;
>-   uint32_t FileVersionLS;
>--} TSetupFileLocationEntry;
>-+} P TSetupFileLocationEntry;
>- 
>- #define SETUP_FILE_LOCATION_ENTRY_SIZE  0x29
>- 
>Index: Makefile
>===================================================================
>RCS file: /home/pcvs/ports/emulators/wine-doors/Makefile,v
>retrieving revision 1.3
>diff -u -r1.3 Makefile
>--- Makefile	6 Jun 2008 13:27:07 -0000	1.3
>+++ Makefile	8 Jun 2008 22:54:44 -0000
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	wine-doors
> PORTVERSION=	0.1.2
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	emulators
> MASTER_SITES=	http://www.wine-doors.org/releases/
> 
>@@ -19,7 +19,7 @@
> 		${PYTHON_SITELIBDIR}/gtk-2.0/gtksourceview.so:${PORTSDIR}/x11-toolkits/py-gnome-desktop \
> 		bash:${PORTSDIR}/shells/bash \
> 		cabextract:${PORTSDIR}/archivers/cabextract \
>-		orange:${PORTSDIR}/archivers/orange \
>+		orange:${PORTSDIR}/archivers/liborange \
> 		unzip:${PORTSDIR}/archivers/unzip \
> 		wine:${PORTSDIR}/emulators/wine
> 
>Index: Makefile
>===================================================================
>RCS file: /home/pcvs/ports/palm/synce-kde/Makefile,v
>retrieving revision 1.22
>diff -u -r1.22 Makefile
>--- Makefile	7 Jun 2008 02:57:35 -0000	1.22
>+++ Makefile	8 Jun 2008 22:54:39 -0000
>@@ -6,7 +6,7 @@
> 
> PORTNAME=	synce-kde
> PORTVERSION=	0.9.1
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	palm
> MASTER_SITES=	SF
> MASTER_SITE_SUBDIR=	synce
>@@ -18,7 +18,7 @@
> 		rapi.2:${PORTSDIR}/palm/synce-librapi2 \
> 		rra.0:${PORTSDIR}/palm/synce-rra \
> 		dynamite.0:${PORTSDIR}/archivers/libdynamite \
>-		orange.0:${PORTSDIR}/archivers/orange \
>+		orange.0:${PORTSDIR}/archivers/liborange \
> 		unshield.0:${PORTSDIR}/archivers/unshield
> 
> RUN_DEPENDS+=	synce-serial-start:${PORTSDIR}/palm/synce-serial

Actions: View | Diff

Attachments on bug 124402: 87760