Date: Thu, 7 Apr 2005 15:40:13 GMT From: Sam Lawrance <boris@brooknet.com.au> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/79615: [PATCH] lang/scriba: update to 20b0 Message-ID: <200504071540.j37FeDpk095396@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/79615; it has been noted by GNATS.
From: Sam Lawrance <boris@brooknet.com.au>
To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org
Cc:
Subject: Re: ports/79615: [PATCH] lang/scriba: update to 20b0
Date: Fri, 08 Apr 2005 01:32:07 +1000
--=-HacqjiF1WBZQJ61vYXqZ
Content-Type: text/plain
Content-Transfer-Encoding: 7bit
FreeBSD committers are good, of course... but they can't commit what
they don't have :)
--=-HacqjiF1WBZQJ61vYXqZ
Content-Disposition: attachment; filename=scriba-new-files-patch
Content-Type: text/plain; name=scriba-new-files-patch; charset=ASCII
Content-Transfer-Encoding: 7bit
--- /dev/null Fri Apr 8 01:22:00 2005
+++ files/patch-commands::environ.c Tue Mar 1 23:06:34 2005
@@ -0,0 +1,13 @@
+--- commands/environ.c.orig Tue Mar 1 23:04:45 2005
++++ commands/environ.c Tue Mar 1 23:06:19 2005
+@@ -27,6 +27,10 @@
+ #define _environ environ
+ #endif
+
++#ifdef __FreeBSD__
++#define _environ environ
++#endif
++
+ extern char **_environ;
+
+ /**ENVIRON
--- /dev/null Fri Apr 8 01:22:00 2005
+++ files/patch-extensions::bdb::interface.c Tue Mar 1 19:37:09 2005
@@ -0,0 +1,20 @@
+--- extensions/bdb/interface.c.orig Tue Mar 1 18:07:08 2005
++++ extensions/bdb/interface.c Tue Mar 1 19:36:14 2005
+@@ -11,7 +11,7 @@
+
+ These lines are needed by the configurator to generate the file 'libraries.jim'
+ NTLIBS: libdb41s.lib
+-UXLIBS: -lbdb
++UXLIBS: -ldb41
+
+ */
+ #include <sys/types.h>
+@@ -22,7 +22,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+
+-#include <db.h>
++#include <db41/db.h>
+
+ #include "../../basext.h"
+
--- /dev/null Fri Apr 8 01:22:00 2005
+++ files/patch-extensions::curl::interface.c Tue Mar 1 19:47:31 2005
@@ -0,0 +1,24 @@
+--- extensions/curl/interface.c.orig Tue Mar 1 19:38:05 2005
++++ extensions/curl/interface.c Tue Mar 1 19:47:08 2005
+@@ -18,7 +18,7 @@
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ NTLIBS: libcurl.lib ws2_32.lib
+-UXLIBS: -lcurl -lssl -lcrypto -ldl -lc
++UXLIBS: -lcurl -lssl -lcrypto -lc
+
+ */
+ #include <stdio.h>
+@@ -1352,10 +1352,10 @@
+ if( Argument == NULL )return COMMAND_ERROR_ARGUMENT_RANGE;
+ Argument = besCONVERT2STRING(Argument);
+ if( STRLEN(Argument) == 10 && memcmp(STRINGVALUE(Argument),"IFMODSINCE",10) == 0 ){
+- value = TIMECOND_IFMODSINCE;
++ value = CURL_TIMECOND_IFMODSINCE;
+ }else
+ if( STRLEN(Argument) == 12 && memcmp(STRINGVALUE(Argument),"IFUNMODSINCE",12) == 0 ){
+- value = TIMECOND_IFUNMODSINCE;
++ value = CURL_TIMECOND_IFUNMODSINCE;
+ }else return COMMAND_ERROR_ARGUMENT_RANGE;
+ res = curl_easy_setopt(pCon->myConnection,CURLOPT_TIMECONDITION,value);
+ if( res == CURLE_OK ) return COMMAND_ERROR_SUCCESS;
--- /dev/null Fri Apr 8 01:22:00 2005
+++ files/patch-extensions::curses::interface.c Tue Mar 1 19:51:49 2005
@@ -0,0 +1,11 @@
+--- extensions/curses/interface.c.orig Tue Mar 1 19:38:05 2005
++++ extensions/curses/interface.c Tue Mar 1 19:51:22 2005
+@@ -25,7 +25,7 @@
+
+ */
+ #include <curses.h>
+-#include <malloc.h>
++#include <stdlib.h>
+
+ /**
+ =H the module CURSES
--- /dev/null Fri Apr 8 01:22:00 2005
+++ files/patch-extensions::psql::interface.c Tue Mar 1 22:09:30 2005
@@ -0,0 +1,11 @@
+--- extensions/psql/interface.c.orig Tue Mar 1 21:47:06 2005
++++ extensions/psql/interface.c Tue Mar 1 22:08:58 2005
+@@ -24,7 +24,7 @@
+ #define PTS_MODULE "pgsqlinterf.c"
+
+ /* vvv Debian GNU/Linux: /usr/include/postgresql/libpq-fe.h */
+-#include <postgresql/libpq-fe.h>
++#include <libpq-fe.h>
+ #include "../../basext.h"
+ #include <stdio.h> /* simple debugging */
+ #include <string.h> /* memcmp() */
--- /dev/null Fri Apr 8 01:22:00 2005
+++ files/patch-extensions::re::regex.h Tue Mar 1 22:15:33 2005
@@ -0,0 +1,11 @@
+--- extensions/re/regex.h.orig Tue Mar 1 22:12:11 2005
++++ extensions/re/regex.h Tue Mar 1 22:14:55 2005
+@@ -53,6 +53,8 @@
+ #define __stdcall
+ #endif
+
++#include <unistd.h>
++
+ /* types */
+ typedef off_t regoff_t;
+
--- /dev/null Fri Apr 8 01:22:00 2005
+++ files/patch-make_gcc.jim Thu Apr 7 14:03:29 2005
@@ -0,0 +1,23 @@
+--- make_gcc.jim.orig Tue Mar 1 22:15:45 2005
++++ make_gcc.jim Tue Mar 1 22:18:31 2005
+@@ -15,7 +15,7 @@
+ -I where the include directories are
+ -L where the libraries are
+ }
+-{#define cc=gcc -w}
++{#define cc=cc -w %%CFLAGS%% -L%%LOCALBASE%%/lib -I%%LOCALBASE%%/include -L%%X11BASE%%/lib -I%%X11BASE%%/include -I%%LOCALBASE%%/include/libxml2 -L%%LOCALBASE%%/lib/mysql }
+ {#define CcOptOutput/X=-o X}
+ {#define CcOptInput/X=X}
+ {#define CcOptCompile=-c}
+@@ -26,9 +26,9 @@
+ {#define LibOptOutput/X=-r X}
+ {#define LibOptInput/X=X}
+
+-{#define ld=ld -shared -Bstatic}
++{#define ld=ld %%LDFLAGS%% -shared -Bstatic -L%%LOCALBASE%%/lib -L%%X11BASE%%/lib -L%%LOCALBASE%%/lib/mysql }
+ {#define LdOptOutput/X=-o X}
+ {#define LdOptInput/X=X}
+
+ {@comment the standard libraries that we need}
+-{#define StandardLibraries=-lc -lm -ldl -lpthread}
++{#define StandardLibraries=-lc -lm %%PTHREAD_LIBS%%}
--- /dev/null Fri Apr 8 01:22:00 2005
+++ files/patch-memory.c Tue Mar 1 22:11:52 2005
@@ -0,0 +1,15 @@
+--- memory.c.orig Mon Apr 22 01:40:39 2002
++++ memory.c Tue Mar 1 22:11:42 2005
+@@ -19,7 +19,11 @@
+
+ TO_HEADER:
+
+-typedef unsigned char BYTE, *PBYTE;
++#ifndef BYTE_TYPE_ALREADY_DEFINED
++typedef unsigned char BYTE;
++#endif
++
++typedef unsigned char *PBYTE;
+
+ typedef struct _FixSizeMemoryObject {
+
--- /dev/null Fri Apr 8 01:22:00 2005
+++ files/patch-scriba.c Wed Mar 2 01:07:19 2005
@@ -0,0 +1,11 @@
+--- scriba.c.orig Tue Mar 1 23:06:45 2005
++++ scriba.c Wed Mar 2 01:07:07 2005
+@@ -98,7 +98,7 @@
+ #define CONFIG_FILE "SCRIBA.INI"
+ #else
+ #define CONFIG_ENVIR "SCRIBACONF"
+-#define CONFIG_FILE "/etc/scriba/basic.conf"
++#define CONFIG_FILE "%%PREFIX%%/etc/scriba/basic.conf"
+ #endif
+
+
--- /dev/null Fri Apr 8 01:22:00 2005
+++ files/patch-setup.pl Wed Mar 2 19:08:32 2005
@@ -0,0 +1,75 @@
+--- setup.pl.orig Wed Mar 2 19:06:18 2005
++++ setup.pl Wed Mar 2 19:08:02 2005
+@@ -176,7 +176,6 @@
+ #
+ $esdlocation = undef;
+ for (@INC){
+- next if /\./;
+ if( -e "$_/jamal/esd.pm" ){
+ $esdlocation = "$_/jamal/esd.pm";
+ }
+@@ -1152,7 +1151,7 @@
+ let ERRCOUNT = \$ERRCOUNT+1
+ fi
+
+-chown $owner:$owner $to 2>/dev/null
++chown $owner $to 2>/dev/null
+ if [ \$? -ne 0 ] ; then
+ echo "###ERROR setting the owner of the file $to to $owner"
+ let ERRCOUNT = \$ERRCOUNT+1
+@@ -1186,7 +1185,7 @@
+ let ERRCOUNT = \$ERRCOUNT+1
+ fi
+
+-chown $owner:$owner $tofils 2>/dev/null
++chown $owner $tofils 2>/dev/null
+ if [ \$? -ne 0 ] ; then
+ echo "###ERROR setting the owner of the file $tofils to $owner"
+ let ERRCOUNT = \$ERRCOUNT+1
+@@ -1410,7 +1409,7 @@
+ print F <<ENDSHELL;
+ #!/bin/sh
+ #
+-# Start/stops the ScriptBasic httpd daemon (/usr/bin/sbhttpd)
++# Start/stops the ScriptBasic httpd daemon (%%PREFIX%%/bin/sbhttpd)
+ #
+
+ PIDFILE=$LOG/pid.txt
+@@ -1453,7 +1452,7 @@
+ echo "\$0 \$ARG: sbhttpd (pid \$PID) already running"
+ continue
+ fi
+- if /usr/bin/sbhttpd -start ; then
++ if %%PREFIX%%/bin/sbhttpd -start ; then
+ echo "\$0 \$ARG: sbhttpd started"
+ else
+ echo "\$0 \$ARG: sbhttpd could not be started"
+@@ -1795,17 +1794,17 @@
+ #
+ # UNIX installation default configuration values
+ #
+-$INSTALL_DEFAULT_CONFIGDIR='/etc/scriba';
+-$INSTALL_DEFAULT_INCLUDE ='/usr/share/scriba/include';
+-$INSTALL_DEFAULT_SOURCE ='/usr/share/scriba/source';
+-$INSTALL_DEFAULT_MODULE ='/usr/local/lib/scriba';
+-$INSTALL_DEFAULT_DOCU ='/usr/share/scriba/source';
+-$INSTALL_DEFAULT_LIB ='/usr/local/lib';
+-$INSTALL_DEFAULT_CACHE ='/var/cache/scriba/cache';
+-$INSTALL_DEFAULT_HEBTEMP ='/var/cache/scriba/hebtemp';
+-$INSTALL_DEFAULT_BIN ='/usr/bin';
+-$INSTALL_DEFAULT_LOG ='/var/log/scriba';
+-$INSTALL_DEFAULT_ETC ='/etc/init.d';
++$INSTALL_DEFAULT_CONFIGDIR='%%PREFIX%%/etc/scriba';
++$INSTALL_DEFAULT_INCLUDE ='%%PREFIX%%/include/scriba';
++$INSTALL_DEFAULT_SOURCE ='%%DATADIR%%/source';
++$INSTALL_DEFAULT_MODULE ='%%PREFIX%%/lib/scriba';
++$INSTALL_DEFAULT_DOCU ='%%DOCSDIR%%';
++$INSTALL_DEFAULT_LIB ='%%PREFIX%%/lib';
++$INSTALL_DEFAULT_CACHE ='%%PREFIX%%/var/cache/scriba/cache';
++$INSTALL_DEFAULT_HEBTEMP ='%%PREFIX%%/var/cache/scriba/hebtemp';
++$INSTALL_DEFAULT_BIN ='%%PREFIX%%/bin';
++$INSTALL_DEFAULT_LOG ='%%PREFIX%%/var/log/scriba';
++$INSTALL_DEFAULT_ETC ='%%PREFIX%%/etc/rc.d';
+
+ %INSTALL_DEFAULT = (
+ '--install-configdir' => $INSTALL_DEFAULT_CONFIGDIR,
--=-HacqjiF1WBZQJ61vYXqZ--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200504071540.j37FeDpk095396>