diff options
author | Pav Lucistnik <pav@FreeBSD.org> | 2009-01-05 17:27:29 +0000 |
---|---|---|
committer | Pav Lucistnik <pav@FreeBSD.org> | 2009-01-05 17:27:29 +0000 |
commit | c4d4cacd63490d4b63e844ae298880332a388ba7 (patch) | |
tree | 3913b841cc9c2f98d7e4b2056eafc0d9980bf1c8 /databases | |
parent | - Fix permissions of the installed files so they are readable to non-root users (diff) |
- Remove conditional checks relevant only on FreeBSD 5.x and older
Notes
Notes:
svn path=/head/; revision=225288
Diffstat (limited to 'databases')
-rw-r--r-- | databases/evolution-data-server/Makefile | 4 | ||||
-rw-r--r-- | databases/fastdb/Makefile | 4 | ||||
-rw-r--r-- | databases/frontbase/Makefile | 9 | ||||
-rw-r--r-- | databases/mysql++/Makefile | 8 | ||||
-rw-r--r-- | databases/mysql++1/Makefile | 8 | ||||
-rw-r--r-- | databases/mysqlcppapi/Makefile | 15 | ||||
-rw-r--r-- | databases/p5-DBD-ODBC/Makefile | 4 | ||||
-rw-r--r-- | databases/p5-DBZ_File/Makefile | 10 | ||||
-rw-r--r-- | databases/pgadmin3/Makefile | 8 | ||||
-rw-r--r-- | databases/postgresql-libpqxx/Makefile | 12 | ||||
-rw-r--r-- | databases/postgresql-libpqxx3/Makefile | 12 | ||||
-rw-r--r-- | databases/postgresql-libpqxx30/Makefile | 12 | ||||
-rw-r--r-- | databases/tora/Makefile | 9 | ||||
-rw-r--r-- | databases/virtuoso/Makefile | 9 |
14 files changed, 15 insertions, 109 deletions
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile index c64190358336..e0406b8c77df 100644 --- a/databases/evolution-data-server/Makefile +++ b/databases/evolution-data-server/Makefile @@ -45,10 +45,6 @@ OPTIONS= IMAP4 "Enable experimental IMAP4 backend" off .include <bsd.port.pre.mk> -.if ( ( ${OSVERSION} < 504101 ) || ( ${OSVERSION} >= 600000 && ${OSVERSION} < 600012 ) ) -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libedataserver_e-msgport.c -.endif - .if defined(HEIMDAL_HOME) || defined(WITH_HEIMDAL) HEIMDAL_HOME?= ${LOCALBASE} LIB_DEPENDS+= krb5:${PORTSDIR}/security/heimdal diff --git a/databases/fastdb/Makefile b/databases/fastdb/Makefile index 8505abcc340e..00676375afd2 100644 --- a/databases/fastdb/Makefile +++ b/databases/fastdb/Makefile @@ -27,10 +27,6 @@ PORTDOCS= FastDB.htm .include <bsd.port.pre.mk> -.if ${OSVERSION} < 600000 -BROKEN= does not compile -.endif - post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} diff --git a/databases/frontbase/Makefile b/databases/frontbase/Makefile index c983e7feede9..db1ead0b34b8 100644 --- a/databases/frontbase/Makefile +++ b/databases/frontbase/Makefile @@ -19,8 +19,6 @@ COMMENT= Frontbase SQL Database Server IS_INTERACTIVE= yes RESTRICTED= License doesn't allow redistribution -.include <bsd.port.pre.mk> - USE_RC_SUBR= frontbase.sh USE_LDCONFIG= yes PKGMESSAGE= ${WRKDIR}/pkg-message @@ -30,12 +28,7 @@ SUB_FILES+= pkg-message ONLY_FOR_ARCHS= i386 # Binary is built for 5.X : -.if ${OSVERSION} < 500000 -IGNORE= only supports FreeBSD 5.X and newer -.endif -.if ${OSVERSION} >= 600000 LIB_DEPENDS+= c.5:${PORTSDIR}/misc/compat5x -.endif FB_USER= frontbase FB_GROUP= frontbase @@ -74,4 +67,4 @@ post-install: @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/databases/mysql++/Makefile b/databases/mysql++/Makefile index 1710fa1e0160..7c6f3645e82b 100644 --- a/databases/mysql++/Makefile +++ b/databases/mysql++/Makefile @@ -31,12 +31,6 @@ NOT_FOR_ARCHS_REASON_sparc64= Fails to compile PORTDOCS= * .endif -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500039 -USE_GCC= 3.4 -.endif - post-install: @${RM} -f ${PREFIX}/lib/libmysqlpp.so.3 @${LN} -s ${PREFIX}/lib/libmysqlpp.so ${PREFIX}/lib/libmysqlpp.so.3 @@ -58,4 +52,4 @@ post-install: @${RM} -f ${EXAMPLESDIR}/Makefile.temp .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/databases/mysql++1/Makefile b/databases/mysql++1/Makefile index 66a2f6178e39..5b5e145f9e93 100644 --- a/databases/mysql++1/Makefile +++ b/databases/mysql++1/Makefile @@ -25,12 +25,6 @@ USE_LDCONFIG= yes CONFLICTS= ${PORTNAME}*-2.* NO_LATEST_LINK= yes -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500039 -USE_GCC= 3.4 -.endif - post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR}/userman/html ${DOCSDIR}/refman/html @@ -49,4 +43,4 @@ post-install: @${RM} -f ${EXAMPLESDIR}/Makefile.temp .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/databases/mysqlcppapi/Makefile b/databases/mysqlcppapi/Makefile index 1c2c22d9d7f7..312d9837286b 100644 --- a/databases/mysqlcppapi/Makefile +++ b/databases/mysqlcppapi/Makefile @@ -20,17 +20,8 @@ USE_MYSQL= yes USE_GNOME= pkgconfig gnomehack GNU_CONFIGURE= yes -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500035 -BUILD_DEPENDS+= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport -RUN_DEPENDS+= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/stlport" \ - LDFLAGS="-L${LOCALBASE}/lib -lstlport_gcc ${PTHREAD_LIBS}" -.else -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -.endif CONFIGURE_ARGS= --with-mysql=${LOCALBASE} USE_LDCONFIG= yes @@ -38,7 +29,7 @@ post-patch: ${REINPLACE_CMD} s/libmysqlcppapi-1.9/libmysqlcppapi/g \ ${WRKSRC}/mysqlcppapi/Makefile.in ${WRKSRC}/examples/Makefile.in ${FIND} ${WRKSRC}/mysqlcppapi -name Makefile.in \ - -exec ${REINPLACE_CMD} -e \ + -exec ${REINPLACE_CMD} -e \ '/^library_includedir =/s,\$$(GENERIC_LIBRARY_NAME)-2.0/,,g' '{}' \; -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/databases/p5-DBD-ODBC/Makefile b/databases/p5-DBD-ODBC/Makefile index 10f9496b3c60..718605714557 100644 --- a/databases/p5-DBD-ODBC/Makefile +++ b/databases/p5-DBD-ODBC/Makefile @@ -32,10 +32,6 @@ IGNORE= selected mutually exclusive options: WITH_IODBC and WITH_UNIXODBC WITH_IODBC?= yes .endif -.if defined(WITH_UNIXODBC) && ${OSVERSION} < 500016 -IGNORE= Due to some obscure -pthread things, you can not have this work -.endif - .if defined(WITH_IODBC) LIB_DEPENDS+= iodbc.3:${PORTSDIR}/databases/libiodbc MYODBC= iodbc diff --git a/databases/p5-DBZ_File/Makefile b/databases/p5-DBZ_File/Makefile index 0f681955c593..101fcb48f7dd 100644 --- a/databases/p5-DBZ_File/Makefile +++ b/databases/p5-DBZ_File/Makefile @@ -16,16 +16,10 @@ MAINTAINER= leeym@FreeBSD.org COMMENT= Perl module to access a DBZ database PERL_CONFIGURE= yes -CONFIGURE_ARGS= DEFINE="-I${FILESDIR}" - -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 500007 -CONFIGURE_ARGS+= POLLUTE=1 -.endif +CONFIGURE_ARGS= DEFINE="-I${FILESDIR}" POLLUTE=1 WRKSRC= ${WRKDIR}/DBZ_File MAN3= DBZ_File.3 -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/databases/pgadmin3/Makefile b/databases/pgadmin3/Makefile index 9c616b2684bf..3b9d0ff36074 100644 --- a/databases/pgadmin3/Makefile +++ b/databases/pgadmin3/Makefile @@ -31,10 +31,4 @@ WX_UNICODE= yes post-patch: @${REINPLACE_CMD} -e 's,/wx-config,/${WX_CONFIG:T},' ${WRKSRC}/configure -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 503105 || (${OSVERSION} >= 600000 && ${OSVERSION} < 600014) -IGNORE= can not be built. Your system has broken vswprintf(3) function -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/databases/postgresql-libpqxx/Makefile b/databases/postgresql-libpqxx/Makefile index 0347160c473a..151672885aa6 100644 --- a/databases/postgresql-libpqxx/Makefile +++ b/databases/postgresql-libpqxx/Makefile @@ -27,14 +27,4 @@ CONFIGURE_ARGS= --with-postgres=${LOCALBASE} \ --enable-shared \ --with-postgres-include=${LOCALBASE}/include/postgresql -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500035 -BUILD_DEPENDS+= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport -RUN_DEPENDS+= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport -CPPFLAGS+= -I${LOCALBASE}/include/stlport -LDFLAGS+= -L${LOCALBASE}/lib -lstlport_gcc ${PTHREAD_LIBS} -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/databases/postgresql-libpqxx3/Makefile b/databases/postgresql-libpqxx3/Makefile index 0347160c473a..151672885aa6 100644 --- a/databases/postgresql-libpqxx3/Makefile +++ b/databases/postgresql-libpqxx3/Makefile @@ -27,14 +27,4 @@ CONFIGURE_ARGS= --with-postgres=${LOCALBASE} \ --enable-shared \ --with-postgres-include=${LOCALBASE}/include/postgresql -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500035 -BUILD_DEPENDS+= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport -RUN_DEPENDS+= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport -CPPFLAGS+= -I${LOCALBASE}/include/stlport -LDFLAGS+= -L${LOCALBASE}/lib -lstlport_gcc ${PTHREAD_LIBS} -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/databases/postgresql-libpqxx30/Makefile b/databases/postgresql-libpqxx30/Makefile index 0347160c473a..151672885aa6 100644 --- a/databases/postgresql-libpqxx30/Makefile +++ b/databases/postgresql-libpqxx30/Makefile @@ -27,14 +27,4 @@ CONFIGURE_ARGS= --with-postgres=${LOCALBASE} \ --enable-shared \ --with-postgres-include=${LOCALBASE}/include/postgresql -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500035 -BUILD_DEPENDS+= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport -RUN_DEPENDS+= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport -CPPFLAGS+= -I${LOCALBASE}/include/stlport -LDFLAGS+= -L${LOCALBASE}/lib -lstlport_gcc ${PTHREAD_LIBS} -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/databases/tora/Makefile b/databases/tora/Makefile index 7454d2749562..e3d565bfbc74 100644 --- a/databases/tora/Makefile +++ b/databases/tora/Makefile @@ -56,13 +56,6 @@ INFO= tora PREFIX2FIX= doc/help/preferences.texi src/toconfiguration.h -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 600029 -BUILD_DEPENDS+= ${LOCALBASE}/bin/makeinfo:${PORTSDIR}/print/texinfo -CONFIGURE_ENV+= MAKEINFO=${LOCALBASE}/bin/makeinfo -.endif - run-autotools: (cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ./autogen.sh) @@ -81,4 +74,4 @@ post-install: ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/databases/virtuoso/Makefile b/databases/virtuoso/Makefile index 839d67ee12bd..b664732887a3 100644 --- a/databases/virtuoso/Makefile +++ b/databases/virtuoso/Makefile @@ -28,6 +28,8 @@ CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}"\ LDFLAGS="-L${LOCALBASE}/lib" ONLY_FOR_ARCHS= i386 +CHECK_PORT= /usr/bin/nc -z localhost $$\1 + OPTIONS= IMAGEMAGICK "ImageMagick support" off\ KERBEROS "Kerberos extension" off\ OPENLDAP "OpenLDAP support" off @@ -56,13 +58,6 @@ post-install: .include <bsd.port.pre.mk> -.if ${OSVERSION} < 504000 -CHECK_PORT= ${LOCALBASE}/bin/nc -vz localhost $$\1 2>\&1 | ${GREP} open -BUILD_DEPENDS+= ${NETCAT}:${PORTSDIR}/net/netcat -.else -CHECK_PORT= /usr/bin/nc -z localhost $$\1 -.endif - .if defined(WITH_IMAGEMAGICK) CONFIGURE_ARGS+=--enable-imagemagick=${LOCALBASE} LIB_DEPENDS+= MagickWand.1:${PORTSDIR}/graphics/ImageMagick |