aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordemon <demon@FreeBSD.org>2004-08-30 18:22:03 +0800
committerdemon <demon@FreeBSD.org>2004-08-30 18:22:03 +0800
commita3c91e0b6a83cc654291a48a4434dd9a7fed060a (patch)
tree4233cf73ca23d3f43abfde935c2426e05bd54188
parentc9d72e8e38f2a9b936856dcd423c5dda1ccd7ad2 (diff)
downloadfreebsd-ports-gnome-a3c91e0b6a83cc654291a48a4434dd9a7fed060a.tar.gz
freebsd-ports-gnome-a3c91e0b6a83cc654291a48a4434dd9a7fed060a.tar.zst
freebsd-ports-gnome-a3c91e0b6a83cc654291a48a4434dd9a7fed060a.zip
Fix build with the latest version of SQLRelay.
-rw-r--r--databases/p5-sqlrelay/Makefile12
-rw-r--r--databases/p5-sqlrelay/pkg-plist23
2 files changed, 15 insertions, 20 deletions
diff --git a/databases/p5-sqlrelay/Makefile b/databases/p5-sqlrelay/Makefile
index a4d3254e01a5..3a50c4041f6c 100644
--- a/databases/p5-sqlrelay/Makefile
+++ b/databases/p5-sqlrelay/Makefile
@@ -7,7 +7,6 @@
PORTNAME= ${SQLRELAY_PORTNAME}
PORTVERSION= ${SQLRELAY_PORTVERSION}
-PORTREVISION= 1
CATEGORIES= databases perl5
MASTER_SITES= # none
PKGNAMEPREFIX= p5-
@@ -22,16 +21,13 @@ LIB_DEPENDS= sqlrclient.0:${SQLRELAY_PORTDIR}
USE_PERL5= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
-MAKEFILE= Makefile.master
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= ${SQLRELAY_CONFIGURE_ARGS} \
--with-perl-prefix="/usr"
-
-MAN3= DBD::SQLRelay.3 \
- Firstworks::SQLRConnection.3 \
- Firstworks::SQLRCursor.3
-MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ PTHREADINCLUDES="${PTHREAD_CFLAGS}" \
+ PTHREADLIBS="${PTHREAD_LIBS}"
.include "${.CURDIR}/../sqlrelay/Makefile.common"
@@ -53,7 +49,7 @@ do-build:
do-install:
for dir in ${WRKSRC}/src/api/perl/*; do \
cd $$dir && \
- ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \
+ ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} \
${MAKE_ARGS} ${INSTALL_TARGET}; \
done
diff --git a/databases/p5-sqlrelay/pkg-plist b/databases/p5-sqlrelay/pkg-plist
index 24f7f0f3fed2..3532f8641bac 100644
--- a/databases/p5-sqlrelay/pkg-plist
+++ b/databases/p5-sqlrelay/pkg-plist
@@ -3,15 +3,14 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/SQLRelay/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/SQLRelay
@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD 2>/dev/null || true
-%%SITE_PERL%%/%%PERL_ARCH%%/Firstworks/SQLRConnection.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Firstworks/SQLRConnection/SQLRConnection.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Firstworks/SQLRConnection/SQLRConnection.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Firstworks/SQLRConnection/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Firstworks/SQLRConnection
-%%SITE_PERL%%/%%PERL_ARCH%%/Firstworks/SQLRCursor.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Firstworks/SQLRCursor/SQLRCursor.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Firstworks/SQLRCursor/SQLRCursor.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Firstworks/SQLRCursor/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Firstworks/SQLRCursor
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Firstworks 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Firstworks 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/SQLRelay/Connection.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SQLRelay/Cursor.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SQLRelay/Connection/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SQLRelay/Connection/Connection.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SQLRelay/Connection/Connection.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SQLRelay/Connection
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SQLRelay/Cursor/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SQLRelay/Cursor/Cursor.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SQLRelay/Cursor/Cursor.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SQLRelay/Cursor
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SQLRelay