summaryrefslogtreecommitdiff
path: root/devel/styx/files
diff options
context:
space:
mode:
Diffstat (limited to 'devel/styx/files')
-rw-r--r--devel/styx/files/patch-Makefile.in11
-rw-r--r--devel/styx/files/patch-configure.in19
-rw-r--r--devel/styx/files/patch-inc__sysbase1.h11
-rw-r--r--devel/styx/files/patch-libbase__gstream.c11
-rw-r--r--devel/styx/files/patch-libbase__sysbase1.c29
-rw-r--r--devel/styx/files/patch-pgm_ctoh.c83
6 files changed, 0 insertions, 164 deletions
diff --git a/devel/styx/files/patch-Makefile.in b/devel/styx/files/patch-Makefile.in
deleted file mode 100644
index d81f2808fcce..000000000000
--- a/devel/styx/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig Tue Dec 9 23:38:07 2003
-+++ Makefile.in Mon Feb 23 09:03:36 2004
-@@ -115,7 +115,7 @@
- noinst_LTLIBRARIES = libfoolam.la
- libfoolam_la_SOURCES = foolam.c
-
--SUBDIRS = gen libbase libstyx libutil modext modstd pgm inc doc examples spe pat libxml incxml pgmxml genxml spexml
-+SUBDIRS = gen libbase libstyx libutil modext modstd pgm inc libxml incxml pgmxml genxml spexml
-
- EXTRA_DIST = LICENSE bootstrap util windows libc++
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/devel/styx/files/patch-configure.in b/devel/styx/files/patch-configure.in
deleted file mode 100644
index 540570ed9706..000000000000
--- a/devel/styx/files/patch-configure.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.in.orig 2003-12-09 15:36:00 UTC
-+++ configure.in
-@@ -61,13 +61,13 @@ AC_CHECK_FUNCS(dlerror)
- dnl AC_PREFIX_DEFAULT(/usr/local/styx)
-
- AC_CACHE_CHECK( [where to install HTML documents],
-- [ac_cv_htmldir],[ac_cv_htmldir='$(datadir)/doc'])
-+ [ac_cv_htmldir],[ac_cv_htmldir='$(datadir)/doc/styx'])
- htmldir=$ac_cv_htmldir
- AC_CACHE_CHECK( [where to install SGML documents],
-- [ac_cv_sgmldir],[ac_cv_sgmldir='$(datadir)/doc'])
-+ [ac_cv_sgmldir],[ac_cv_sgmldir='$(datadir)/doc/styx'])
- sgmldir=$ac_cv_sgmldir
- AC_CACHE_CHECK( [where to install examples],
-- [ac_cv_sampledir],[ac_cv_sampledir='$(datadir)/examples'])
-+ [ac_cv_sampledir],[ac_cv_sampledir='$(datadir)/examples/styx'])
- sampledir=$ac_cv_sampledir
-
- AC_SUBST(htmldir)
diff --git a/devel/styx/files/patch-inc__sysbase1.h b/devel/styx/files/patch-inc__sysbase1.h
deleted file mode 100644
index 5516eaf799a7..000000000000
--- a/devel/styx/files/patch-inc__sysbase1.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- inc/sysbase1.h.orig 2003-12-09 15:36:56 UTC
-+++ inc/sysbase1.h
-@@ -193,7 +193,7 @@ AbstractType( DL_Hdl ); /* Abstract hand
-
- #define DL_LOAD_LAZY 0
-
--#if !defined(STYX_CONFIG_OSMS) && (!defined(HAVE_CONFIG_H) || (defined(HAVE_LIBDL) && defined(HAVE_DLFCN_H)))
-+#if defined(__FreeBSD__) || (!defined(STYX_CONFIG_OSMS) && (!defined(HAVE_CONFIG_H) || (defined(HAVE_LIBDL) && defined(HAVE_DLFCN_H))))
- #define DL_LAZY RTLD_LAZY
- #define DL_NOW RTLD_NOW
- #define DL_BINDING_MASK RTLD_BINDING_MASK
diff --git a/devel/styx/files/patch-libbase__gstream.c b/devel/styx/files/patch-libbase__gstream.c
deleted file mode 100644
index d4a31d973458..000000000000
--- a/devel/styx/files/patch-libbase__gstream.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libbase/gstream.c.orig 2003-12-09 15:37:07 UTC
-+++ libbase/gstream.c
-@@ -497,7 +497,7 @@ void GS_fprint_ucs4(FILE* fp, wc_string
-
-
- #else
--#if !defined(MSDOS) && ( !defined(HAVE_CONFIG_H) || defined(HAVE_ICONV_H) )
-+#if defined(__FreeBSD__) || (!defined(MSDOS) && ( !defined(HAVE_CONFIG_H) || defined(HAVE_ICONV_H) ) )
-
- ConcreteType(CDIConv_T) // ICONV conversion description type
- {
diff --git a/devel/styx/files/patch-libbase__sysbase1.c b/devel/styx/files/patch-libbase__sysbase1.c
deleted file mode 100644
index a793c8327401..000000000000
--- a/devel/styx/files/patch-libbase__sysbase1.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- libbase/sysbase1.c.orig 2003-12-09 15:37:07 UTC
-+++ libbase/sysbase1.c
-@@ -521,7 +521,7 @@ StdCPtr apply_fun(PCFUN f, int cnt, StdC
- }
-
- #else
--#if !defined( MSDOS ) && defined ( __GNUC__ ) && #cpu (i386)
-+#if !defined( MSDOS ) && defined ( __GNUC__ ) && defined(__i386__)
- #define PUSH_FUN_ARG(arg) __asm__ volatile ( "pushl %0" : : "r" (arg) )
- #define CALL_FUN(f) __asm__ volatile ( "call *%0" : : "r" (f) )
-
-@@ -550,7 +550,7 @@ AbstractType( DL_Hdl ); /* Abstract hand
- #define DL_LOAD_LAZY 0
-
- /*DOC_INTERFACE*/
--#if !defined(STYX_CONFIG_OSMS) && (!defined(HAVE_CONFIG_H) || (defined(HAVE_LIBDL) && defined(HAVE_DLFCN_H)))
-+#if defined(__FreeBSD__) || (!defined(STYX_CONFIG_OSMS) && (!defined(HAVE_CONFIG_H) || (defined(HAVE_LIBDL) && defined(HAVE_DLFCN_H))))
- #define DL_LAZY RTLD_LAZY
- #define DL_NOW RTLD_NOW
- #define DL_BINDING_MASK RTLD_BINDING_MASK
-@@ -594,7 +594,7 @@ AbstractType( DL_Hdl ); /* Abstract hand
- }
-
- #else
--#if !defined(MSDOS) && ( !defined(HAVE_CONFIG_H) || ( defined(HAVE_LIBDL) && defined(HAVE_DLFCN_H) ) )
-+#if defined(__FreeBSD__) || (!defined(MSDOS) && ( !defined(HAVE_CONFIG_H) || ( defined(HAVE_LIBDL) && defined(HAVE_DLFCN_H) ) ) )
-
- DL_Hdl DL_open(string dlname, int flag)
- /* loads dll 'dlname' in mode 'flag' ( ERROR: NULL )
diff --git a/devel/styx/files/patch-pgm_ctoh.c b/devel/styx/files/patch-pgm_ctoh.c
deleted file mode 100644
index b6799af70e43..000000000000
--- a/devel/styx/files/patch-pgm_ctoh.c
+++ /dev/null
@@ -1,83 +0,0 @@
---- pgm/ctoh.c.orig 2002-12-02 12:45:37 UTC
-+++ pgm/ctoh.c
-@@ -135,7 +135,7 @@ void patchhead(void)
- }
- }
-
--bool getline(void)
-+bool get_line(void)
- {
- if( scan_line != NULL ) FreeMem(scan_line);
- if ((scan_line = Line_get(SysIn)) == NULL)
-@@ -630,7 +630,7 @@ void copyBlock(bool skipFirst, bool DocB
- {
- t = convBlock(temp); FreeMem(temp); temp = t;
- }
-- if( getline() && CTypConv )
-+ if( get_line() && CTypConv )
- {
- t = convBlock(line); FreeMem(line); scan_line = line = t;
- }
-@@ -657,7 +657,7 @@ void copyBlock(bool skipFirst, bool DocB
- line[rgh+1] = 0;
- pushFuncLine(temp,StrCopy(line+lft));
- }
-- while( line[0] != 0 && line[0] != '{') getline();
-+ while( line[0] != 0 && line[0] != '{') get_line();
- return;
- Ordinary:
- if( GenExp && line[0] != 0 )
-@@ -703,7 +703,7 @@ Ordinary:
- ext = Sink_open();
- Sink_printf(ext,"%s\n",line);
- }
-- while(getline() && line[0] != 0 && line[0] != '{' )
-+ while(get_line() && line[0] != 0 && line[0] != '{' )
- {
- if( extflg &=
- ( !beginswith("/*") && !beginswith("//") && !beginswith("#") ))
-@@ -765,7 +765,7 @@ Ordinary:
-
- void skipDoc(void)
- {
-- while(getline() && strcmp(line,"#endif") != 0) /* skip */;
-+ while(get_line() && strcmp(line,"#endif") != 0) /* skip */;
- }
-
- void copyDoc
-@@ -808,7 +808,7 @@ void copyDoc
- }
- if( t2 == (string)NULL)
- {
-- while(getline() )
-+ while(get_line() )
- {
- fprintf(SysOut,"%s\n",line);
- if( (t2=strstr(line,szEndTag)) != (string)NULL)
-@@ -850,7 +850,7 @@ void copyToI(string szEndTag, bool force
- if( CTypConv ) pSnk = Sink_open();
- if( forcedDocBlock )
- fprintf(SysDoc,"<br><pre>\n");
-- while(getline() && strcmp(line,szEndTag) != 0)
-+ while(get_line() && strcmp(line,szEndTag) != 0)
- {
- if( CTypConv ) Sink_printf(pSnk,"%s\n",line);
- else
-@@ -900,7 +900,7 @@ void convertText(void)
- Shift = False;
- OnOff = True; /* INTERFACE_ON ! */
- mainSeen = False;
-- if (getline()) copyBlock(False,False,False);
-+ if (get_line()) copyBlock(False,False,False);
- if (!Patched) fprintf(STDERR,"Warning: %s missing header comment.\n",cfid);
- Patched = True;
- fprintf(SysOut,"/* File generated by 'ctoh'. Don't change manually. */\n");
-@@ -924,7 +924,7 @@ void convertText(void)
- fprintf(SysOut,"#endif\n");
- fprintf(SysOut,"\n");
- }
-- while (getline())
-+ while (get_line())
- {
- if( CLinkageFlag == False && IncludeSeen == True )
- {