Mon May 24 15:07:09 2021 UTC ()
postgresql-pljava: Remove PGSQL_VERSIONS_ACCEPTED.

It only listed the now non-existent 95.  If it really doesn't work with newer
versions then it needs to be upgraded or removed from pkgsrc.


(jperkin)
diff -r1.6 -r1.7 pkgsrc/databases/postgresql-pljava/Makefile
cvs diff -r1.6 -r1.7 pkgsrc/databases/postgresql-pljava/Makefile (switch to unified diff)

--- pkgsrc/databases/postgresql-pljava/Makefile 2020/05/23 15:30:27 1.6
+++ pkgsrc/databases/postgresql-pljava/Makefile 2021/05/24 15:07:09 1.7
@@ -1,79 +1,77 @@ @@ -1,79 +1,77 @@
1# $NetBSD: Makefile,v 1.6 2020/05/23 15:30:27 nia Exp $ 1# $NetBSD: Makefile,v 1.7 2021/05/24 15:07:09 jperkin Exp $
2 2
3DISTNAME= pljava-1.5.0 3DISTNAME= pljava-1.5.0
4PKGNAME= postgresql${PGSQL_VERSION}-${DISTNAME} 4PKGNAME= postgresql${PGSQL_VERSION}-${DISTNAME}
5CATEGORIES= databases 5CATEGORIES= databases
6MASTER_SITES= ${MASTER_SITE_GITHUB:=tada/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=tada/}
7 7
8GITHUB_PROJECT= pljava 8GITHUB_PROJECT= pljava
9GITHUB_TAG= V${PKGVERSION_NOREV:S/./_/g} 9GITHUB_TAG= V${PKGVERSION_NOREV:S/./_/g}
10DISTFILES= ${DEFAULT_DISTFILES} ${DISTNAME}-deps.tar.gz 10DISTFILES= ${DEFAULT_DISTFILES} ${DISTNAME}-deps.tar.gz
11SITES.${DISTNAME}-deps.tar.gz= ftp://ftp.NetBSD.org/pub/NetBSD/misc/fhajny/ 11SITES.${DISTNAME}-deps.tar.gz= ftp://ftp.NetBSD.org/pub/NetBSD/misc/fhajny/
12 12
13MAINTAINER= pkgsrc-users@NetBSD.org 13MAINTAINER= pkgsrc-users@NetBSD.org
14HOMEPAGE= https://github.com/tada/pljava/ 14HOMEPAGE= https://github.com/tada/pljava/
15COMMENT= Java Stored Procedures, Triggers, and Functions for PostgreSQL 15COMMENT= Java Stored Procedures, Triggers, and Functions for PostgreSQL
16LICENSE= modified-bsd 16LICENSE= modified-bsd
17 17
18DEPENDS+= apache-maven-[0-9]*:../../devel/apache-maven 18DEPENDS+= apache-maven-[0-9]*:../../devel/apache-maven
19DEPENDS+= postgresql${PGSQL_VERSION}-server>=0:../../databases/postgresql${PGSQL_VERSION}-server 19DEPENDS+= postgresql${PGSQL_VERSION}-server>=0:../../databases/postgresql${PGSQL_VERSION}-server
20 20
21PGSQL_VERSIONS_ACCEPTED= 95 
22 
23USE_JAVA2= 7 21USE_JAVA2= 7
24USE_LANGUAGES= c c++ 22USE_LANGUAGES= c c++
25TOOLS_BROKEN+= perl 23TOOLS_BROKEN+= perl
26 24
27WRKSRC= ${WRKDIR}/${DISTNAME:S/./_/g} 25WRKSRC= ${WRKDIR}/${DISTNAME:S/./_/g}
28 26
29.include "../../mk/bsd.prefs.mk" 27.include "../../mk/bsd.prefs.mk"
30.include "../../mk/compiler.mk" 28.include "../../mk/compiler.mk"
31.include "../../mk/java-vm.mk" 29.include "../../mk/java-vm.mk"
32 30
33.if !empty(PKG_JVM:Mopenjdk*) 31.if !empty(PKG_JVM:Mopenjdk*)
34LIBJVM= ${PKG_JAVA_HOME}/jre/lib/${MACHINE_ARCH:S/x86_64/amd64/:S/sparc64/sparcv9/:C/^e?arm.*$/arm/}/server/libjvm.${PG_LIB_EXT} 32LIBJVM= ${PKG_JAVA_HOME}/jre/lib/${MACHINE_ARCH:S/x86_64/amd64/:S/sparc64/sparcv9/:C/^e?arm.*$/arm/}/server/libjvm.${PG_LIB_EXT}
35.else 33.else
36LIBJVM= ${PKG_JAVA_HOME}/lib/${MACHINE_ARCH:S/x86_64/amd64/:S/sparc64/sparcv9/:C/^e?arm.*$/arm/}/server/libjvm.${PG_LIB_EXT} 34LIBJVM= ${PKG_JAVA_HOME}/lib/${MACHINE_ARCH:S/x86_64/amd64/:S/sparc64/sparcv9/:C/^e?arm.*$/arm/}/server/libjvm.${PG_LIB_EXT}
37.endif 35.endif
38 36
39SUBST_CLASSES+= sun 37SUBST_CLASSES+= sun
40SUBST_STAGE.sun= pre-configure 38SUBST_STAGE.sun= pre-configure
41SUBST_FILES.sun= pljava-so/aol.solaris-gcc.properties 39SUBST_FILES.sun= pljava-so/aol.solaris-gcc.properties
42SUBST_MESSAGE.sun= Fix SunOS build target 40SUBST_MESSAGE.sun= Fix SunOS build target
43SUBST_SED.sun= -e 's,/usr/sfw/include,${PGSQL_PREFIX}/include -I${PKG_JAVA_HOME}/include,' 41SUBST_SED.sun= -e 's,/usr/sfw/include,${PGSQL_PREFIX}/include -I${PKG_JAVA_HOME}/include,'
44 42
45SUBST_CLASSES+= jvm 43SUBST_CLASSES+= jvm
46SUBST_MESSAGE.jvm= Setting default libjvm path 44SUBST_MESSAGE.jvm= Setting default libjvm path
47SUBST_STAGE.jvm= pre-configure 45SUBST_STAGE.jvm= pre-configure
48SUBST_FILES.jvm= pljava-so/src/main/c/Backend.c 46SUBST_FILES.jvm= pljava-so/src/main/c/Backend.c
49SUBST_VARS.jvm= LIBJVM 47SUBST_VARS.jvm= LIBJVM
50 48
51MAVEN_FLAGS+= --offline 49MAVEN_FLAGS+= --offline
52MAVEN_FLAGS+= -Plinkpglibs 50MAVEN_FLAGS+= -Plinkpglibs
53MAVEN_FLAGS+= -Pwnosign 51MAVEN_FLAGS+= -Pwnosign
54MAVEN_FLAGS+= -Duser.home=${FAKEHOMEDIR} 52MAVEN_FLAGS+= -Duser.home=${FAKEHOMEDIR}
55MAVEN_FLAGS+= -Dmaven.repo.local=${WRKDIR}/deps 53MAVEN_FLAGS+= -Dmaven.repo.local=${WRKDIR}/deps
56MAVEN_FLAGS+= -Dnar.cores=${MAKE_JOBS:U1} 54MAVEN_FLAGS+= -Dnar.cores=${MAKE_JOBS:U1}
57MAVEN_FLAGS+= -Dpgsql.runpath=${PGSQL_PREFIX}/lib 55MAVEN_FLAGS+= -Dpgsql.runpath=${PGSQL_PREFIX}/lib
58MAVEN_FLAGS+= -Dpgsql.runpathpfx=${COMPILER_RPATH_FLAG} 56MAVEN_FLAGS+= -Dpgsql.runpathpfx=${COMPILER_RPATH_FLAG}
59.if ${OPSYS} == "SunOS" && !empty(CC_VERSION:Mgcc*) 57.if ${OPSYS} == "SunOS" && !empty(CC_VERSION:Mgcc*)
60MAVEN_FLAGS+= -Dnar.aolProperties=pljava-so/aol.solaris-gcc.properties 58MAVEN_FLAGS+= -Dnar.aolProperties=pljava-so/aol.solaris-gcc.properties
61.elif ${OPSYS} == "NetBSD" 59.elif ${OPSYS} == "NetBSD"
62MAVEN_FLAGS+= -Dnar.aolProperties=pljava-so/aol.netbsd.properties 60MAVEN_FLAGS+= -Dnar.aolProperties=pljava-so/aol.netbsd.properties
63.endif 61.endif
64 62
65INSTALL_FLAGS+= -Dpgconfig.sharedir=${DESTDIR}${PREFIX}/share/postgresql 63INSTALL_FLAGS+= -Dpgconfig.sharedir=${DESTDIR}${PREFIX}/share/postgresql
66INSTALL_FLAGS+= -Dpgconfig.pkglibdir=${DESTDIR}${PREFIX}/lib/postgresql 64INSTALL_FLAGS+= -Dpgconfig.pkglibdir=${DESTDIR}${PREFIX}/lib/postgresql
67 65
68post-extract: 66post-extract:
69 ${CP} ${PKGDIR}/files/aol.netbsd.properties ${WRKSRC}/pljava-so 67 ${CP} ${PKGDIR}/files/aol.netbsd.properties ${WRKSRC}/pljava-so
70 68
71do-build: 69do-build:
72 ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} mvn ${MAVEN_FLAGS} install 70 ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} mvn ${MAVEN_FLAGS} install
73 71
74do-install: 72do-install:
75 cd ${WRKSRC} && ${SETENV} ${INSTALL_ENV} java ${INSTALL_FLAGS} -jar \ 73 cd ${WRKSRC} && ${SETENV} ${INSTALL_ENV} java ${INSTALL_FLAGS} -jar \
76 pljava-packaging/target/pljava-pg${VER:!pg_config --version!:[2]:C/\.[0-9]+$//}-${MACHINE_ARCH:S/x86_64/amd64/}-${OPSYS}-gpp.jar 74 pljava-packaging/target/pljava-pg${VER:!pg_config --version!:[2]:C/\.[0-9]+$//}-${MACHINE_ARCH:S/x86_64/amd64/}-${OPSYS}-gpp.jar
77 75
78.include "../../mk/pgsql.buildlink3.mk" 76.include "../../mk/pgsql.buildlink3.mk"
79.include "../../mk/bsd.pkg.mk" 77.include "../../mk/bsd.pkg.mk"