Skip to content

Commit

Permalink
pvpgn: Fix implicit delarations (closes #1101)
Browse files Browse the repository at this point in the history
  • Loading branch information
dmacks committed Nov 6, 2023
1 parent 3905032 commit e254e2b
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 25 deletions.
16 changes: 12 additions & 4 deletions 10.9-libcxx/stable/main/finkinfo/net/pvpgn.info
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
Info2: <<
Package: pvpgn%type_pkg[sql]
Version: 1.8.5
Revision: 1005
Revision: 1006
Type: sql (-mysql -pgsql .)
Source: http://download.berlios.de/%{ni}/%{ni}-%v.tar.gz
#Source: http://download.berlios.de/%{ni}/%{ni}-%v.tar.gz
Source: https://github.com/pvpgn/pvpgn-server/releases/download/v%v/%{ni}-%v.tar.gz
Maintainer: U-238 <[email protected]>
HomePage: http://pvpgn.berlios.de
Description: Battle.net and WOL emulation server
Expand All @@ -20,13 +21,16 @@ Replaces: <<
<<
Depends: <<
pvpgn-support (>= 1.2-1001),
libbind6,
(%type_raw[sql] = -mysql) mysql-unified,
(%type_raw[sql] = -mysql) mysql-unified-shlibs,
(%type_raw[sql] = -pgsql) postgresql12,
(%type_raw[sql] = -pgsql) postgresql12-shlibs
<<
BuildDepends: <<
autoconf2.6,
fink-package-precedence,
libbind6-dev,
libpcap1,
(%type_raw[sql] = -mysql) mysql-unified-dev,
(%type_raw[sql] = -pgsql) postgresql12-dev
Expand Down Expand Up @@ -76,16 +80,20 @@ ConfigureParams: <<
--datadir=%p/share/pvpgn
<<
PatchFile: pvpgn.patch
PatchFile-MD5: e38fe9b0262af0c928e7c2d5658c85c2
PatchFile-MD5: 915f5c5f0c6d7c1bcc7ff44f0c78e9c8
PatchScript: <<
#! /bin/sh -ev
%{default_script}
perl -pi.bak -e 's,(pgsql_try_includes)=".*",\1="%p/opt/postgresql-12/include",' src/configure
# configure checks a hard-code list of paths for headers
# rather that calling their _config scripts
perl -pi.bak -e 's,(pgsql_try_includes)=".*",\1="%p/opt/postgresql-12/include",; s,(mysql_try_includes)=".*",\1="%p/include/mysql",' src/configure.in
perl -pi -e 's/\@(\$\{LINK\})/\1/' src/Makefile.in
<<
CompileScript: <<
#! /bin/sh -ev
cd src
# tons of tests need upating for new clang strictness
autoreconf -fi
if [ "%type_raw[sql]" == "-pgsql" ]; then
export LDFLAGS="-L%p/opt/postgresql-12/lib $LDFLAGS"
fi
Expand Down
21 changes: 0 additions & 21 deletions 10.9-libcxx/stable/main/finkinfo/net/pvpgn.patch
Original file line number Diff line number Diff line change
Expand Up @@ -34,24 +34,3 @@ diff -Nurd pvpgn-1.8.5.orig/src/bnetd/handle_irc.c pvpgn-1.8.5/src/bnetd/handle_
#include "common/util.h"
#ifdef STDC_HEADERS
# include <stdlib.h>
diff -Nurd pvpgn-1.8.5.orig/src/configure pvpgn-1.8.5/src/configure
--- pvpgn-1.8.5.orig/src/configure 2009-02-25 17:57:32.000000000 -0500
+++ pvpgn-1.8.5/src/configure 2021-07-15 02:24:43.000000000 -0400
@@ -1703,7 +1703,7 @@
if test "$with_mysql" = "yes" ; then
echo $ac_n "checking for mysql include path""... $ac_c" 1>&6
echo "configure:1706: checking for mysql include path" >&5
- mysql_try_includes="/usr/include /usr/include/mysql /usr/local/include /usr/local/include/mysql /usr/local/mysql/include /usr/local/mysql/include/mysql"
+ mysql_try_includes="${prefix}/include/mysql"
for i in `echo ${mysql_try_includes}`; do
if test -f "${i}/mysql.h" ; then
CPPFLAGS="${CPPFLAGS} -I${i}"
@@ -1825,7 +1825,7 @@
if test "$with_pgsql" = "yes" ; then
echo $ac_n "checking for pgsql include path""... $ac_c" 1>&6
echo "configure:1828: checking for pgsql include path" >&5
- pgsql_try_includes="/usr/include /usr/include/pgsql /usr/local/include /usr/local/include/pgsql /usr/local/pgsql/include"
+ pgsql_try_includes="${prefix}/include"
for i in `echo ${pgsql_try_includes}`; do
if test -f "${i}/libpq-fe.h" ; then
CPPFLAGS="${CPPFLAGS} -I${i}"

0 comments on commit e254e2b

Please sign in to comment.