diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
| commit | 3e4ed01146cfe2bdca465bd0e4d199341f62a0b6 (patch) | |
| tree | d573ea09b2bf6be67cb497df199932da9e2707c4 /databases | |
| parent | 40049f4af2200d0dcf33596508688623fc75f764 (diff) | |
| download | ports-3e4ed01146cfe2bdca465bd0e4d199341f62a0b6.tar.gz ports-3e4ed01146cfe2bdca465bd0e4d199341f62a0b6.zip | |
Notes
Diffstat (limited to 'databases')
59 files changed, 90 insertions, 105 deletions
diff --git a/databases/clip/Makefile b/databases/clip/Makefile index 1ca4afd3f6f1..fb2dfdf6c483 100644 --- a/databases/clip/Makefile +++ b/databases/clip/Makefile @@ -7,7 +7,7 @@ PORTNAME= clip DISTVERSION= 1.1.16-1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= databases lang MASTER_SITES= ftp://ftp.linux.ru.net/mirrors/clip/ \ ftp://www.cis.by/pub/clip/pub/clip/ \ @@ -24,7 +24,7 @@ COMMENT= xBase and Clipper language compatible compiler BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash \ wget:${PORTSDIR}/ftp/wget \ - xmkmf:${X_IMAKE_PORT} + imake:${PORTSDIR}/devel/imake LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ freetype.9:${PORTSDIR}/print/freetype2 \ @@ -38,6 +38,7 @@ RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \ WRKSRC= ${WRKDIR}/${PORTNAME}-prg-${DISTVERSION} USE_GETTEXT= yes +USE_XORG+= x11 xau ice xproto WANT_GNOME= yes SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message @@ -99,8 +100,7 @@ USE_BISON= build USE_GMAKE= yes USE_ICONV= yes REINPLACE_ARGS= -i "" -USE_XLIB= yes -USE_XPM= yes +USE_XORG+= xpm xau ice xproto USE_GNOME= gtk12 gtk20 HAS_CONFIGURE= yes CONFIGURE_WRKSRC= ${WRKSRC}/clip @@ -146,7 +146,7 @@ pre-configure: -e "s|#include.*<malloc.h>|#include <stdlib.h>|" \ -e "s|#!/bin/sh|#!${LOCALBASE}/bin/bash|" \ -e "s|/usr/local|${LOCALBASE}|g" \ - -e "s|/usr/X11R6|${X11BASE}|g" + -e "s|/usr/X11R6|${LOCALBASE}|g" ${REINPLACE_CMD} "s|-I/usr/include|-I${LOCALBASE}/include -L${LOCALBASE}/lib|" \ ${WRKSRC}/cliplibs/clip-xml/configure ${REINPLACE_CMD} -e "s|-I/usr/include|-I${LOCALBASE}/include|" \ diff --git a/databases/dbconnect/Makefile b/databases/dbconnect/Makefile index a6a94437d946..1e8cd8bb01e4 100644 --- a/databases/dbconnect/Makefile +++ b/databases/dbconnect/Makefile @@ -20,7 +20,7 @@ GNU_CONFIGURE= yes USE_GMAKE= yes USE_AUTOTOOLS= autoconf:261 CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CXXFLAGS+= ${PTHREAD_CFLAGS} -fPIC -DFREEBSD LDFLAG+= ${PTHREAD_LIBS} diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile index 02a44e31819d..73260f336360 100644 --- a/databases/evolution-data-server/Makefile +++ b/databases/evolution-data-server/Makefile @@ -8,6 +8,7 @@ PORTNAME= evolution-data-server PORTVERSION= 2.22.1 +PORTREVISION= 1 CATEGORIES= databases gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -23,7 +24,6 @@ USE_BZIP2= yes USE_GMAKE= yes USE_BISON= build USE_GETTEXT= yes -USE_XLIB= yes USE_GNOME= gnomeprefix gnomehack intlhack gnometarget libgnomeui \ ltverhack USE_OPENLDAP= yes diff --git a/databases/fireprofile/Makefile b/databases/fireprofile/Makefile index 45249251f251..3852ffcab45e 100644 --- a/databases/fireprofile/Makefile +++ b/databases/fireprofile/Makefile @@ -21,7 +21,7 @@ COMMENT= Library to help profiling where programs are using MySQL MAN3= libfireprofile.3 PLIST_FILES= lib/libfireprofile.so.0 lib/libfireprofile.so -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_MYSQL= yes DEFAULT_MYSQL_VER= 323 WANT_MYSQL_VER= 323 diff --git a/databases/flamerobin/Makefile b/databases/flamerobin/Makefile index 6a6f3baca8ef..b8c43c24f337 100644 --- a/databases/flamerobin/Makefile +++ b/databases/flamerobin/Makefile @@ -9,8 +9,7 @@ PORTNAME= flamerobin PORTVERSION= 0.7.6 PORTREVISION= 2 CATEGORIES= databases -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= dindin@FreeBSD.org.ua @@ -24,7 +23,7 @@ WX_UNICODE= yes GNU_CONFIGURE= yes CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" OPTIONS= FIREBIRD "Use firebird1 instead of firebird2" off diff --git a/databases/gdbm/Makefile b/databases/gdbm/Makefile index 0e5c683ca55b..f382bc653c2b 100644 --- a/databases/gdbm/Makefile +++ b/databases/gdbm/Makefile @@ -19,7 +19,7 @@ USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .if defined(WITH_COMPAT) INSTALL_TARGET= install install-compat diff --git a/databases/gnome-db/Makefile b/databases/gnome-db/Makefile index 6ce21fb3c9aa..89d28bc98ac4 100644 --- a/databases/gnome-db/Makefile +++ b/databases/gnome-db/Makefile @@ -8,7 +8,7 @@ PORTNAME= gnome-db PORTVERSION= 0.2.96 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= databases gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-db/0.2 @@ -18,7 +18,6 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Provide uniform access to data sources for the GNOME environment USE_BZIP2= yes -USE_XLIB= yes USE_GNOME= gnomehack gnomeprefix gnomehier libgda USE_GMAKE= yes USE_GETTEXT= yes diff --git a/databases/grass/Makefile b/databases/grass/Makefile index d0a085f4b6f0..33f50cf742d3 100644 --- a/databases/grass/Makefile +++ b/databases/grass/Makefile @@ -41,8 +41,7 @@ USE_GMAKE= yes USE_ICONV= yes USE_GETTEXT= yes USE_PERL5= yes -USE_XLIB= yes -USE_GL= yes +USE_GL= glut USE_FREETYPE= yes USE_TCL= yes USE_TCL_BUILD= yes @@ -56,8 +55,8 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-includes=${LOCALBASE}/include \ --with-libs=${LOCALBASE}/lib \ --with-tcltk-includes="${TCL_INCLUDEDIR} ${TK_INCLUDEDIR}" \ - --with-opengl-includes=${X11BASE}/include \ - --with-opengl-libs=${X11BASE}/lib \ + --with-opengl-includes=${LOCALBASE}/include \ + --with-opengl-libs=${LOCALBASE}/lib \ --with-freetype \ --with-freetype-includes=${LOCALBASE}/include/freetype2 \ --with-nls \ diff --git a/databases/hk_classes/Makefile b/databases/hk_classes/Makefile index 1b397602d93b..aafa31d26a7f 100644 --- a/databases/hk_classes/Makefile +++ b/databases/hk_classes/Makefile @@ -29,9 +29,9 @@ CONFIGURE_ENV+= PYTHON_VERSION=${PYTHON_VERSION:S/python//} LDFLAGS="${LDFLAGS}" CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS+=--with-python-libdir=${PYTHON_LIBDIR} \ --with-python-incdir=${PYTHON_INCLUDEDIR} \ - --with-fontconfig-incdir=${X11BASE}/include/fontconfig \ - --with-fontconfig-libdir=${X11BASE}/lib -INSTALLS_SHLIB= yes + --with-fontconfig-incdir=${LOCALBASE}/include/fontconfig \ + --with-fontconfig-libdir=${LOCALBASE}/lib +USE_LDCONFIG= yes LDCONFIG_DIRS+= ${PREFIX}/lib/hk_classes/ INSTALLS_EGGINFO= yes diff --git a/databases/keximdb/Makefile b/databases/keximdb/Makefile index 00ad4de2f76e..5809992b33f7 100644 --- a/databases/keximdb/Makefile +++ b/databases/keximdb/Makefile @@ -19,6 +19,6 @@ LIB_DEPENDS= kexicore:${PORTSDIR}/editors/koffice-kde3 USE_KDELIBS_VER= 3 USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .include <bsd.port.mk> diff --git a/databases/kmysqladmin/Makefile b/databases/kmysqladmin/Makefile index 4d2e83197d9b..a2e1e9bce934 100644 --- a/databases/kmysqladmin/Makefile +++ b/databases/kmysqladmin/Makefile @@ -7,7 +7,7 @@ PORTNAME= kmysqladmin PORTVERSION= 0.7.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= http://www.alwins-world.de/programs/download/kmysqladmin/ @@ -16,7 +16,6 @@ COMMENT= A graphical frontend for administration of mysql servers USE_AUTOTOOLS= libtool:15 USE_MYSQL= yes -USE_XLIB= yes USE_QT_VER= 3 USE_KDELIBS_VER=3 USE_GETTEXT= yes diff --git a/databases/knoda/Makefile b/databases/knoda/Makefile index fd4618be6e84..7a94f614348e 100644 --- a/databases/knoda/Makefile +++ b/databases/knoda/Makefile @@ -22,7 +22,7 @@ USE_KDELIBS_VER= 3 USE_PYTHON= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS+= --with-hk_classes-dir=${LOCALBASE}/lib/hk_classes \ --with-hk_classes-incdir=${LOCALBASE}/include/hk_classes diff --git a/databases/libgda/Makefile b/databases/libgda/Makefile index 95c2bb6eb639..4faaf21b37bd 100644 --- a/databases/libgda/Makefile +++ b/databases/libgda/Makefile @@ -8,7 +8,7 @@ PORTNAME= libgda PORTVERSION= 0.2.96 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= databases gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.2 @@ -22,7 +22,6 @@ LIB_DEPENDS= gdbm.3:${PORTSDIR}/databases/gdbm CONFLICTS= libgda2*-[0-9]* USE_BZIP2= yes -USE_XLIB= yes USE_GNOME= gnomehack gnomeprefix gnomehier gconf bonobo USE_GMAKE= yes USE_GETTEXT= yes diff --git a/databases/libgda2/Makefile b/databases/libgda2/Makefile index bdaf2c6f1c92..54550a3a05a2 100644 --- a/databases/libgda2/Makefile +++ b/databases/libgda2/Makefile @@ -8,7 +8,7 @@ PORTNAME= libgda2 PORTVERSION= 1.2.4 -PORTREVISION?= 3 +PORTREVISION?= 4 PORTEPOCH?= 1 CATEGORIES= databases gnome MASTER_SITES= ${MASTER_SITE_GNOME} @@ -31,7 +31,6 @@ CONFLICTS= libgda-0* USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack glib20 libxslt referencehack intlhack USE_GETTEXT= yes -USE_XLIB= yes INSTALLS_OMF= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/databases/libgda3/Makefile b/databases/libgda3/Makefile index cad5489cb783..f7cf8fd2e7cc 100644 --- a/databases/libgda3/Makefile +++ b/databases/libgda3/Makefile @@ -8,7 +8,7 @@ PORTNAME= libgda3 PORTVERSION?= 3.0.2 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= databases gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/${PORTVERSION:R} @@ -27,7 +27,6 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt USE_AUTOTOOLS= libtool:15 USE_GETTEXT= yes -USE_XLIB= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack glib20 libxslt intlhack referencehack USE_LDCONFIG= yes diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile index a78d7421428b..baae68c06ba6 100644 --- a/databases/libgnomedb/Makefile +++ b/databases/libgnomedb/Makefile @@ -8,7 +8,7 @@ PORTNAME= libgnomedb PORTVERSION= 3.0.0 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= databases gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} @@ -25,7 +25,6 @@ USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack libgnomeui libgda3 gtksourceview \ intlhack referencehack -USE_XLIB= yes USE_GETTEXT= yes GNU_CONFIGURE= yes INSTALLS_OMF= yes diff --git a/databases/libmemcache/Makefile b/databases/libmemcache/Makefile index a2c196f76abf..813081614092 100644 --- a/databases/libmemcache/Makefile +++ b/databases/libmemcache/Makefile @@ -16,7 +16,7 @@ COMMENT= The C library for accessing a memcache cluster USE_BZIP2= yes USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes GNU_CONFIGURE= yes OPTIONS= DEBUG "Build with debugging turned on" off diff --git a/databases/libodbc++/Makefile b/databases/libodbc++/Makefile index 09760fc43d65..83716f372cf7 100644 --- a/databases/libodbc++/Makefile +++ b/databases/libodbc++/Makefile @@ -18,7 +18,7 @@ COMMENT= A C++ class library and toolset for ODBC access to data sources USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 USE_GNOME= pkgconfig -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-isqlxx CONFIGURE_ENV= LIBS="${PTHREAD_LIBS}" diff --git a/databases/libudbc/Makefile b/databases/libudbc/Makefile index b704011f2958..552c215cb5d5 100644 --- a/databases/libudbc/Makefile +++ b/databases/libudbc/Makefile @@ -21,7 +21,7 @@ COMMENT= Openlink UDBC SDK NO_WRKSUBDIR= yes NO_BUILD= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes ONLY_FOR_ARCHS= i386 RESTRICTED= 'Downloading and redistribution terms are unclear' diff --git a/databases/mdbtools/Makefile b/databases/mdbtools/Makefile index 9fc04dc0fa02..c8acc1940deb 100644 --- a/databases/mdbtools/Makefile +++ b/databases/mdbtools/Makefile @@ -7,10 +7,9 @@ PORTNAME= mdbtools PORTVERSION= 0.5 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= databases -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Utilities and libraries to export data from MS Access databases (.mdb) @@ -31,7 +30,7 @@ MAN1= mdb-ver.1 mdb-tables.1 mdb-schema.1 mdb-sql.1 mdb-export.1 .include <bsd.port.pre.mk> .if ${HAVE_GNOME:Mlibgnomeui}!="" -USE_XLIB= yes +USE_XORG= x11 USE_GNOME+= gnomeprefix gnomehack libgnomeui PKGNAMESUFFIX= -gnome .endif diff --git a/databases/mird/Makefile b/databases/mird/Makefile index 04d00811088f..b701246e22d1 100644 --- a/databases/mird/Makefile +++ b/databases/mird/Makefile @@ -23,7 +23,7 @@ USE_AUTOTOOLS= autoconf:261:env USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --without-debug -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes post-patch: @${REINPLACE_CMD} -e 's,CFLAGS=,CFLAGS+=,' ${WRKSRC}/src/Makefile.in diff --git a/databases/msql/Makefile b/databases/msql/Makefile index 495b8ce6b654..1968bfec2fa5 100644 --- a/databases/msql/Makefile +++ b/databases/msql/Makefile @@ -15,7 +15,7 @@ COMMENT= The Mini SQL server, version 2 CONFLICTS= msql-3* -INSTALLS_SHLIB= YES +USE_LDCONFIG= YES USE_PERL5= YES # Not free for commercial use. diff --git a/databases/msql3/Makefile b/databases/msql3/Makefile index 8d6fddddac51..186cf68c664e 100644 --- a/databases/msql3/Makefile +++ b/databases/msql3/Makefile @@ -14,7 +14,7 @@ COMMENT= Version 3 of the Mini SQL relational database system CONFLICTS= msql-2* -INSTALLS_SHLIB= YES +USE_LDCONFIG= YES USE_PERL5= YES LATEST_LINK= msql3 diff --git a/databases/mysql++1/Makefile b/databases/mysql++1/Makefile index 016b81fdc1d0..0fc7c2ae73d9 100644 --- a/databases/mysql++1/Makefile +++ b/databases/mysql++1/Makefile @@ -21,7 +21,7 @@ CONFIGURE_ARGS= --with-mysql=${LOCALBASE} \ --includedir=${PREFIX}/include/mysql++ \ --disable-examples CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFLICTS= ${PORTNAME}*-2.* NO_LATEST_LINK= yes diff --git a/databases/mysql-query-browser/Makefile b/databases/mysql-query-browser/Makefile index 47e91ff739b3..abc8a494efc1 100644 --- a/databases/mysql-query-browser/Makefile +++ b/databases/mysql-query-browser/Makefile @@ -7,7 +7,7 @@ PORTNAME= mysql-query-browser PORTVERSION= 1.1.18 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL} MASTER_SITE_SUBDIR= MySQLAdministrationSuite @@ -23,7 +23,6 @@ BUILD_DEPENDS= gsed:${PORTSDIR}/textproc/gsed \ BROKEN= Checksum mismatch -USE_XLIB= yes USE_GMAKE= yes USE_AUTOTOOLS= automake:19:env autoconf:261:env CONFIGURE_ENV= CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \ @@ -35,7 +34,7 @@ DEFAULT_MYSQL_VER= 50 IGNORE_WITH_MYSQL= 323 GTKHTML_VER= ${gtkhtml3_DETECT:R} -CONFIGURE_ARGS_GUI= --prefix=${X11BASE} \ +CONFIGURE_ARGS_GUI= --prefix=${LOCALBASE} \ --datadir=${DATADIR} \ --localstatedir=${PREFIX}/share CONFIGURE_ARGS_MAIN= ${CONFIGURE_ARGS_GUI} \ diff --git a/databases/mysql2odbc/Makefile b/databases/mysql2odbc/Makefile index 1b65da85c709..a6dd41f08328 100644 --- a/databases/mysql2odbc/Makefile +++ b/databases/mysql2odbc/Makefile @@ -42,6 +42,6 @@ CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}" USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .include <bsd.port.post.mk> diff --git a/databases/mysqlcppapi/Makefile b/databases/mysqlcppapi/Makefile index 6d923bf79027..1c2c22d9d7f7 100644 --- a/databases/mysqlcppapi/Makefile +++ b/databases/mysqlcppapi/Makefile @@ -32,7 +32,7 @@ CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" .endif CONFIGURE_ARGS= --with-mysql=${LOCALBASE} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes post-patch: ${REINPLACE_CMD} s/libmysqlcppapi-1.9/libmysqlcppapi/g \ diff --git a/databases/pgworksheet/Makefile b/databases/pgworksheet/Makefile index 40e304effadd..b8f22fb5e4f8 100644 --- a/databases/pgworksheet/Makefile +++ b/databases/pgworksheet/Makefile @@ -7,6 +7,7 @@ PORTNAME= pgworksheet PORTVERSION= 1.9 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= http://pgfoundry.org/frs/download.php/1695/ @@ -15,7 +16,6 @@ COMMENT= Simple PostreSQL GUI front end RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pyPgSQL/libpq/__init__.py:${PORTSDIR}/databases/py-pyPgSQL -USE_X_PREFIX= yes USE_PGSQL= yes USE_BZIP2= yes USE_GNOME= pygtk2 diff --git a/databases/postgresql-libpgeasy/Makefile b/databases/postgresql-libpgeasy/Makefile index e2f09a14f7ea..87e8fa3753bc 100644 --- a/databases/postgresql-libpgeasy/Makefile +++ b/databases/postgresql-libpgeasy/Makefile @@ -19,7 +19,7 @@ COMMENT= An easy-to-use C interface to PostgreSQL USE_AUTOTOOLS= libtool:15 USE_PGSQL= YES USE_GMAKE= YES -INSTALLS_SHLIB= YES +USE_LDCONFIG= YES GNU_CONFIGURE= YES DOCSDIR= ${PREFIX}/share/doc/postgresql/${PORTNAME} EXAMPLESDIR= ${PREFIX}/share/examples/postgresql/${PORTNAME} diff --git a/databases/postgresql-libpq++/Makefile b/databases/postgresql-libpq++/Makefile index dbc5a11dbdec..0783e29f02a2 100644 --- a/databases/postgresql-libpq++/Makefile +++ b/databases/postgresql-libpq++/Makefile @@ -19,7 +19,7 @@ COMMENT= C++ interface for PostgreSQL USE_PGSQL= YES USE_GMAKE= YES -INSTALLS_SHLIB= YES +USE_LDCONFIG= YES post-patch: ${REINPLACE_CMD} "s,/usr/local/pgsql,${PREFIX},; \ diff --git a/databases/postgresql-libpqxx/Makefile b/databases/postgresql-libpqxx/Makefile index 23d048acc0af..780c5891b17d 100644 --- a/databases/postgresql-libpqxx/Makefile +++ b/databases/postgresql-libpqxx/Makefile @@ -19,7 +19,7 @@ COMMENT= A new C++ interface for PostgreSQL USE_PGSQL= yes USE_GMAKE= yes GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_SUB= PORTVERSION=${PORTVERSION} CONFIGURE_ARGS= --with-postgres=${LOCALBASE} \ diff --git a/databases/postgresql-libpqxx3/Makefile b/databases/postgresql-libpqxx3/Makefile index 23d048acc0af..780c5891b17d 100644 --- a/databases/postgresql-libpqxx3/Makefile +++ b/databases/postgresql-libpqxx3/Makefile @@ -19,7 +19,7 @@ COMMENT= A new C++ interface for PostgreSQL USE_PGSQL= yes USE_GMAKE= yes GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_SUB= PORTVERSION=${PORTVERSION} CONFIGURE_ARGS= --with-postgres=${LOCALBASE} \ diff --git a/databases/postgresql-libpqxx30/Makefile b/databases/postgresql-libpqxx30/Makefile index 23d048acc0af..780c5891b17d 100644 --- a/databases/postgresql-libpqxx30/Makefile +++ b/databases/postgresql-libpqxx30/Makefile @@ -19,7 +19,7 @@ COMMENT= A new C++ interface for PostgreSQL USE_PGSQL= yes USE_GMAKE= yes GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_SUB= PORTVERSION=${PORTVERSION} CONFIGURE_ARGS= --with-postgres=${LOCALBASE} \ diff --git a/databases/postgresql73-client/Makefile b/databases/postgresql73-client/Makefile index 39b8faee3433..e66261b09647 100644 --- a/databases/postgresql73-client/Makefile +++ b/databases/postgresql73-client/Makefile @@ -19,6 +19,6 @@ BUILD_DIRS= src/bin/pg_config src/bin/pg_encoding src/bin/psql \ src/bin/pg_dump src/bin/scripts src/include \ src/interfaces doc CLIENT_ONLY= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .include "${MASTERDIR}/Makefile" diff --git a/databases/postgresql74-client/Makefile b/databases/postgresql74-client/Makefile index 58324b3b05cd..a083feea13cd 100644 --- a/databases/postgresql74-client/Makefile +++ b/databases/postgresql74-client/Makefile @@ -19,6 +19,6 @@ BUILD_DIRS= src/bin/pg_config src/bin/pg_encoding src/bin/psql \ src/bin/pg_dump src/bin/scripts src/include \ src/interfaces doc CLIENT_ONLY= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .include "${MASTERDIR}/Makefile" diff --git a/databases/postgresql80-client/Makefile b/databases/postgresql80-client/Makefile index 29ff1120d54f..73c599771d27 100644 --- a/databases/postgresql80-client/Makefile +++ b/databases/postgresql80-client/Makefile @@ -19,6 +19,6 @@ BUILD_DIRS= config src/include src/interfaces src/bin/pg_dump \ src/bin/psql src/bin/scripts src/bin/pg_config \ doc src/makefiles CLIENT_ONLY= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .include "${MASTERDIR}/Makefile" diff --git a/databases/postgresql81-client/Makefile b/databases/postgresql81-client/Makefile index e81cc4b685c2..032665241fbf 100644 --- a/databases/postgresql81-client/Makefile +++ b/databases/postgresql81-client/Makefile @@ -19,6 +19,6 @@ BUILD_DIRS= config src/include src/interfaces \ src/bin/pg_dump src/bin/psql src/bin/scripts src/bin/pg_config \ doc src/makefiles CLIENT_ONLY= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .include "${MASTERDIR}/Makefile" diff --git a/databases/postgresql82-client/Makefile b/databases/postgresql82-client/Makefile index 532b039772da..1c71380f9577 100644 --- a/databases/postgresql82-client/Makefile +++ b/databases/postgresql82-client/Makefile @@ -19,6 +19,6 @@ BUILD_DIRS= config src/include src/interfaces \ src/bin/pg_dump src/bin/psql src/bin/scripts src/bin/pg_config \ doc src/makefiles CLIENT_ONLY= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .include "${MASTERDIR}/Makefile" diff --git a/databases/postgresql83-client/Makefile b/databases/postgresql83-client/Makefile index ef470753d56a..d7bf01841549 100644 --- a/databases/postgresql83-client/Makefile +++ b/databases/postgresql83-client/Makefile @@ -19,6 +19,6 @@ BUILD_DIRS= config src/include src/interfaces \ src/bin/pg_dump src/bin/psql src/bin/scripts src/bin/pg_config \ doc src/makefiles CLIENT_ONLY= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .include "${MASTERDIR}/Makefile" diff --git a/databases/pxlib/Makefile b/databases/pxlib/Makefile index bc5f1144a0f6..245062ba13de 100644 --- a/databases/pxlib/Makefile +++ b/databases/pxlib/Makefile @@ -25,7 +25,7 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS= %%PREFIX%%/lib OPTIONS= DOCS "Build and install documentation" off diff --git a/databases/qt-ibase-plugin/Makefile b/databases/qt-ibase-plugin/Makefile index e9e726a155fc..025dbce5fc4a 100644 --- a/databases/qt-ibase-plugin/Makefile +++ b/databases/qt-ibase-plugin/Makefile @@ -8,7 +8,7 @@ PORTNAME= qt-${DB}-plugin PORTVERSION= 3.3.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_QT} DISTNAME= qt-x11-free-${PORTVERSION} @@ -33,7 +33,6 @@ MAKEFILE= ${FILESDIR}/Makefile.bsd MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" PLUGIN="${PLUGIN}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" -USE_X_PREFIX= yes PLIST_SUB= DB=${DB} .include <bsd.port.pre.mk> diff --git a/databases/qt-ibase-plugin/files/Makefile.bsd b/databases/qt-ibase-plugin/files/Makefile.bsd index 84998a7f5f48..23269dc9382f 100644 --- a/databases/qt-ibase-plugin/files/Makefile.bsd +++ b/databases/qt-ibase-plugin/files/Makefile.bsd @@ -2,9 +2,9 @@ SHLIB_NAME= libqsql${DB}.so VPATH= ${PLUGIN}:${DRIVER} CXXFLAGS+= -I${PLUGIN} -I${DRIVER} \ - -I${LOCALBASE}/include -I${X11BASE}/include \ + -I${LOCALBASE}/include \ ${PTHREAD_CFLAGS} -DQT_THREAD_SUPPORT -LDADD= -L${X11BASE}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lqt-mt -lgds +LDADD= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lqt-mt -lgds SRCS= qsql_${DB}.cpp main.cpp LIBDIR= ${PREFIX}/lib/plugins/sqldrivers diff --git a/databases/qt-mysql-plugin/Makefile b/databases/qt-mysql-plugin/Makefile index 1853a2b22b77..31fd81c08f58 100644 --- a/databases/qt-mysql-plugin/Makefile +++ b/databases/qt-mysql-plugin/Makefile @@ -8,7 +8,7 @@ PORTNAME= qt-${DB}-plugin PORTVERSION= 3.3.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_QT} DISTNAME= qt-x11-free-${PORTVERSION} @@ -33,7 +33,6 @@ MAKEFILE= ${FILESDIR}/Makefile.bsd MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" PLUGIN="${PLUGIN}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" -USE_X_PREFIX= yes PLIST_SUB= DB=${DB} .include <bsd.port.mk> diff --git a/databases/qt-mysql-plugin/files/Makefile.bsd b/databases/qt-mysql-plugin/files/Makefile.bsd index 12bc68099917..d9e74d5d3bf7 100644 --- a/databases/qt-mysql-plugin/files/Makefile.bsd +++ b/databases/qt-mysql-plugin/files/Makefile.bsd @@ -3,9 +3,11 @@ SHLIB_NAME= libqsql${DB}.so VPATH= ${PLUGIN}:${DRIVER} CXXFLAGS+= -I${PLUGIN} -I${DRIVER} \ -I${LOCALBASE}/include/mysql \ - -I${LOCALBASE}/include -I${X11BASE}/include \ + -I${LOCALBASE}/include \ ${PTHREAD_CFLAGS} -DQT_THREAD_SUPPORT -LDADD= -L${X11BASE}/lib -L${LOCALBASE}/lib/mysql ${PTHREAD_LIBS} -lqt-mt -lmysqlclient +LDADD= -L${LOCALBASE}/lib/mysql \ + ${PTHREAD_LIBS} \ + -L${LOCALBASE}/lib/ -lqt-mt -lmysqlclient SRCS= qsql_${DB}.cpp main.cpp LIBDIR= ${PREFIX}/lib/plugins/sqldrivers diff --git a/databases/qt-odbc-plugin/Makefile b/databases/qt-odbc-plugin/Makefile index b817d06440c9..9365248318cf 100644 --- a/databases/qt-odbc-plugin/Makefile +++ b/databases/qt-odbc-plugin/Makefile @@ -8,7 +8,7 @@ PORTNAME= qt-${DB}-plugin PORTVERSION= 3.3.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_QT} DISTNAME= qt-x11-free-${PORTVERSION} @@ -33,7 +33,6 @@ MAKEFILE= ${FILESDIR}/Makefile.bsd MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" PLUGIN="${PLUGIN}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" -USE_X_PREFIX= yes PLIST_SUB= DB=${DB} .include <bsd.port.mk> diff --git a/databases/qt-odbc-plugin/files/Makefile.bsd b/databases/qt-odbc-plugin/files/Makefile.bsd index 22ac3adf2541..383c67b3c4aa 100644 --- a/databases/qt-odbc-plugin/files/Makefile.bsd +++ b/databases/qt-odbc-plugin/files/Makefile.bsd @@ -2,9 +2,9 @@ SHLIB_NAME= libqsql${DB}.so VPATH= ${PLUGIN}:${DRIVER} CXXFLAGS+= -I${PLUGIN} -I${DRIVER} \ - -I${LOCALBASE}/include -I${X11BASE}/include \ + -I${LOCALBASE}/include \ ${PTHREAD_CFLAGS} -DQT_THREAD_SUPPORT -LDADD= -L${X11BASE}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lqt-mt -lodbc +LDADD= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lqt-mt -lodbc SRCS= qsql_${DB}.cpp main.cpp LIBDIR= ${PREFIX}/lib/plugins/sqldrivers diff --git a/databases/qt-pgsql-plugin/Makefile b/databases/qt-pgsql-plugin/Makefile index bc7c7162d8c3..aff6c64a01ba 100644 --- a/databases/qt-pgsql-plugin/Makefile +++ b/databases/qt-pgsql-plugin/Makefile @@ -8,7 +8,7 @@ PORTNAME= qt-${DB}-plugin PORTVERSION= 3.3.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_QT} DISTNAME= qt-x11-free-${PORTVERSION} @@ -33,7 +33,6 @@ MAKEFILE= ${FILESDIR}/Makefile.bsd MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" PLUGIN="${PLUGIN}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" -USE_X_PREFIX= yes PLIST_SUB= DB=${DB} .include <bsd.port.mk> diff --git a/databases/qt-pgsql-plugin/files/Makefile.bsd b/databases/qt-pgsql-plugin/files/Makefile.bsd index 3f3242654fc5..567d75d0e8a4 100644 --- a/databases/qt-pgsql-plugin/files/Makefile.bsd +++ b/databases/qt-pgsql-plugin/files/Makefile.bsd @@ -3,9 +3,9 @@ SHLIB_NAME= libqsql${DB}.so VPATH= ${PLUGIN}:${DRIVER} CXXFLAGS+= -I${PLUGIN} -I${DRIVER} \ -I${LOCALBASE}/include/postgresql/server \ - -I${LOCALBASE}/include -I${X11BASE}/include \ + -I${LOCALBASE}/include \ ${PTHREAD_CFLAGS} -DQT_THREAD_SUPPORT -LDADD= -L${X11BASE}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lqt-mt -lpq +LDADD= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lqt-mt -lpq SRCS= qsql_${DB}.cpp main.cpp LIBDIR= ${PREFIX}/lib/plugins/sqldrivers diff --git a/databases/qt-sqlite-plugin/Makefile b/databases/qt-sqlite-plugin/Makefile index d61bf2ba7082..5e57c5b8f57e 100644 --- a/databases/qt-sqlite-plugin/Makefile +++ b/databases/qt-sqlite-plugin/Makefile @@ -8,7 +8,7 @@ PORTNAME= qt-${DB}-plugin PORTVERSION= 3.3.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_QT} DISTNAME= qt-x11-free-${PORTVERSION} @@ -33,7 +33,6 @@ MAKEFILE= ${FILESDIR}/Makefile.bsd MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" PLUGIN="${PLUGIN}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" -USE_X_PREFIX= yes PLIST_SUB= DB=${DB} .include <bsd.port.mk> diff --git a/databases/qt-sqlite-plugin/files/Makefile.bsd b/databases/qt-sqlite-plugin/files/Makefile.bsd index c1c9ad04a198..cddbeca8c4fb 100644 --- a/databases/qt-sqlite-plugin/files/Makefile.bsd +++ b/databases/qt-sqlite-plugin/files/Makefile.bsd @@ -2,9 +2,9 @@ SHLIB_NAME= libqsql${DB}.so VPATH= ${PLUGIN}:${DRIVER} CXXFLAGS+= -I${PLUGIN} -I${DRIVER} \ - -I${LOCALBASE}/include -I${X11BASE}/include \ + -I${LOCALBASE}/include \ ${PTHREAD_CFLAGS} -DQT_THREAD_SUPPORT -LDADD= -L${X11BASE}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lqt-mt -lsqlite +LDADD= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lqt-mt -lsqlite SRCS= qsql_${DB}.cpp smain.cpp LIBDIR= ${PREFIX}/lib/plugins/sqldrivers diff --git a/databases/qt4-pgsql-plugin/files/Makefile.bsd b/databases/qt4-pgsql-plugin/files/Makefile.bsd index 1363014e4995..daf1e9220551 100644 --- a/databases/qt4-pgsql-plugin/files/Makefile.bsd +++ b/databases/qt4-pgsql-plugin/files/Makefile.bsd @@ -4,7 +4,7 @@ VPATH= ${PLUGIN}:${DRIVER} CXXFLAGS+= -I${DRIVER} \ -I${LOCALBASE}/include/Qt \ -I${LOCALBASE}/include/postgresql/server \ - -I${LOCALBASE}/include -I${X11BASE}/include \ + -I${LOCALBASE}/include \ ${PTHREAD_CFLAGS} -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII \ -DQT_PLUGIN -DQT_SQL_LIB -DQT_CORE_LIB -D_LARGEFILE64_SOURCE \ -D_LARGEFILE_SOURCE -DQT_SHARED diff --git a/databases/rrdtool10/Makefile b/databases/rrdtool10/Makefile index 8d608fb7c20e..4c1c4cd8b0cb 100644 --- a/databases/rrdtool10/Makefile +++ b/databases/rrdtool10/Makefile @@ -21,7 +21,7 @@ CONFLICTS= rrdtool-1.2* LATEST_LINK= rrdtool10 USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-shared --enable-local-zlib \ --program-transform-name='' CONFIGURE_ENV= PERL=${PERL} PERL_MAKE_OPTIONS="PREFIX=${PREFIX}" diff --git a/databases/sqlite2/Makefile b/databases/sqlite2/Makefile index 86d4bbf6b201..97b9da428035 100644 --- a/databases/sqlite2/Makefile +++ b/databases/sqlite2/Makefile @@ -18,7 +18,7 @@ COMMENT= An SQL database engine in a C library w/ Tcl wrapper USE_GMAKE= YES USE_GNOME= pkgconfig USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= YES +USE_LDCONFIG= YES CONFIGURE_ARGS= --prefix=${PREFIX} --with-hints=freebsd.hints CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile index 524b7f091346..923d232313c8 100644 --- a/databases/sqlrelay/Makefile +++ b/databases/sqlrelay/Makefile @@ -9,7 +9,7 @@ PORTNAME= ${SQLRELAY_PORTNAME} PORTVERSION= ${SQLRELAY_PORTVERSION} PORTREVISION= 2 CATEGORIES= databases -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= sqlrelay MAINTAINER= skv@FreeBSD.org @@ -115,7 +115,7 @@ IF_FREETDS= "@comment " .if defined(WITH_GTK) && ${WITH_GTK:L} != no USE_GNOME+= gtk12 -CONFIGURE_ARGS+= --with-gtk-prefix="${X11BASE}" +CONFIGURE_ARGS+= --with-gtk-prefix="${LOCALBASE}" IF_GTK= "" .else CONFIGURE_ARGS+= --disable-gtk diff --git a/databases/tora/Makefile b/databases/tora/Makefile index 00f8a4f3f510..730e7a1830a1 100644 --- a/databases/tora/Makefile +++ b/databases/tora/Makefile @@ -23,13 +23,13 @@ LIB_DEPENDS= qscintilla.7:${PORTSDIR}/x11-toolkits/qscintilla \ RUN_DEPENDS= ${ORACLE_HOME}/network/admin/tnsnames.ora:${PORTSDIR}/databases/oracle8-client .if !defined(WITHOUT_MYSQL) -BUILD_DEPENDS+= ${X11BASE}/lib/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt-mysql-plugin -RUN_DEPENDS+= ${X11BASE}/lib/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt-mysql-plugin +BUILD_DEPENDS+= ${LOCALBASE}/lib/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt-mysql-plugin +RUN_DEPENDS+= ${LOCALBASE}/lib/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt-mysql-plugin .endif .if !defined(WITHOUT_PGSQL) -BUILD_DEPENDS+= ${X11BASE}/lib/plugins/sqldrivers/libqsqlpsql.so:${PORTSDIR}/databases/qt-pgsql-plugin -RUN_DEPENDS+= ${X11BASE}/lib/plugins/sqldrivers/libqsqlpsql.so:${PORTSDIR}/databases/qt-pgsql-plugin +BUILD_DEPENDS+= ${LOCALBASE}/lib/plugins/sqldrivers/libqsqlpsql.so:${PORTSDIR}/databases/qt-pgsql-plugin +RUN_DEPENDS+= ${LOCALBASE}/lib/plugins/sqldrivers/libqsqlpsql.so:${PORTSDIR}/databases/qt-pgsql-plugin .endif ORACLE_HOME?= ${LOCALBASE}/oracle8-client diff --git a/databases/wmjsql/Makefile b/databases/wmjsql/Makefile index 90d052542118..72f5f829404a 100644 --- a/databases/wmjsql/Makefile +++ b/databases/wmjsql/Makefile @@ -17,8 +17,7 @@ COMMENT= MySQL server status displaying dockapp USE_MYSQL= yes USE_GMAKE= yes -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xpm ALL_TARGET= clean all diff --git a/databases/xmbase-grok/Makefile b/databases/xmbase-grok/Makefile index 4b14a4163c4c..7dbb5cb71434 100644 --- a/databases/xmbase-grok/Makefile +++ b/databases/xmbase-grok/Makefile @@ -7,7 +7,7 @@ PORTNAME= xmbase-grok PORTVERSION= 1.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= ftp://grok.ftp.fu-berlin.de/ \ ftp://bitrot.de/pub/grok/ @@ -18,11 +18,11 @@ COMMENT= Graphical Resource Organizer Kit BUILD_WRKSRC= ${WRKDIR}/${DISTNAME}/src -USE_X_PREFIX= yes +USE_XORG= x11 xt USE_MOTIF= yes MAKE_ENV= MYCC="${CC}" DEBUG="${CFLAGS}" YO="" INCDIR="" \ GBIN="${PREFIX}/bin" GLIB="${DATADIR}" \ - CF="-I${X11BASE}/include" LF="${MOTIFLIB} -lXt -lX11 -lm" + CF="-I${LOCALBASE}/include" LF="${MOTIFLIB} -lXt -lX11 -lm" MAN1= grok.1 DATADIR= ${PREFIX}/lib/X11/xmbase-grok diff --git a/databases/xmysqladmin/Makefile b/databases/xmysqladmin/Makefile index f3fd0237617d..2a36082c9f16 100644 --- a/databases/xmysqladmin/Makefile +++ b/databases/xmysqladmin/Makefile @@ -7,7 +7,7 @@ PORTNAME= xmysqladmin PORTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL} MASTER_SITE_SUBDIR= Contrib/Old-Versions @@ -18,8 +18,7 @@ COMMENT= X11 front end to the mysqladmin command of the MySQL database engine LIB_DEPENDS= forms.1:${PORTSDIR}/x11-toolkits/xforms \ mysqlclient.10:${PORTSDIR}/databases/mysql323-client -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xpm ALL_TARGET= xmysqladmin pre-su-install: diff --git a/databases/xmysqladmin/files/patch-aa b/databases/xmysqladmin/files/patch-aa index 62b1b87bc706..dc9a09072674 100644 --- a/databases/xmysqladmin/files/patch-aa +++ b/databases/xmysqladmin/files/patch-aa @@ -5,7 +5,7 @@ #------------------------------------------------------- #INSTALLPATH = /opt/local/i386/bin -INSTALLPATH = /usr/local/bin -+INSTALLPATH = ${X11BASE}/bin ++INSTALLPATH = ${LOCALBASE}/bin ######################################################## @@ -14,7 +14,7 @@ #------------------------------------------------------- #PIXMAPPATH = /opt/local/lib -PIXMAPPATH = /usr/local/bin -+PIXMAPPATH = ${X11BASE}/include/X11/pixmaps ++PIXMAPPATH = ${LOCABASE}/include/X11/pixmaps ######################################################## @@ -51,7 +51,7 @@ # mysql library dir #------------------------------------------------------- -MYSQLLOAD = -Wl,-R/usr/local/mysql/lib/mysql -L/usr/local/mysql/lib/mysql -lmysqlclient -+MYSQLLOAD = -Wl,-R${LOCALBASE}/lib/mysql -L${LOCALBASE}/lib/mysql -lmysqlclient ++MYSQLLOAD = -Wl,-R${LOCALBASE}/lib/mysql -lmysqlclient ######################################################## @@ -60,7 +60,7 @@ #------------------------------------------------------- #XFORMLIBDIR = -L/opt/local/i386/lib -XFORMLIBDIR = -L/usr/lib -+XFORMLIBDIR = -L${X11BASE}/lib ++XFORMLIBDIR = -L${LOCALBASE}/lib ######################################################## @@ -69,7 +69,7 @@ #------------------------------------------------------- #XFORMINCDIR = -I/opt/local/include -XFORMINCDIR = -I/usr/X11R6/include -+XFORMINCDIR = -I${X11BASE}/include -I${X11BASE}/include/X11 ++XFORMINCDIR = -I${LOCALBASE}/include -I${LOCALBASE}/include/X11 ######################################################## @@ -78,7 +78,7 @@ # Use this for Linux: XINC = -XLOAD = -L/usr/X11R6/lib -lX11 /usr/X11R6/lib/libXpm.so.4 -+XLOAD = -L${X11BASE}/lib -lX11 ++XLOAD = -L${LOCALBASE}/lib -lX11 ######################################################## |