diff options
| author | clement <clement@FreeBSD.org> | 2005-11-03 21:18:09 +0000 |
|---|---|---|
| committer | clement <clement@FreeBSD.org> | 2005-11-03 21:18:09 +0000 |
| commit | cd74f1b5bd49d46771bc3160cfbdd411343ae981 (patch) | |
| tree | 3d1f116e0f8f7593690287c341333a5b6176dc07 /ports-mgmt | |
| parent | 48d131a07b3f6393efebb683a2e579ad4be455cc (diff) | |
| download | FreeBSD-ports-cd74f1b5bd49d46771bc3160cfbdd411343ae981.zip FreeBSD-ports-cd74f1b5bd49d46771bc3160cfbdd411343ae981.tar.gz | |
Add 2 more patches for exp build:
ports/83514 - fix typo in bsd.port.mk: s/RC_ORDER/USE_RCORDER/g
ports/88466 - small update to bsd.port.mk for postgresql (support of 8.1)
exp build also contains ports/78596. It's worthless to backport it to
devel/portmk
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/portmk/Mk/bsd.database.mk | 4 | ||||
| -rw-r--r-- | ports-mgmt/portmk/Mk/bsd.port.mk | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/ports-mgmt/portmk/Mk/bsd.database.mk b/ports-mgmt/portmk/Mk/bsd.database.mk index 51b4374e..067519f 100644 --- a/ports-mgmt/portmk/Mk/bsd.database.mk +++ b/ports-mgmt/portmk/Mk/bsd.database.mk @@ -111,10 +111,12 @@ DEFAULT_PGSQL_VER?= 74 PGSQL73_LIBVER= 3 PGSQL74_LIBVER= 3 PGSQL80_LIBVER= 4 +PGSQL81_LIBVER= 4 # Setting/finding PostgreSQL version we want. .if exists(${LOCALBASE}/bin/pg_config) -_PGSQL_VER!= ${LOCALBASE}/bin/pg_config --version | ${SED} -n 's/PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*/\1\2/p' +_PGSQL_VER!= ${LOCALBASE}/bin/pg_config --version | ${SED} -n 's/PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\)[^0-9].*/\1\2/p' +.endif .endif .if defined(WANT_PGSQL_VER) && defined(_PGSQL_VER) && ${WANT_PGSQL_VER} != ${_PGSQL_VER} diff --git a/ports-mgmt/portmk/Mk/bsd.port.mk b/ports-mgmt/portmk/Mk/bsd.port.mk index d02068a..1e612bf 100644 --- a/ports-mgmt/portmk/Mk/bsd.port.mk +++ b/ports-mgmt/portmk/Mk/bsd.port.mk @@ -380,7 +380,7 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # ${PREFIX}/etc/rc.d and added to the packing list. # pairs will be added to ${SUB_LIST}. These files will be # installed in ${PREFIX}/etc/rc.d and added to the packing list. -# RC_ORDER - List of rcNG startup scripts to be called early in the boot +# USE_RCORDER - List of rcNG startup scripts to be called early in the boot # process. This acts exactly like USE_RC_SUBR except that # scripts are installed in /etc/rc.d. # RC_SUBR - Set to path of rc.subr. |
