sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Various tidiness patches:

Browse source 
- Compact -plperl ports
 - Portlint for 90-plperl
 - Update version numbers in pkg-install-server
 - s/spaces/tabs/
 - Use ${} instead of $()
 - s/YES/yes/
 - Tidy IGNORE values

Submitted by:	sunpoet
This commit is contained in:
Chris Rees 2012-03-05 20:10:22 +00:00
parent 9eb4fdc35d
commit 56e5d02d70
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=292772
12 changed files with 50 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
databases/postgresql83-plperl/Makefile
View file

@ -5,13 +5,6 @@
# $FreeBSD$
#
PORTNAME= postgresql
PKGNAMESUFFIX= -plperl
MAINTAINER= pgsql@FreeBSD.org
COMMENT= Write SQL functions for PostgreSQL using Perl5
WANT_PGSQL_VER= 83
USE_PERL5= yes
.include "${.CURDIR}/../postgresql90-plperl/Makefile"

2
databases/postgresql83-server/pkg-install-server
View file

@ -10,7 +10,7 @@ cat <<EOF
=========== BACKUP YOUR DATA! =============
As always, backup your data before
upgrading. If the upgrade leads to a higher
minor revision (e.g. 7.3.x -> 7.4), a dump
minor revision (e.g. 8.3.x -> 8.4), a dump
and restore of all databases is
required. This is *NOT* done by the port!

7
databases/postgresql84-plperl/Makefile
View file

@ -5,13 +5,6 @@
# $FreeBSD$
#
PORTNAME= postgresql
PKGNAMESUFFIX= -plperl
MAINTAINER= pgsql@FreeBSD.org
COMMENT= Write SQL functions for PostgreSQL using Perl5
WANT_PGSQL_VER= 84
USE_PERL5= yes
.include "${.CURDIR}/../postgresql90-plperl/Makefile"

30
databases/postgresql84-server/Makefile
View file

@ -29,9 +29,9 @@ UNIQUENAME?= ${PORTNAME}${DISTVERSION:R:S/.//}
LATEST_LINK?= ${PKGNAMEPREFIX}${UNIQUENAME}${PKGNAMESUFFIX}
PKGINSTALL?= ${PKGDIR}/pkg-install${PKGNAMESUFFIX}
USE_BZIP2= YES
USE_GMAKE= YES
GNU_CONFIGURE= YES
USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
.if defined(NO_BUILD)
.undef USE_GMAKE
.undef GNU_CONFIGURE
@ -66,8 +66,8 @@ USE_PGSQL= yes
WANT_PGSQL_VER= ${DISTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g}
USERS= ${PG_USER}
. if ${USERS} != "pgsql"
UID_FILES+= ${WRKDIR}/pguid
GID_FILES+= ${WRKDIR}/pggid
UID_FILES+= ${WRKDIR}/pguid
GID_FILES+= ${WRKDIR}/pggid
. endif
GROUPS= ${PG_GROUP}
SUB_FILES+= 502.pgsql
@ -138,7 +138,7 @@ PATCH_DIST_STRIP=-p1
CONFIGURE_ARGS+=--enable-dtrace
LDFLAGS+= -lelf
. if ${OSVERSION} < 900021
IGNORE= Need userland DTrace support found in FreeBSD 9.0
IGNORE= need userland DTrace support found in FreeBSD 9.0
. endif
. endif
@ -148,7 +148,7 @@ CONFIGURE_ARGS+=--with-pam
. if defined(WITH_LDAP)
CONFIGURE_ARGS+=--with-ldap
USE_OPENLDAP= YES
USE_OPENLDAP= yes
. endif
. if defined(WITH_XML)
@ -172,7 +172,7 @@ CONFIGURE_ARGS+=--enable-integer-datetimes
. if !(defined(WITHOUT_GETTEXT) || defined(WITHOUT_NLS))
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= GETTEXT=""
USE_GETTEXT= YES
USE_GETTEXT= yes
. else
CONFIGURE_ARGS+=--disable-nls
PLIST_SUB+= GETTEXT="@comment "
@ -296,11 +296,11 @@ MAN7+= abort.7 alter_aggregate.7 alter_conversion.7 alter_database.7 \
savepoint.7 values.7
.endif
PLIST_SUB+= PG_USER=$(PG_USER) \
PG_GROUP=$(PG_GROUP)
SUB_LIST+= PG_GROUP=$(PG_GROUP) \
PG_USER=$(PG_USER) \
PG_UID=$(PG_UID)
PLIST_SUB+= PG_USER=${PG_USER} \
PG_GROUP=${PG_GROUP}
SUB_LIST+= PG_GROUP=${PG_GROUP} \
PG_USER=${PG_USER} \
PG_UID=${PG_UID}
.if defined(SERVER_ONLY)
pre-everything::
@ -320,7 +320,7 @@ pre-configure:
pre-build:
@ cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${GMAKE} symlinks
.endif
do-build:
@ for dir in ${BUILD_DIRS}; do \
cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE}; \
@ -332,7 +332,7 @@ PKGMESSAGE= ${WRKSRC}/pkg-message${PKGNAMESUFFIX}
. endif
. if exists(${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in)
SUB_FILES+= pkg-install${PKGNAMESUFFIX}
PLIST_SUB+= PG_USER=$(PG_USER)
PLIST_SUB+= PG_USER=${PG_USER}
. endif
.endif

2
databases/postgresql84-server/pkg-install-server
View file

@ -10,7 +10,7 @@ cat <<EOF
=========== BACKUP YOUR DATA! =============
As always, backup your data before
upgrading. If the upgrade leads to a higher
minor revision (e.g. 7.3.x -> 7.4), a dump
minor revision (e.g. 8.3.x -> 8.4), a dump
and restore of all databases is
required. This is *NOT* done by the port!

4
databases/postgresql90-plperl/Makefile
View file

@ -12,10 +12,10 @@ PKGNAMESUFFIX= -plperl
MAINTAINER= pgsql@FreeBSD.org
COMMENT= Write SQL functions for PostgreSQL using Perl5
MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER}-server
RUN_DEPENDS= postgres:${PORTSDIR}/databases/postgresql${WANT_PGSQL_VER}-server
MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER}-server
WANT_PGSQL_VER?=90
USE_PERL5= yes

2
databases/postgresql90-server/pkg-install-server
View file

@ -10,7 +10,7 @@ cat <<EOF
=========== BACKUP YOUR DATA! =============
As always, backup your data before
upgrading. If the upgrade leads to a higher
minor revision (e.g. 7.3.x -> 7.4), a dump
minor revision (e.g. 8.3.x -> 8.4), a dump
and restore of all databases is
required. This is *NOT* done by the port!

7
databases/postgresql91-plperl/Makefile
View file

@ -5,13 +5,6 @@
# $FreeBSD$
#
PORTNAME= postgresql
PKGNAMESUFFIX= -plperl
MAINTAINER= pgsql@FreeBSD.org
COMMENT= Write SQL functions for PostgreSQL using Perl5
WANT_PGSQL_VER= 91
USE_PERL5= yes
.include "${.CURDIR}/../postgresql90-plperl/Makefile"

28
databases/postgresql91-server/Makefile
View file

@ -29,14 +29,14 @@ ICU_PATCHFILE?= pg-910-icu-2011-09-22.diff.gz
UNIQUENAME?= ${PORTNAME}${DISTVERSION:R:S/.//}
LATEST_LINK?= ${PKGNAMEPREFIX}${UNIQUENAME}${PKGNAMESUFFIX}
.else # Contrib has different options from -client/-server
UNIQUENAME?= ${PORTNAME}${DISTVERSION:R:S/.//}${PKGNAMESUFFIX}
UNIQUENAME?= ${PORTNAME}${DISTVERSION:R:S/.//}${PKGNAMESUFFIX}
LATEST_LINK?= ${PKGNAMEPREFIX}${UNIQUENAME}
.endif
PKGINSTALL?= ${PKGDIR}/pkg-install${PKGNAMESUFFIX}
USE_BZIP2= YES
USE_GMAKE= YES
GNU_CONFIGURE= YES
USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
.if defined(NO_BUILD)
.undef USE_GMAKE
.undef GNU_CONFIGURE
@ -146,7 +146,7 @@ PATCH_DIST_STRIP=-p1
CONFIGURE_ARGS+=--enable-dtrace
LDFLAGS+=-lelf
. if ${OSVERSION} < 900021
IGNORE= Need userland DTrace support found in FreeBSD 9.0
IGNORE= need userland DTrace support found in FreeBSD 9.0
. endif
. endif
@ -157,7 +157,7 @@ CONFIGURE_ARGS+=--with-pam
. if defined(WITH_LDAP)
CONFIGURE_ARGS+=--with-ldap
. if defined (SERVER_ONLY)
USE_OPENLDAP= YES
USE_OPENLDAP= yes
. endif
. endif
@ -180,7 +180,7 @@ CONFIGURE_ARGS+=--disable-integer-datetimes
. if !(defined(WITHOUT_GETTEXT) || defined(WITHOUT_NLS))
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= GETTEXT=""
USE_GETTEXT= YES
USE_GETTEXT= yes
. else
CONFIGURE_ARGS+=--disable-nls
PLIST_SUB+= GETTEXT="@comment "
@ -228,7 +228,7 @@ CONFIGURE_ARGS+=--with-krb5
. endif
. if defined(WITH_MIT_KRB5) && defined(WITH_HEIMDAL_KRB5)
IGNORE= has OPTIONS for MIT's and Heimdal Kerberos, which are mutually exclusive. Please choose one or the other.
IGNORE= has OPTIONS for MIT's and Heimdal Kerberos, which are mutually exclusive. Please choose one or the other
. endif
.endif # !SLAVE_ONLY
@ -322,11 +322,11 @@ MAN7+= ABORT.7 ALTER_AGGREGATE.7 ALTER_CONVERSION.7 \
SAVEPOINT.7 VALUES.7 WITH.7
.endif
PLIST_SUB+= PG_USER=$(PG_USER) \
PG_GROUP=$(PG_GROUP)
SUB_LIST+= PG_GROUP=$(PG_GROUP) \
PG_USER=$(PG_USER) \
PG_UID=$(PG_UID)
PLIST_SUB+= PG_USER=${PG_USER} \
PG_GROUP=${PG_GROUP}
SUB_LIST+= PG_GROUP=${PG_GROUP} \
PG_USER=${PG_USER} \
PG_UID=${PG_UID}
.if defined(SERVER_ONLY)
pre-everything::
@ -347,7 +347,7 @@ PKGMESSAGE= ${WRKSRC}/pkg-message${PKGNAMESUFFIX}
. endif
. if exists(${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in)
SUB_FILES+= pkg-install${PKGNAMESUFFIX}
PLIST_SUB+= PG_USER=$(PG_USER)
PLIST_SUB+= PG_USER=${PG_USER}
. endif
post-patch:

2
databases/postgresql91-server/pkg-install-server
View file

@ -10,7 +10,7 @@ cat <<EOF
=========== BACKUP YOUR DATA! =============
As always, backup your data before
upgrading. If the upgrade leads to a higher
minor revision (e.g. 7.3.x -> 7.4), a dump
minor revision (e.g. 8.3.x -> 8.4), a dump
and restore of all databases is
required. This is *NOT* done by the port!

28
databases/postgresql92-server/Makefile
View file

@ -29,14 +29,14 @@ ICU_PATCHFILE?= pg-910-icu-2011-09-22.diff.gz
UNIQUENAME?= ${PORTNAME}${DISTVERSION:R:S/.//}
LATEST_LINK?= ${PKGNAMEPREFIX}${UNIQUENAME}${PKGNAMESUFFIX}
.else # Contrib has different options from -client/-server
UNIQUENAME?= ${PORTNAME}${DISTVERSION:R:S/.//}${PKGNAMESUFFIX}
UNIQUENAME?= ${PORTNAME}${DISTVERSION:R:S/.//}${PKGNAMESUFFIX}
LATEST_LINK?= ${PKGNAMEPREFIX}${UNIQUENAME}
.endif
PKGINSTALL?= ${PKGDIR}/pkg-install${PKGNAMESUFFIX}
USE_BZIP2= YES
USE_GMAKE= YES
GNU_CONFIGURE= YES
USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
.if defined(NO_BUILD)
.undef USE_GMAKE
.undef GNU_CONFIGURE
@ -146,7 +146,7 @@ PATCH_DIST_STRIP=-p1
CONFIGURE_ARGS+=--enable-dtrace
LDFLAGS+=-lelf
. if ${OSVERSION} < 900021
IGNORE= Need userland DTrace support found in FreeBSD 9.0
IGNORE= need userland DTrace support found in FreeBSD 9.0
. endif
. endif
@ -157,7 +157,7 @@ CONFIGURE_ARGS+=--with-pam
. if defined(WITH_LDAP)
CONFIGURE_ARGS+=--with-ldap
. if defined (SERVER_ONLY)
USE_OPENLDAP= YES
USE_OPENLDAP= yes
. endif
. endif
@ -180,7 +180,7 @@ CONFIGURE_ARGS+=--disable-integer-datetimes
. if !(defined(WITHOUT_GETTEXT) || defined(WITHOUT_NLS))
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= GETTEXT=""
USE_GETTEXT= YES
USE_GETTEXT= yes
. else
CONFIGURE_ARGS+=--disable-nls
PLIST_SUB+= GETTEXT="@comment "
@ -228,7 +228,7 @@ CONFIGURE_ARGS+=--with-krb5
. endif
. if defined(WITH_MIT_KRB5) && defined(WITH_HEIMDAL_KRB5)
IGNORE= has OPTIONS for MIT's and Heimdal Kerberos, which are mutually exclusive. Please choose one or the other.
IGNORE= has OPTIONS for MIT's and Heimdal Kerberos, which are mutually exclusive. Please choose one or the other
. endif
.endif # !SLAVE_ONLY
@ -322,11 +322,11 @@ MAN7+= ABORT.7 ALTER_AGGREGATE.7 ALTER_CONVERSION.7 \
SAVEPOINT.7 VALUES.7 WITH.7
.endif
PLIST_SUB+= PG_USER=$(PG_USER) \
PG_GROUP=$(PG_GROUP)
SUB_LIST+= PG_GROUP=$(PG_GROUP) \
PG_USER=$(PG_USER) \
PG_UID=$(PG_UID)
PLIST_SUB+= PG_USER=${PG_USER} \
PG_GROUP=${PG_GROUP}
SUB_LIST+= PG_GROUP=${PG_GROUP} \
PG_USER=${PG_USER} \
PG_UID=${PG_UID}
.if defined(SERVER_ONLY)
pre-everything::
@ -347,7 +347,7 @@ PKGMESSAGE= ${WRKSRC}/pkg-message${PKGNAMESUFFIX}
. endif
. if exists(${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in)
SUB_FILES+= pkg-install${PKGNAMESUFFIX}
PLIST_SUB+= PG_USER=$(PG_USER)
PLIST_SUB+= PG_USER=${PG_USER}
. endif
post-patch:

2
databases/postgresql92-server/pkg-install-server
View file

@ -10,7 +10,7 @@ cat <<EOF
=========== BACKUP YOUR DATA! =============
As always, backup your data before
upgrading. If the upgrade leads to a higher
minor revision (e.g. 7.3.x -> 7.4), a dump
minor revision (e.g. 8.3.x -> 8.4), a dump
and restore of all databases is
required. This is *NOT* done by the port!