cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cosmetic changes, now use regular process for patching.

Browse Source
This commit is contained in:
couderc 2003-02-11 19:47:34 +00:00
parent 22ddefeb3e
commit b3bf87b643
12 changed files with 106 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
editors/abiword/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.26 2003/02/11 18:50:22 marcm Exp $
# $OpenBSD: Makefile,v 1.27 2003/02/11 19:47:34 couderc Exp $
COMMENT= "open-source, cross-platform WYSIWYG word processor"
@ -35,9 +35,8 @@ FAKE_FLAGS= prefix="${WRKINST}${PREFIX}"
MAKE_FILE= GNUmakefile
WRKDIST= ${WRKDIR}/abiword-${VERSION}/abi
PFILE= ${WRKDIR}/abiword-${VERSION}/wv/generic.c
WRKDIST= ${WRKDIR}/abiword-${VERSION}
WRKSRC= ${WRKDIST}/abi
FLAVORS= gnome
FLAVOR?=
@ -49,18 +48,10 @@ LIB_DEPENDS+= bonobo.2,bonobo-print.2,bonobox.2::x11/gnome/bonobo \
glade.5,glade-gnome.5::devel/libglade,gnome \
gnomevfs::x11/gnome/vfs
.else
CONFIGURE_ARGS+= --disable-gnome
CONFIGURE_ARGS+= --with-libxml2
CONFIGURE_ARGS+= --disable-gnome --with-libxml2
LIB_DEPENDS+= xml2::textproc/libxml
.endif
post-patch:
@mv ${PFILE} ${PFILE}.orig
@sed -e s/tmpnam/mkstemp/ ${PFILE}.orig > ${PFILE}
@cd ${WRKDIR}/abiword-${VERSION}; \
patch -s < ${FILESDIR}/patch-wv_libole2_Makefile_in; \
patch -s < ${FILESDIR}/patch-psiconf_configure
.if ${FLAVOR:L:Mgnome}
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/gnome/apps/Applications

12
editors/abiword/patches/patch-GNUmakefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-GNUmakefile_in,v 1.1 2003/01/24 22:31:12 couderc Exp $
--- GNUmakefile.in.orig Thu Sep 12 02:26:24 2002
+++ GNUmakefile.in Fri Nov 15 18:31:27 2002
@@ -38,6 +38,8 @@ pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = .
+DESTDIR =
+
ACLOCAL = @ACLOCAL@
AUTOCONF = @AUTOCONF@
AUTOMAKE = @AUTOMAKE@

12
editors/abiword/patches/patch-abi_GNUmakefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-abi_GNUmakefile_in,v 1.1 2003/02/11 19:47:34 couderc Exp $
--- abi/GNUmakefile.in.orig Thu Jan 23 02:07:40 2003
+++ abi/GNUmakefile.in Tue Feb 11 19:16:43 2003
@@ -40,6 +40,8 @@ pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = .
+DESTDIR =
+
ACLOCAL = @ACLOCAL@
AUTOCONF = @AUTOCONF@
AUTOMAKE = @AUTOMAKE@

6
editors/abiword/patches/patch-src_af_util_xp_ut_endian_h → editors/abiword/patches/patch-abi_src_af_util_xp_ut_endian_h
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_af_util_xp_ut_endian_h,v 1.1 2002/10/17 18:37:13 couderc Exp $
--- src/af/util/xp/ut_endian.h.orig Fri Sep 6 22:42:32 2002
+++ src/af/util/xp/ut_endian.h Fri Sep 6 22:44:01 2002
$OpenBSD: patch-abi_src_af_util_xp_ut_endian_h,v 1.1 2003/02/11 19:47:34 couderc Exp $
--- abi/src/af/util/xp/ut_endian.h.orig Mon May 13 18:11:45 2002
+++ abi/src/af/util/xp/ut_endian.h Tue Feb 11 19:16:43 2003
@@ -74,6 +74,13 @@
#elif BYTE_ORDER == BIG_ENDIAN
#define UT_BIG_ENDIAN

12
editors/abiword/patches/patch-abi_src_tools_ttftool_unix_parse_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-abi_src_tools_ttftool_unix_parse_c,v 1.1 2003/02/11 19:47:34 couderc Exp $
--- abi/src/tools/ttftool/unix/parse.c.orig Thu Aug 15 21:59:18 2002
+++ abi/src/tools/ttftool/unix/parse.c Tue Feb 11 19:16:43 2003
@@ -77,7 +77,7 @@ readNamingTable(int fd)
strings[records[i].nameID]);
}
}
- free(records);
+ free(&records);
free(data);
return strings;
}

12
editors/abiword/patches/patch-abi_src_tools_ttftool_unix_ps_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-abi_src_tools_ttftool_unix_ps_c,v 1.1 2003/02/11 19:47:34 couderc Exp $
--- abi/src/tools/ttftool/unix/ps.c.orig Thu Aug 15 21:59:20 2002
+++ abi/src/tools/ttftool/unix/ps.c Tue Feb 11 19:16:43 2003
@@ -119,7 +119,7 @@ void
printPSTrailer(FILE *psfontfile)
{
int i,n;
- char *name;
+ unsigned char *name;
fprintf(psfontfile,"/CharStrings %d dict dup begin\n",nglyphs);
switch(post_format) {

6
editors/abiword/patches/patch-src_wp_main_unix_GNUmakefile_in → editors/abiword/patches/patch-abi_src_wp_main_unix_GNUmakefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_wp_main_unix_GNUmakefile_in,v 1.3 2003/02/03 15:13:11 couderc Exp $
--- src/wp/main/unix/GNUmakefile.in.orig Fri Jan 31 17:49:52 2003
+++ src/wp/main/unix/GNUmakefile.in Fri Jan 31 17:51:48 2003
$OpenBSD: patch-abi_src_wp_main_unix_GNUmakefile_in,v 1.1 2003/02/11 19:47:34 couderc Exp $
--- abi/src/wp/main/unix/GNUmakefile.in.orig Thu Jan 23 02:08:17 2003
+++ abi/src/wp/main/unix/GNUmakefile.in Tue Feb 11 19:16:43 2003
@@ -636,11 +636,13 @@ install-exec-local: install-wrapper
@if test -f $(DESTDIR)/$(bindir)/abiword; then \
echo "$(DESTDIR)/$(bindir)/abiword is a regular file - I'm not going to create a link."; \

36
editors/abiword/patches/patch-psiconv_configure Normal file
View File

@ -0,0 +1,36 @@
$OpenBSD: patch-psiconv_configure,v 1.1 2003/02/11 19:47:34 couderc Exp $
--- psiconv/configure.orig Fri Feb 1 12:05:30 2002
+++ psiconv/configure Tue Feb 11 19:16:44 2003
@@ -6092,8 +6092,8 @@ if test -z "$aix_libpath"; then aix_libp
hardcode_shlibpath_var=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
export_dynamic_flag_spec='${wl}-E'
else
case $host_os in
@@ -6102,8 +6102,8 @@ if test -z "$aix_libpath"; then aix_libp
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
;;
esac
fi
@@ -12024,8 +12024,8 @@ if test -z "$aix_libpath"; then aix_libp
hardcode_libdir_flag_spec_GCJ='-R$libdir'
;;
*)
- archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+ archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ hardcode_libdir_flag_spec_GCJ='${wl}-R$libdir'
;;
esac
fi

12
editors/abiword/patches/patch-src_tools_ttftool_unix_parse_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_tools_ttftool_unix_parse_c,v 1.1 2003/02/03 15:13:11 couderc Exp $
--- src/tools/ttftool/unix/parse.c.orig Fri Jan 24 19:15:13 2003
+++ src/tools/ttftool/unix/parse.c Fri Jan 24 19:20:01 2003
@@ -77,7 +77,7 @@ readNamingTable(int fd)
strings[records[i].nameID]);
}
}
- free(records);
+ free(&records);
free(data);
return strings;
}

12
editors/abiword/patches/patch-src_tools_ttftool_unix_ps_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_tools_ttftool_unix_ps_c,v 1.1 2003/02/03 15:13:11 couderc Exp $
--- src/tools/ttftool/unix/ps.c.orig Fri Jan 24 18:57:28 2003
+++ src/tools/ttftool/unix/ps.c Fri Jan 24 18:58:45 2003
@@ -119,7 +119,7 @@ void
printPSTrailer(FILE *psfontfile)
{
int i,n;
- char *name;
+ unsigned char *name;
fprintf(psfontfile,"/CharStrings %d dict dup begin\n",nglyphs);
switch(post_format) {

12
editors/abiword/patches/patch-wv_generic_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-wv_generic_c,v 1.1 2003/02/11 19:47:34 couderc Exp $
--- wv/generic.c.orig Thu May 9 23:49:24 2002
+++ wv/generic.c Tue Feb 11 19:16:44 2003
@@ -92,7 +92,7 @@ wvMalloc (U32 size)
char *
wvTempName (char *s)
{
- return tmpnam (s);
+ return mkstemp (s);
}
/*

12
editors/abiword/patches/patch-wv_libole2_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-wv_libole2_Makefile_in,v 1.1 2003/02/11 19:47:34 couderc Exp $
--- wv/libole2/Makefile.in.orig Wed Oct 31 18:07:39 2001
+++ wv/libole2/Makefile.in Tue Feb 11 19:16:44 2003
@@ -13,7 +13,7 @@ datadir=@datadir@
HAVE_GLIB = @HAVE_GLIB@
HAVE_GNOMEVFS= @HAVE_GNOMEVFS@
-CFLAGS = @CPPFLAGS@ @CFLAGS@ @DEFS@ -I$(srcdir)/ -I$(srcdir)/.. -DTTFDIR=\"$(datadir)/wv/ttf\" -I$(srcdir)/../libole2 @WMF_CFLAGS@ @GLIB_CFLAGS@
+CFLAGS = @DEFS@ -I$(srcdir)/ -I$(srcdir)/.. -DTTFDIR=\"$(datadir)/wv/ttf\" -I$(srcdir)/../libole2 @WMF_CFLAGS@ @GLIB_CFLAGS@ @CPPFLAGS@ @CFLAGS@
ifneq ($(HAVE_GLIB), 1)
CFLAGS += -I$(srcdir)/../glib-wv/
endif