From owner-svn-ports-all@FreeBSD.ORG Sun May 12 00:00:59 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id B2DB9C7A; Sun, 12 May 2013 00:00:59 +0000 (UTC) (envelope-from girgen@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id A3CADFF4; Sun, 12 May 2013 00:00:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4C00xc4031639; Sun, 12 May 2013 00:00:59 GMT (envelope-from girgen@svn.freebsd.org) Received: (from girgen@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4C00ugW030214; Sun, 12 May 2013 00:00:56 GMT (envelope-from girgen@svn.freebsd.org) Message-Id: <201305120000.r4C00ugW030214@svn.freebsd.org> From: Palle Girgensohn Date: Sun, 12 May 2013 00:00:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317925 - in head: Mk databases databases/postgresql93-client databases/postgresql93-contrib databases/postgresql93-docs databases/postgresql93-pgtcl databases/postgresql93-plperl datab... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 00:00:59 -0000 Author: girgen Date: Sun May 12 00:00:56 2013 New Revision: 317925 URL: http://svnweb.freebsd.org/changeset/ports/317925 Log: Add postgresql 9.3 beta1 Modified: head/Mk/bsd.database.mk head/databases/Makefile head/databases/postgresql93-client/Makefile head/databases/postgresql93-contrib/Makefile head/databases/postgresql93-docs/Makefile head/databases/postgresql93-pgtcl/Makefile head/databases/postgresql93-plperl/Makefile head/databases/postgresql93-plpython/Makefile head/databases/postgresql93-pltcl/Makefile head/databases/postgresql93-server/Makefile head/databases/postgresql93-server/distinfo head/databases/postgresql93-server/files/patch-plpython-Makefile head/databases/postgresql93-server/pkg-plist-client head/databases/postgresql93-server/pkg-plist-contrib head/databases/postgresql93-server/pkg-plist-server Modified: head/Mk/bsd.database.mk ============================================================================== --- head/Mk/bsd.database.mk Sat May 11 23:46:30 2013 (r317924) +++ head/Mk/bsd.database.mk Sun May 12 00:00:56 2013 (r317925) @@ -190,13 +190,14 @@ IGNORE= cannot install: unknown MySQL v .endif # USE_MYSQL .if defined(USE_PGSQL) -VALID_PGSQL_VER= 83 84 90 91 92 +VALID_PGSQL_VER= 83 84 90 91 92 93 DEFAULT_PGSQL_VER?= 90 PGSQL83_LIBVER= 5 PGSQL84_LIBVER= 5 PGSQL90_LIBVER= 5 PGSQL91_LIBVER= 5 PGSQL92_LIBVER= 5 +PGSQL93_LIBVER= 5 # Setting/finding PostgreSQL version we want. . if exists(${LOCALBASE}/bin/pg_config) Modified: head/databases/Makefile ============================================================================== --- head/databases/Makefile Sat May 11 23:46:30 2013 (r317924) +++ head/databases/Makefile Sun May 12 00:00:56 2013 (r317925) @@ -686,6 +686,14 @@ SUBDIR += postgresql92-plpython SUBDIR += postgresql92-pltcl SUBDIR += postgresql92-server + SUBDIR += postgresql93-client + SUBDIR += postgresql93-contrib + SUBDIR += postgresql93-docs + SUBDIR += postgresql93-pgtcl + SUBDIR += postgresql93-plperl + SUBDIR += postgresql93-plpython + SUBDIR += postgresql93-pltcl + SUBDIR += postgresql93-server SUBDIR += postgresql_autodoc SUBDIR += powerarchitect SUBDIR += proftpd-mod_sql_mysql Modified: head/databases/postgresql93-client/Makefile ============================================================================== --- head/databases/postgresql93-client/Makefile Sat May 11 23:46:30 2013 (r317924) +++ head/databases/postgresql93-client/Makefile Sun May 12 00:00:56 2013 (r317925) @@ -12,7 +12,7 @@ PKGNAMESUFFIX= -client COMMENT= PostgreSQL database (client) -MASTERDIR= ${.CURDIR}/../postgresql92-server +MASTERDIR= ${.CURDIR}/../postgresql93-server BUILD_DIRS= config src/include src/interfaces src/port \ src/bin/pg_dump src/bin/psql src/bin/scripts src/bin/pg_config \ Modified: head/databases/postgresql93-contrib/Makefile ============================================================================== --- head/databases/postgresql93-contrib/Makefile Sat May 11 23:46:30 2013 (r317924) +++ head/databases/postgresql93-contrib/Makefile Sun May 12 00:00:56 2013 (r317925) @@ -12,16 +12,16 @@ LIB_DEPENDS= xslt.2:${PORTSDIR}/textproc xml2.5:${PORTSDIR}/textproc/libxml2 USE_PGSQL= yes -DEFAULT_PGSQL_VER=92 +DEFAULT_PGSQL_VER=93 MASTERDIR= ${.CURDIR}/../postgresql${DEFAULT_PGSQL_VER}-server USES= bison -BUILD_DIRS= src/port contrib +BUILD_DIRS= src/port src/common contrib INSTALL_DIRS= contrib SLAVE_ONLY= yes -CONFIGURE_ARGS+=--with-libxslt --with-libxml --with-openssl +CONFIGURE_ARGS+=--with-libxslt --with-libxml --with-openssl --disable-nls LDFLAGS+= ${PTHREAD_LIBS} -L${PREFIX}/lib OPTIONS_DEFINE= OSSP_UUID Modified: head/databases/postgresql93-docs/Makefile ============================================================================== --- head/databases/postgresql93-docs/Makefile Sat May 11 23:46:30 2013 (r317924) +++ head/databases/postgresql93-docs/Makefile Sun May 12 00:00:56 2013 (r317925) @@ -5,6 +5,6 @@ # $FreeBSD$ # -WANT_PGSQL_VER=92 +WANT_PGSQL_VER=93 .include "${.CURDIR}/../postgresql91-docs/Makefile" Modified: head/databases/postgresql93-pgtcl/Makefile ============================================================================== --- head/databases/postgresql93-pgtcl/Makefile Sat May 11 23:46:30 2013 (r317924) +++ head/databases/postgresql93-pgtcl/Makefile Sun May 12 00:00:56 2013 (r317925) @@ -1,9 +1,9 @@ # $FreeBSD$ -WANT_PGSQL_VER= 92 +WANT_PGSQL_VER= 93 PKGNAMESUFFIX= -postgresql${WANT_PGSQL_VER} -CONFLICTS= pgtcl-[0-9]* pgtcl-postgresql9[01]-[0-9]* +CONFLICTS= pgtcl-[0-9]* pgtcl-postgresql9[012]-[0-9]* MASTERDIR= ${.CURDIR}/../pgtcl Modified: head/databases/postgresql93-plperl/Makefile ============================================================================== --- head/databases/postgresql93-plperl/Makefile Sat May 11 23:46:30 2013 (r317924) +++ head/databases/postgresql93-plperl/Makefile Sun May 12 00:00:56 2013 (r317925) @@ -5,6 +5,6 @@ # $FreeBSD$ # -WANT_PGSQL_VER= 92 +WANT_PGSQL_VER= 93 .include "${.CURDIR}/../postgresql90-plperl/Makefile" Modified: head/databases/postgresql93-plpython/Makefile ============================================================================== --- head/databases/postgresql93-plpython/Makefile Sat May 11 23:46:30 2013 (r317924) +++ head/databases/postgresql93-plpython/Makefile Sun May 12 00:00:56 2013 (r317925) @@ -1,5 +1,5 @@ # $FreeBSD$ -WANT_PGSQL_VER= 92 +WANT_PGSQL_VER= 93 .include "${.CURDIR}/../postgresql90-plpython/Makefile" Modified: head/databases/postgresql93-pltcl/Makefile ============================================================================== --- head/databases/postgresql93-pltcl/Makefile Sat May 11 23:46:30 2013 (r317924) +++ head/databases/postgresql93-pltcl/Makefile Sun May 12 00:00:56 2013 (r317925) @@ -5,6 +5,6 @@ # $FreeBSD$ # -WANT_PGSQL_VER= 92 +WANT_PGSQL_VER= 93 .include "${.CURDIR}/../postgresql90-pltcl/Makefile" Modified: head/databases/postgresql93-server/Makefile ============================================================================== --- head/databases/postgresql93-server/Makefile Sat May 11 23:46:30 2013 (r317924) +++ head/databases/postgresql93-server/Makefile Sun May 12 00:00:56 2013 (r317925) @@ -1,396 +1,34 @@ -# Created by: Marc G. Fournier +# New ports collection makefile for: PostgreSQL +# Date created: November 13, 1998 +# Whom: Marc G. Fournier +# # $FreeBSD$ +# -PORTNAME?= postgresql -DISTVERSION?= 9.2.4 -PORTREVISION?= 0 -CATEGORIES?= databases -MASTER_SITES= PGSQL -MASTER_SITE_SUBDIR= source/v${DISTVERSION} +DISTVERSION?= 9.3beta1 +PORTREVISION= 0 PKGNAMESUFFIX?= -server MAINTAINER?= pgsql@FreeBSD.org -COMMENT?= The most advanced open-source database available anywhere -CONFLICTS?= ${PORTNAME}-client-[^${PORTVERSION:R:R}].* \ - ${PORTNAME}${PKGNAMESUFFIX}-[^${PORTVERSION:R:R}].* \ - ${PORTNAME}-client-9.[^${PORTVERSION:R:E}].* \ - ${PORTNAME}${PKGNAMESUFFIX}-9.[^${PORTVERSION:R:E}].* - -WRKSRC= ${WRKDIR}/postgresql-${DISTVERSION} -DIST_SUBDIR= postgresql - -ICU_PATCHFILE?= pg-910-icu-2012-12-19.diff.gz - -.if !defined(SLAVE_ONLY) -UNIQUENAME?= ${PORTNAME}${DISTVERSION:R:S/.//} -LATEST_LINK?= ${PKGNAMEPREFIX}${UNIQUENAME}${PKGNAMESUFFIX} -.else # Contrib has different options from -client/-server -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 -.if defined(NO_BUILD) -.undef USE_GMAKE -.undef GNU_CONFIGURE -.endif - -PG_USER= pgsql -PG_GROUP= pgsql -PG_UID= 70 - -LDFLAGS+= -L${LOCALBASE}/lib -INCLUDES+= -I${LOCALBASE}/include -CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \ - --with-includes=${PREFIX}/include \ - --enable-thread-safety -CONFIGURE_ENV+= INCLUDES="${INCLUDES}" \ - PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" \ - LDFLAGS_SL="${LDFLAGS_SL}" - -PLIST= ${PKGDIR}/pkg-plist${PKGNAMESUFFIX} - -INSTALL_DIRS?= src/timezone src/backend \ - src/backend/utils/mb/conversion_procs \ +BUILD_DIRS?= src/timezone src/backend src/backend/utils/mb/conversion_procs \ src/backend/snowball src/backend/replication/libpqwalreceiver \ src/bin/initdb src/bin/pg_ctl \ - src/bin/pg_controldata src/bin/pg_resetxlog src/pl \ - src/bin/pg_basebackup -BUILD_DIRS?= src/port ${INSTALL_DIRS} - -.if !defined(CLIENT_ONLY) && !defined(SLAVE_ONLY) -SERVER_ONLY= yes -USE_RC_SUBR= postgresql -USE_PGSQL= yes -WANT_PGSQL_VER= ${DISTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g} -USERS= ${PG_USER} -GROUPS= ${PG_GROUP} -SUB_FILES+= 502.pgsql -.endif - -.if !defined(CLIENT_ONLY) -MAKE_ENV= PATH=${PREFIX}/bin:${PATH} -CONFIGURE_ENV+= PATH=${PREFIX}/bin:${PATH} -.endif - -.if !defined(SLAVE_ONLY) -OPTIONS_DEFINE+= NLS DTRACE PAM LDAP GSSAPI OPTIMIZED_CFLAGS XML TZDATA DEBUG KRB5 -OPTIONS_SINGLE= KRB5 -OPTIONS_SINGLE_KRB5= MIT_KRB5 HEIMDAL_KRB5 - -KRB5_DESC= Build with kerberos provider support -NLS_DESC= Use internationalized messages -DTRACE_DESC= Build with DTrace probes (server only) -PAM_DESC= Build with PAM Support -LDAP_DESC= Build with LDAP authentication support (server only) -MIT_KRB5_DESC= Build with MIT kerberos support -HEIMDAL_KRB5_DESC= Builds with Heimdal kerberos -GSSAPI_DESC= Build with GSSAPI support -OPTIMIZED_CFLAGS_DESC= Builds with compiler optimizations (-O3) -XML_DESC= Build with XML data type (server) -TZDATA_DESC= Use internal timezone database (server) -DEBUG_DESC= Builds with debugging symbols - -# See http://people.freebsd.org/~girgen/postgresql-icu/README.html for more info -OPTIONS_DEFINE+= ICU -ICU_DESC= Use ICU for unicode collation (server) - -# See http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/76999 for more info -# (requires dump/restore if modified.) -OPTIONS_DEFINE+= INTDATE -INTDATE_DESC= Builds with 64-bit date/time type (server) - -OPTIONS_DEFINE+= SSL -SSL_DESC= Build with OpenSSL support - -OPTIONS_DEFAULT= NLS XML TZDATA INTDATE SSL -.endif # !SLAVE_ONLY - -.include - -.if ${PORT_OPTIONS:MSSL} -USE_OPENSSL= yes -CONFIGURE_ARGS+=--with-openssl -.endif - -.if !defined(SLAVE_ONLY) -. if ( defined(SERVER_ONLY) && ${PORT_OPTIONS:MICU} ) || make(makesum) -USE_AUTOTOOLS= autoconf -CONFIGURE_ARGS+=--with-icu -PATCH_SITES+= http://people.freebsd.org/~girgen/postgresql-icu/:icu -PATCHFILES+= ${ICU_PATCHFILE}:icu -. if defined(ICU_EXTRAPATCH) -EXTRA_PATCHES+= ${ICU_EXTRAPATCH} -. endif -LIB_DEPENDS+= icudata.50:${PORTSDIR}/devel/icu -. endif -.endif # !SLAVE_ONLY - -.if ${PORT_OPTIONS:MOSSP_UUID} -BUILD_DEPENDS+= ${LOCALBASE}/lib/libuuid.a:${PORTSDIR}/misc/ossp-uuid -CONFIGURE_ARGS+=--with-ossp-uuid -PLIST_SUB+= OSSP="" -.else -PLIST_SUB+= OSSP="@comment " -.endif - -.if !defined(SLAVE_ONLY) - -PATCH_DIST_STRIP=-p1 - -. if ${PORT_OPTIONS:MDTRACE} -CONFIGURE_ARGS+=--enable-dtrace -LDFLAGS+=-lelf -. if ${OSVERSION} < 900021 -IGNORE= need userland DTrace support found in FreeBSD 9.0 -. endif -. endif - -. if ${PORT_OPTIONS:MPAM} -CONFIGURE_ARGS+=--with-pam -. endif - -. if ${PORT_OPTIONS:MLDAP} -. if defined (SERVER_ONLY) -CONFIGURE_ARGS+=--with-ldap -USE_OPENLDAP= yes -. endif -. endif - -. if ${PORT_OPTIONS:MXML} -CONFIGURE_ARGS+=--with-libxml -LIB_DEPENDS+= xml2.5:${PORTSDIR}/textproc/libxml2 -. endif - -. if ${PORT_OPTIONS:MTZDATA} -PLIST_SUB+= TZDATA="" -. else -CONFIGURE_ARGS+=--with-system-tzdata=/usr/share/zoneinfo -PLIST_SUB+= TZDATA="@comment " -. endif - -. if empty(PORT_OPTIONS:MINTDATE) -CONFIGURE_ARGS+=--disable-integer-datetimes -. endif - -. if ${PORT_OPTIONS:MNLS} -CONFIGURE_ARGS+=--enable-nls -PLIST_SUB+= GETTEXT="" -USES= gettext -. else -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= GETTEXT="@comment " -. endif - -. if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} -CFLAGS+= -O3 -funroll-loops -. endif - -. if ${PORT_OPTIONS:MDEBUG} -CONFIGURE_ARGS+=--enable-debug -INSTALL_TARGET= install -. else -INSTALL_TARGET= install-strip -. endif - -.if ${PORT_OPTIONS:MGSSAPI} -CONFIGURE_ARGS+=--with-gssapi -.if empty(PORT_OPTIONS:MMIT_KRB5) && empty(PORT_OPTIONS:MHEIMDAL_KRB5) -# Kerberos libraries will pull the proper GSSAPI library -# via linker dependencies, but otherwise we must specify -# it explicitely: ld --as-needed is used for compilation, -# so configure's -lgssapi_krb5 won't go. -LDFLAGS+= -lgssapi -LDFLAGS_SL+= -lgssapi -.endif -.else -CONFIGURE_ARGS+=--without-gssapi -.endif - -. if ${PORT_OPTIONS:MMIT_KRB5} -. if defined(IGNORE_WITH_SRC_KRB5) && (exists(/usr/lib/libkrb5.so) || exists(/usr/bin/krb5-config)) -IGNORE= requires that you remove heimdal's /usr/bin/krb5-config and /usr/lib/libkrb5.so*, and set NO_KERBEROS=true in /etc/src.conf to build successfully with MIT-KRB -. else -CONFIGURE_ARGS+=--with-krb5 -# Allow defining a home built MIT Kerberos by setting KRB5_HOME -. if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.a) && exists(${KRB5_HOME}/bin/krb5-config) -LIB_DEPENDS+= krb5.3:${PORTSDIR}/security/krb5 -. endif -. endif -. endif - -. if ${PORT_OPTIONS:MHEIMDAL_KRB5} -CONFIGURE_ARGS+=--with-krb5 -. endif - -.endif # !SLAVE_ONLY + src/bin/pg_controldata src/bin/pg_resetxlog src/pl +INSTALL_DIRS?= ${BUILD_DIRS} .if defined(CLIENT_ONLY) -MAN1?= pg_basebackup.1 -MAN1+= clusterdb.1 createdb.1 createlang.1 createuser.1 \ - dropdb.1 droplang.1 dropuser.1 ecpg.1 initdb.1 \ - oid2name.1 pg_archivecleanup.1 \ - pg_config.1 pg_controldata.1 pg_ctl.1 \ - pg_dump.1 pg_dumpall.1 pg_receivexlog.1 pg_resetxlog.1 pg_restore.1 \ - pg_standby.1 pg_test_fsync.1 pg_test_timing.1 pg_upgrade.1 \ - pgbench.1 \ - postgres.1 postmaster.1 psql.1 reindexdb.1 vacuumdb.1 vacuumlo.1 - -MAN3+= SPI_connect.3 SPI_copytuple.3 SPI_cursor_close.3 SPI_cursor_fetch.3 \ - SPI_cursor_find.3 SPI_cursor_move.3 SPI_cursor_open.3 \ - SPI_cursor_open_with_args.3 SPI_cursor_open_with_paramlist.3 \ - SPI_exec.3 SPI_execp.3 SPI_execute.3 SPI_execute_plan.3 \ - SPI_execute_plan_with_paramlist.3 SPI_execute_with_args.3 \ - SPI_finish.3 SPI_fname.3 SPI_fnumber.3 SPI_freeplan.3 \ - SPI_freetuple.3 SPI_freetuptable.3 SPI_getargcount.3 \ - SPI_getargtypeid.3 SPI_getbinval.3 SPI_getnspname.3 \ - SPI_getrelname.3 SPI_gettype.3 SPI_gettypeid.3 \ - SPI_getvalue.3 SPI_is_cursor_plan.3 SPI_keepplan.3 SPI_modifytuple.3 \ - SPI_palloc.3 SPI_pfree.3 SPI_pop.3 SPI_prepare.3 \ - SPI_prepare_cursor.3 SPI_prepare_params.3 SPI_push.3 \ - SPI_repalloc.3 SPI_returntuple.3 SPI_saveplan.3 \ - SPI_scroll_cursor_fetch.3 SPI_scroll_cursor_move.3 \ - dblink.3 dblink_build_sql_delete.3 dblink_build_sql_insert.3 \ - dblink_build_sql_update.3 dblink_cancel_query.3 \ - dblink_close.3 dblink_connect.3 dblink_connect_u.3 \ - dblink_disconnect.3 dblink_error_message.3 dblink_exec.3 \ - dblink_fetch.3 dblink_get_connections.3 dblink_get_notify.3 \ - dblink_get_pkey.3 dblink_get_result.3 dblink_is_busy.3 \ - dblink_open.3 dblink_send_query.3 - -MAN7?= ALTER_COLLATION.7 ALTER_EXTENSION.7 ALTER_FOREIGN_TABLE.7 \ - CREATE_COLLATION.7 CREATE_EXTENSION.7 CREATE_FOREIGN_TABLE.7 \ - DROP_COLLATION.7 DROP_EXTENSION.7 DROP_FOREIGN_TABLE.7 \ - SECURITY_LABEL.7 -MAN7+= ABORT.7 ALTER_AGGREGATE.7 ALTER_CONVERSION.7 \ - ALTER_DATABASE.7 ALTER_DEFAULT_PRIVILEGES.7 \ - ALTER_DOMAIN.7 ALTER_FOREIGN_DATA_WRAPPER.7 ALTER_FUNCTION.7 \ - ALTER_GROUP.7 ALTER_LARGE_OBJECT.7 ALTER_SERVER.7 \ - ALTER_USER_MAPPING.7 ALTER_INDEX.7 ALTER_LANGUAGE.7 \ - ALTER_OPERATOR_CLASS.7 ALTER_OPERATOR_FAMILY.7 \ - ALTER_ROLE.7 \ - ALTER_SCHEMA.7 ALTER_SEQUENCE.7 ALTER_TABLE.7 \ - ALTER_TEXT_SEARCH_CONFIGURATION.7 \ - ALTER_TEXT_SEARCH_DICTIONARY.7 \ - ALTER_TEXT_SEARCH_PARSER.7 \ - ALTER_TEXT_SEARCH_TEMPLATE.7 \ - ALTER_TRIGGER.7 ALTER_USER.7 ALTER_VIEW.7 ANALYZE.7 BEGIN.7 \ - CHECKPOINT.7 CLOSE.7 CLUSTER.7 COMMENT.7 COMMIT.7 \ - COMMIT_PREPARED.7 \ - COPY.7 CREATE_AGGREGATE.7 CREATE_CAST.7 \ - CREATE_CONVERSION.7 \ - CREATE_DATABASE.7 CREATE_DOMAIN.7 \ - CREATE_FOREIGN_DATA_WRAPPER.7 CREATE_FUNCTION.7 \ - CREATE_GROUP.7 CREATE_INDEX.7 CREATE_LANGUAGE.7 \ - CREATE_OPERATOR.7 CREATE_OPERATOR_CLASS.7 \ - CREATE_OPERATOR_FAMILY.7 CREATE_ROLE.7 \ - CREATE_RULE.7 CREATE_SCHEMA.7 CREATE_SEQUENCE.7 \ - CREATE_SERVER.7 CREATE_TABLE.7 CREATE_TABLE_AS.7 \ - CREATE_TEXT_SEARCH_CONFIGURATION.7 \ - CREATE_TEXT_SEARCH_DICTIONARY.7 \ - CREATE_TEXT_SEARCH_PARSER.7 \ - CREATE_TEXT_SEARCH_TEMPLATE.7 CREATE_TRIGGER.7 \ - CREATE_TYPE.7 CREATE_USER.7 CREATE_USER_MAPPING.7 \ - CREATE_VIEW.7 DEALLOCATE.7 DECLARE.7 DELETE.7 DISCARD.7 \ - DO.7 DROP_AGGREGATE.7 DROP_CAST.7 DROP_CONVERSION.7 \ - DROP_DATABASE.7 DROP_DOMAIN.7 DROP_FOREIGN_DATA_WRAPPER.7 \ - DROP_FUNCTION.7 DROP_GROUP.7 DROP_INDEX.7 DROP_LANGUAGE.7 \ - DROP_OPERATOR.7 DROP_OPERATOR_CLASS.7 DROP_OPERATOR_FAMILY.7 \ - DROP_OWNED.7 DROP_ROLE.7 DROP_RULE.7 \ - DROP_SCHEMA.7 DROP_SEQUENCE.7 DROP_SERVER.7 DROP_TABLE.7 \ - DROP_TEXT_SEARCH_CONFIGURATION.7 \ - DROP_TEXT_SEARCH_DICTIONARY.7 \ - DROP_TEXT_SEARCH_PARSER.7 \ - DROP_TEXT_SEARCH_TEMPLATE.7 DROP_TRIGGER.7 \ - DROP_TYPE.7 DROP_USER.7 DROP_USER_MAPPING.7 DROP_VIEW.7 END.7 \ - EXECUTE.7 EXPLAIN.7 FETCH.7 GRANT.7 INSERT.7 LISTEN.7 LOAD.7 \ - LOCK.7 MOVE.7 NOTIFY.7 PREPARE.7 PREPARE_TRANSACTION.7 \ - REASSIGN_OWNED.7 REINDEX.7 RESET.7 \ - REVOKE.7 ROLLBACK.7 ROLLBACK_PREPARED.7 SELECT.7 \ - SELECT_INTO.7 SET.7 \ - SET_CONSTRAINTS.7 SET_ROLE.7 SET_TRANSACTION.7 SHOW.7 \ - SET_SESSION_AUTHORIZATION.7 START_TRANSACTION.7 \ - TABLE.7 TRUNCATE.7 UNLISTEN.7 UPDATE.7 VACUUM.7 \ - ALTER_OPERATOR.7 ALTER_TABLESPACE.7 ALTER_TYPE.7 \ - CREATE_TABLESPACE.7 DROP_TABLESPACE.7 \ - RELEASE_SAVEPOINT.7 ROLLBACK_TO_SAVEPOINT.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} - -# For testing files in FILESDIR -.include - -.if defined(SERVER_ONLY) -pre-build: - @${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL -.endif - -.if !defined(NO_BUILD) && !target(do-build) - -do-build: - @ cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${GMAKE} symlinks - @ for dir in ${BUILD_DIRS}; do \ - cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE}; \ - done - -. if exists(${FILESDIR}/pkg-message${PKGNAMESUFFIX}.in) -SUB_FILES+= pkg-message${PKGNAMESUFFIX} -PKGMESSAGE= ${WRKSRC}/pkg-message${PKGNAMESUFFIX} -. endif -. if exists(${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in) -SUB_FILES+= pkg-install${PKGNAMESUFFIX} -PLIST_SUB+= PG_USER=${PG_USER} -. endif +MAN1= pg_basebackup.1 pg_isready.1 pg_xlogdump.1 -post-patch: -. if defined(SERVER_ONLY) && ${PORT_OPTIONS:MICU} - @${REINPLACE_CMD} -E -e \ - "s|^(m4_if.*)2.6[0-9](.*Autoconf version )2.6[0-9]|\1${AUTOCONF_VERSION}\2${AUTOCONF_VERSION}|g" \ - ${WRKSRC}/configure.in -. endif +MAN3= # no MAN3 for 9.0 only -do-install: - @for dir in ${INSTALL_DIRS}; do \ - cd ${WRKSRC}/$${dir} && \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${INSTALL_TARGET}; \ - done -. if defined(SERVER_ONLY) - @ ${MKDIR} ${PREFIX}/share/postgresql ;\ - ${MKDIR} ${PREFIX}/etc/periodic/daily ;\ - ${INSTALL_SCRIPT} ${WRKDIR}/502.pgsql \ - ${PREFIX}/etc/periodic/daily - ${MKDIR} ${PREFIX}/${PG_USER} && ${CHOWN} ${PG_USER}:${PG_GROUP} ${PREFIX}/${PG_USER} -. endif # SERVER_ONLY -. if defined(CLIENT_ONLY) - @ cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${GMAKE} install-local -. endif - @ if [ -r ${PKGMESSAGE} ]; then \ - ${MKDIR} ${DOCSDIR} ;\ - ${INSTALL_DATA} ${PKGMESSAGE} ${DOCSDIR}/README${PKGNAMESUFFIX} ;\ - ${CAT} ${PKGMESSAGE} ;\ - fi -.endif # !NO_BUILD +MAN7= ALTER_COLLATION.7 ALTER_EVENT_TRIGGER.7 ALTER_EXTENSION.7 \ + ALTER_FOREIGN_TABLE.7 ALTER_MATERIALIZED_VIEW.7 ALTER_RULE.7 \ + CREATE_COLLATION.7 CREATE_EVENT_TRIGGER.7 CREATE_EXTENSION.7 \ + CREATE_FOREIGN_TABLE.7 CREATE_MATERIALIZED_VIEW.7 DROP_COLLATION.7 \ + DROP_EVENT_TRIGGER.7 DROP_EXTENSION.7 DROP_FOREIGN_TABLE.7 \ + DROP_MATERIALIZED_VIEW.7 REFRESH_MATERIALIZED_VIEW.7 SECURITY_LABEL.7 -.if defined(SERVER_ONLY) -check: - @if [ `id -u` != 0 ] ; then \ - ${ECHO} "Running postgresql regressions tests" ;\ - cd ${WRKSRC}; ${GMAKE} check ;\ - else \ - ${ECHO} "You cannot run regression tests when postgresql is built as user root." ; \ - ${ECHO} "Clean and rebuild the port as a regular user to run the tests." ;\ - fi .endif -.include +.include "${.CURDIR}/../postgresql92-server/Makefile" Modified: head/databases/postgresql93-server/distinfo ============================================================================== --- head/databases/postgresql93-server/distinfo Sat May 11 23:46:30 2013 (r317924) +++ head/databases/postgresql93-server/distinfo Sun May 12 00:00:56 2013 (r317925) @@ -1,4 +1,4 @@ -SHA256 (postgresql/postgresql-9.2.4.tar.bz2) = d97dd918a88a4449225998f46aafa85216a3f89163a3411830d6890507ffae93 -SIZE (postgresql/postgresql-9.2.4.tar.bz2) = 16395184 +SHA256 (postgresql/postgresql-9.3beta1.tar.bz2) = 1e11099fe4a6cd3327c9c2bf4a9b903383195de330da27d322fc872d1d694df1 +SIZE (postgresql/postgresql-9.3beta1.tar.bz2) = 16954081 SHA256 (postgresql/pg-910-icu-2012-12-19.diff.gz) = 61ef9c9b55b63b63b0fb108dfef086f92e9c43b5bd934fab9639b31f91193611 SIZE (postgresql/pg-910-icu-2012-12-19.diff.gz) = 4386 Modified: head/databases/postgresql93-server/files/patch-plpython-Makefile ============================================================================== --- head/databases/postgresql93-server/files/patch-plpython-Makefile Sat May 11 23:46:30 2013 (r317924) +++ head/databases/postgresql93-server/files/patch-plpython-Makefile Sun May 12 00:00:56 2013 (r317925) @@ -1,11 +1,11 @@ ---- src/pl/plpython/Makefile.orig Fri Nov 19 20:23:01 2004 -+++ src/pl/plpython/Makefile Tue Dec 28 23:32:16 2004 -@@ -9,7 +9,7 @@ - # shared library. Since there is no official way to determine this - # (at least not in pre-2.3 Python), we see if there is a file that is - # named like a shared library. +--- src/pl/plpython/Makefile.orig 2013-05-06 22:57:06.000000000 +0200 ++++ src/pl/plpython/Makefile 2013-05-10 19:50:09.000000000 +0200 +@@ -15,7 +15,7 @@ + ifeq (1,$(python_enable_shared)) + shared_libpython = yes + else -ifneq (,$(wildcard $(python_libdir)/libpython*$(DLSUFFIX)*)) +ifneq (,$(wildcard $(python_libdir)/../../libpython*$(DLSUFFIX)*)) shared_libpython = yes endif - + endif Modified: head/databases/postgresql93-server/pkg-plist-client ============================================================================== --- head/databases/postgresql93-server/pkg-plist-client Sat May 11 23:46:30 2013 (r317924) +++ head/databases/postgresql93-server/pkg-plist-client Sun May 12 00:00:56 2013 (r317925) @@ -9,12 +9,14 @@ bin/ecpg bin/pg_config bin/pg_dump bin/pg_dumpall +bin/pg_isready bin/pg_restore bin/psql bin/reindexdb bin/vacuumdb include/ecpg_config.h include/libpq-events.h +include/pg_config_ext.h include/postgresql/server/access/attnum.h include/postgresql/server/access/clog.h include/postgresql/server/access/genam.h @@ -25,8 +27,10 @@ include/postgresql/server/access/gist_pr include/postgresql/server/access/gistscan.h include/postgresql/server/access/hash.h include/postgresql/server/access/heapam.h +include/postgresql/server/access/heapam_xlog.h include/postgresql/server/access/hio.h include/postgresql/server/access/htup.h +include/postgresql/server/access/htup_details.h include/postgresql/server/access/itup.h include/postgresql/server/access/multixact.h include/postgresql/server/access/nbtree.h @@ -35,6 +39,7 @@ include/postgresql/server/access/relopti include/postgresql/server/access/relscan.h include/postgresql/server/access/rewriteheap.h include/postgresql/server/access/rmgr.h +include/postgresql/server/access/rmgrlist.h include/postgresql/server/access/sdir.h include/postgresql/server/access/skey.h include/postgresql/server/access/slru.h @@ -42,6 +47,7 @@ include/postgresql/server/access/spgist. include/postgresql/server/access/spgist_private.h include/postgresql/server/access/subtrans.h include/postgresql/server/access/sysattr.h +include/postgresql/server/access/timeline.h include/postgresql/server/access/transam.h include/postgresql/server/access/tupconvert.h include/postgresql/server/access/tupdesc.h @@ -53,8 +59,10 @@ include/postgresql/server/access/valid.h include/postgresql/server/access/visibilitymap.h include/postgresql/server/access/xact.h include/postgresql/server/access/xlog.h +include/postgresql/server/access/xlog_fn.h include/postgresql/server/access/xlog_internal.h include/postgresql/server/access/xlogdefs.h +include/postgresql/server/access/xlogreader.h include/postgresql/server/access/xlogutils.h include/postgresql/server/bootstrap/bootstrap.h include/postgresql/server/c.h @@ -90,6 +98,7 @@ include/postgresql/server/catalog/pg_def include/postgresql/server/catalog/pg_depend.h include/postgresql/server/catalog/pg_description.h include/postgresql/server/catalog/pg_enum.h +include/postgresql/server/catalog/pg_event_trigger.h include/postgresql/server/catalog/pg_extension.h include/postgresql/server/catalog/pg_foreign_data_wrapper.h include/postgresql/server/catalog/pg_foreign_server.h @@ -125,6 +134,7 @@ include/postgresql/server/catalog/pg_typ include/postgresql/server/catalog/pg_type_fn.h include/postgresql/server/catalog/pg_user_mapping.h include/postgresql/server/catalog/storage.h +include/postgresql/server/catalog/storage_xlog.h include/postgresql/server/catalog/toasting.h include/postgresql/server/commands/alter.h include/postgresql/server/commands/async.h @@ -137,9 +147,11 @@ include/postgresql/server/commands/creat include/postgresql/server/commands/dbcommands.h include/postgresql/server/commands/defrem.h include/postgresql/server/commands/discard.h +include/postgresql/server/commands/event_trigger.h include/postgresql/server/commands/explain.h include/postgresql/server/commands/extension.h include/postgresql/server/commands/lockcmds.h +include/postgresql/server/commands/matview.h include/postgresql/server/commands/portalcmds.h include/postgresql/server/commands/prepare.h include/postgresql/server/commands/proclang.h @@ -154,6 +166,8 @@ include/postgresql/server/commands/user. include/postgresql/server/commands/vacuum.h include/postgresql/server/commands/variable.h include/postgresql/server/commands/view.h +include/postgresql/server/common/fe_memutils.h +include/postgresql/server/common/relpath.h include/postgresql/server/datatype/timestamp.h include/postgresql/server/dynloader.h include/postgresql/server/executor/execdebug.h @@ -205,7 +219,8 @@ include/postgresql/server/foreign/foreig include/postgresql/server/funcapi.h include/postgresql/server/getaddrinfo.h include/postgresql/server/getopt_long.h -include/postgresql/server/lib/dllist.h +include/postgresql/server/lib/binaryheap.h +include/postgresql/server/lib/ilist.h include/postgresql/server/lib/stringinfo.h include/postgresql/server/libpq/auth.h include/postgresql/server/libpq/be-fsstubs.h @@ -286,10 +301,12 @@ include/postgresql/server/parser/parsetr include/postgresql/server/parser/scanner.h include/postgresql/server/parser/scansup.h include/postgresql/server/pg_config.h +include/postgresql/server/pg_config_ext.h include/postgresql/server/pg_config_manual.h include/postgresql/server/pg_config_os.h include/postgresql/server/pg_trace.h include/postgresql/server/pgstat.h +include/postgresql/server/pgtar.h include/postgresql/server/pgtime.h include/postgresql/server/port.h include/postgresql/server/port/aix.h @@ -325,6 +342,7 @@ include/postgresql/server/postgres.h include/postgresql/server/postgres_ext.h include/postgresql/server/postgres_fe.h include/postgresql/server/postmaster/autovacuum.h +include/postgresql/server/postmaster/bgworker.h include/postgresql/server/postmaster/bgwriter.h include/postgresql/server/postmaster/fork_process.h include/postgresql/server/postmaster/pgarch.h @@ -335,10 +353,10 @@ include/postgresql/server/postmaster/wal include/postgresql/server/regex/regcustom.h include/postgresql/server/regex/regerrs.h include/postgresql/server/regex/regex.h +include/postgresql/server/regex/regexport.h include/postgresql/server/regex/regguts.h include/postgresql/server/replication/basebackup.h include/postgresql/server/replication/syncrep.h -include/postgresql/server/replication/walprotocol.h include/postgresql/server/replication/walreceiver.h include/postgresql/server/replication/walsender.h include/postgresql/server/replication/walsender_private.h @@ -391,6 +409,7 @@ include/postgresql/server/storage/buf_in include/postgresql/server/storage/buffile.h include/postgresql/server/storage/bufmgr.h include/postgresql/server/storage/bufpage.h +include/postgresql/server/storage/checksum.h include/postgresql/server/storage/copydir.h include/postgresql/server/storage/fd.h include/postgresql/server/storage/freespace.h @@ -453,6 +472,7 @@ include/postgresql/server/utils/dynahash include/postgresql/server/utils/dynamic_loader.h include/postgresql/server/utils/elog.h include/postgresql/server/utils/errcodes.h +include/postgresql/server/utils/evtcache.h include/postgresql/server/utils/fmgroids.h include/postgresql/server/utils/fmgrtab.h include/postgresql/server/utils/formatting.h @@ -465,6 +485,7 @@ include/postgresql/server/utils/inet.h include/postgresql/server/utils/int8.h include/postgresql/server/utils/inval.h include/postgresql/server/utils/json.h +include/postgresql/server/utils/jsonapi.h include/postgresql/server/utils/logtape.h include/postgresql/server/utils/lsyscache.h include/postgresql/server/utils/memutils.h @@ -487,12 +508,14 @@ include/postgresql/server/utils/relcache include/postgresql/server/utils/relmapper.h include/postgresql/server/utils/reltrigger.h include/postgresql/server/utils/resowner.h +include/postgresql/server/utils/resowner_private.h include/postgresql/server/utils/selfuncs.h include/postgresql/server/utils/snapmgr.h include/postgresql/server/utils/snapshot.h include/postgresql/server/utils/sortsupport.h include/postgresql/server/utils/spccache.h include/postgresql/server/utils/syscache.h +include/postgresql/server/utils/timeout.h include/postgresql/server/utils/timestamp.h include/postgresql/server/utils/tqual.h include/postgresql/server/utils/tuplesort.h @@ -534,6 +557,7 @@ include/sqlda.h @dirrm include/postgresql/server/foreign @dirrm include/postgresql/server/executor @dirrm include/postgresql/server/datatype +@dirrm include/postgresql/server/common @dirrm include/postgresql/server/commands @dirrm include/postgresql/server/catalog @dirrm include/postgresql/server/bootstrap @@ -577,6 +601,7 @@ lib/libecpg.so.6 lib/libecpg_compat.a lib/libecpg_compat.so lib/libecpg_compat.so.3 +@comment lib/libpgcommon.a lib/libpgport.a lib/libpgtypes.a lib/libpgtypes.so @@ -584,6 +609,10 @@ lib/libpgtypes.so.3 lib/libpq.a lib/libpq.so lib/libpq.so.5 +lib/pkgconfig/libecpg.pc +lib/pkgconfig/libecpg_compat.pc +lib/pkgconfig/libpgtypes.pc +lib/pkgconfig/libpq.pc lib/postgresql/pgxs/config/install-sh lib/postgresql/pgxs/src/makefiles/pgxs.mk lib/postgresql/pgxs/src/Makefile.global @@ -600,92 +629,102 @@ lib/postgresql/pgxs/src/nls-global.mk share/postgresql/pg_service.conf.sample share/postgresql/psqlrc.sample @dirrmtry share/postgresql -%%GETTEXT%%share/locale/cs/LC_MESSAGES/ecpg-9.2.mo -%%GETTEXT%%share/locale/cs/LC_MESSAGES/ecpglib6-9.2.mo -%%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq5-9.2.mo -%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_config-9.2.mo -%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_dump-9.2.mo -%%GETTEXT%%share/locale/cs/LC_MESSAGES/pgscripts-9.2.mo -%%GETTEXT%%share/locale/cs/LC_MESSAGES/psql-9.2.mo -%%GETTEXT%%share/locale/de/LC_MESSAGES/ecpg-9.2.mo -%%GETTEXT%%share/locale/de/LC_MESSAGES/ecpglib6-9.2.mo -%%GETTEXT%%share/locale/de/LC_MESSAGES/libpq5-9.2.mo -%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_config-9.2.mo -%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_dump-9.2.mo -%%GETTEXT%%share/locale/de/LC_MESSAGES/pgscripts-9.2.mo -%%GETTEXT%%share/locale/de/LC_MESSAGES/psql-9.2.mo -%%GETTEXT%%share/locale/es/LC_MESSAGES/ecpg-9.2.mo -%%GETTEXT%%share/locale/es/LC_MESSAGES/ecpglib6-9.2.mo -%%GETTEXT%%share/locale/es/LC_MESSAGES/libpq5-9.2.mo -%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_config-9.2.mo -%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_dump-9.2.mo -%%GETTEXT%%share/locale/es/LC_MESSAGES/pgscripts-9.2.mo -%%GETTEXT%%share/locale/es/LC_MESSAGES/psql-9.2.mo -%%GETTEXT%%share/locale/fr/LC_MESSAGES/ecpg-9.2.mo -%%GETTEXT%%share/locale/fr/LC_MESSAGES/ecpglib6-9.2.mo -%%GETTEXT%%share/locale/fr/LC_MESSAGES/libpq5-9.2.mo -%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_config-9.2.mo -%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_dump-9.2.mo -%%GETTEXT%%share/locale/fr/LC_MESSAGES/pgscripts-9.2.mo -%%GETTEXT%%share/locale/fr/LC_MESSAGES/psql-9.2.mo -%%GETTEXT%%share/locale/it/LC_MESSAGES/ecpg-9.2.mo -%%GETTEXT%%share/locale/it/LC_MESSAGES/ecpglib6-9.2.mo -%%GETTEXT%%share/locale/it/LC_MESSAGES/libpq5-9.2.mo -%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_config-9.2.mo -%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_dump-9.2.mo -%%GETTEXT%%share/locale/it/LC_MESSAGES/pgscripts-9.2.mo -%%GETTEXT%%share/locale/it/LC_MESSAGES/psql-9.2.mo -%%GETTEXT%%share/locale/ja/LC_MESSAGES/ecpg-9.2.mo -%%GETTEXT%%share/locale/ja/LC_MESSAGES/ecpglib6-9.2.mo -%%GETTEXT%%share/locale/ja/LC_MESSAGES/libpq5-9.2.mo -%%GETTEXT%%share/locale/ja/LC_MESSAGES/pg_config-9.2.mo -%%GETTEXT%%share/locale/ja/LC_MESSAGES/pg_dump-9.2.mo -%%GETTEXT%%share/locale/ja/LC_MESSAGES/pgscripts-9.2.mo -%%GETTEXT%%share/locale/ja/LC_MESSAGES/psql-9.2.mo -%%GETTEXT%%share/locale/ko/LC_MESSAGES/ecpg-9.2.mo -%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_config-9.2.mo -%%GETTEXT%%share/locale/ko/LC_MESSAGES/pgscripts-9.2.mo -%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_config-9.2.mo -%%GETTEXT%%share/locale/pl/LC_MESSAGES/ecpg-9.2.mo -%%GETTEXT%%share/locale/pl/LC_MESSAGES/ecpglib6-9.2.mo -%%GETTEXT%%share/locale/pl/LC_MESSAGES/libpq5-9.2.mo -%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_config-9.2.mo -%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_dump-9.2.mo -%%GETTEXT%%share/locale/pl/LC_MESSAGES/pgscripts-9.2.mo -%%GETTEXT%%share/locale/pl/LC_MESSAGES/psql-9.2.mo -%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/ecpg-9.2.mo -%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/ecpglib6-9.2.mo -%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/libpq5-9.2.mo -%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_config-9.2.mo -%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_dump-9.2.mo -%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pgscripts-9.2.mo -%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/psql-9.2.mo -%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_config-9.2.mo -%%GETTEXT%%share/locale/ro/LC_MESSAGES/pgscripts-9.2.mo -%%GETTEXT%%share/locale/ru/LC_MESSAGES/ecpg-9.2.mo -%%GETTEXT%%share/locale/ru/LC_MESSAGES/ecpglib6-9.2.mo -%%GETTEXT%%share/locale/ru/LC_MESSAGES/libpq5-9.2.mo -%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_config-9.2.mo -%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_dump-9.2.mo -%%GETTEXT%%share/locale/ru/LC_MESSAGES/pgscripts-9.2.mo -%%GETTEXT%%share/locale/ru/LC_MESSAGES/psql-9.2.mo -%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_config-9.2.mo -%%GETTEXT%%share/locale/sv/LC_MESSAGES/pgscripts-9.2.mo -%%GETTEXT%%share/locale/ta/LC_MESSAGES/pg_config-9.2.mo -%%GETTEXT%%share/locale/tr/LC_MESSAGES/ecpg-9.2.mo -%%GETTEXT%%share/locale/tr/LC_MESSAGES/ecpglib6-9.2.mo -%%GETTEXT%%share/locale/tr/LC_MESSAGES/libpq5-9.2.mo -%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_config-9.2.mo -%%GETTEXT%%share/locale/tr/LC_MESSAGES/pgscripts-9.2.mo -%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/ecpg-9.2.mo -%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/ecpglib6-9.2.mo -%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/libpq5-9.2.mo -%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_config-9.2.mo -%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_dump-9.2.mo -%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pgscripts-9.2.mo -%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql-9.2.mo -%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/ecpg-9.2.mo -%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq5-9.2.mo -%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_config-9.2.mo -%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pgscripts-9.2.mo -%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql-9.2.mo +%%GETTEXT%%share/locale/cs/LC_MESSAGES/ecpg-9.3.mo +%%GETTEXT%%share/locale/cs/LC_MESSAGES/ecpglib6-9.3.mo +%%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq5-9.3.mo +%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_config-9.3.mo +%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_dump-9.3.mo +%%GETTEXT%%share/locale/cs/LC_MESSAGES/pgscripts-9.3.mo +%%GETTEXT%%share/locale/cs/LC_MESSAGES/psql-9.3.mo +%%GETTEXT%%share/locale/de/LC_MESSAGES/ecpg-9.3.mo +%%GETTEXT%%share/locale/de/LC_MESSAGES/ecpglib6-9.3.mo +%%GETTEXT%%share/locale/de/LC_MESSAGES/libpq5-9.3.mo +%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_config-9.3.mo +%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_dump-9.3.mo +%%GETTEXT%%share/locale/de/LC_MESSAGES/pgscripts-9.3.mo +%%GETTEXT%%share/locale/de/LC_MESSAGES/psql-9.3.mo +%%GETTEXT%%share/locale/es/LC_MESSAGES/ecpg-9.3.mo +%%GETTEXT%%share/locale/es/LC_MESSAGES/ecpglib6-9.3.mo +%%GETTEXT%%share/locale/es/LC_MESSAGES/libpq5-9.3.mo +%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_config-9.3.mo +%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_dump-9.3.mo +%%GETTEXT%%share/locale/es/LC_MESSAGES/pgscripts-9.3.mo +%%GETTEXT%%share/locale/es/LC_MESSAGES/psql-9.3.mo +%%GETTEXT%%share/locale/fr/LC_MESSAGES/ecpg-9.3.mo +%%GETTEXT%%share/locale/fr/LC_MESSAGES/ecpglib6-9.3.mo +%%GETTEXT%%share/locale/fr/LC_MESSAGES/libpq5-9.3.mo +%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_config-9.3.mo +%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_dump-9.3.mo +%%GETTEXT%%share/locale/fr/LC_MESSAGES/pgscripts-9.3.mo +%%GETTEXT%%share/locale/fr/LC_MESSAGES/psql-9.3.mo +%%GETTEXT%%share/locale/it/LC_MESSAGES/ecpg-9.3.mo +%%GETTEXT%%share/locale/it/LC_MESSAGES/ecpglib6-9.3.mo +%%GETTEXT%%share/locale/it/LC_MESSAGES/libpq5-9.3.mo +%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_config-9.3.mo +%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_dump-9.3.mo +%%GETTEXT%%share/locale/it/LC_MESSAGES/pgscripts-9.3.mo +%%GETTEXT%%share/locale/it/LC_MESSAGES/psql-9.3.mo +%%GETTEXT%%share/locale/ja/LC_MESSAGES/ecpg-9.3.mo +%%GETTEXT%%share/locale/ja/LC_MESSAGES/ecpglib6-9.3.mo +%%GETTEXT%%share/locale/ja/LC_MESSAGES/libpq5-9.3.mo +%%GETTEXT%%share/locale/ja/LC_MESSAGES/pg_config-9.3.mo +%%GETTEXT%%share/locale/ja/LC_MESSAGES/pg_dump-9.3.mo +%%GETTEXT%%share/locale/ja/LC_MESSAGES/pgscripts-9.3.mo +%%GETTEXT%%share/locale/ja/LC_MESSAGES/psql-9.3.mo +%%GETTEXT%%share/locale/ko/LC_MESSAGES/ecpg-9.3.mo +%%GETTEXT%%share/locale/ko/LC_MESSAGES/libpq5-9.3.mo +%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_config-9.3.mo +%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_dump-9.3.mo +%%GETTEXT%%share/locale/ko/LC_MESSAGES/pgscripts-9.3.mo +%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_config-9.3.mo +%%GETTEXT%%share/locale/pl/LC_MESSAGES/ecpg-9.3.mo +%%GETTEXT%%share/locale/pl/LC_MESSAGES/ecpglib6-9.3.mo +%%GETTEXT%%share/locale/pl/LC_MESSAGES/libpq5-9.3.mo +%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_config-9.3.mo +%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_dump-9.3.mo +%%GETTEXT%%share/locale/pl/LC_MESSAGES/pgscripts-9.3.mo +%%GETTEXT%%share/locale/pl/LC_MESSAGES/psql-9.3.mo +%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/ecpg-9.3.mo +%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/ecpglib6-9.3.mo +%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/libpq5-9.3.mo +%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_config-9.3.mo +%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_dump-9.3.mo +%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pgscripts-9.3.mo +%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/psql-9.3.mo +%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_config-9.3.mo +%%GETTEXT%%share/locale/ro/LC_MESSAGES/pgscripts-9.3.mo +%%GETTEXT%%share/locale/ru/LC_MESSAGES/ecpg-9.3.mo +%%GETTEXT%%share/locale/ru/LC_MESSAGES/ecpglib6-9.3.mo +%%GETTEXT%%share/locale/ru/LC_MESSAGES/libpq5-9.3.mo +%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_config-9.3.mo +%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_dump-9.3.mo +%%GETTEXT%%share/locale/ru/LC_MESSAGES/pgscripts-9.3.mo +%%GETTEXT%%share/locale/ru/LC_MESSAGES/psql-9.3.mo +%%GETTEXT%%share/locale/sv/LC_MESSAGES/libpq5-9.3.mo +%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_config-9.3.mo +%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_dump-9.3.mo +%%GETTEXT%%share/locale/sv/LC_MESSAGES/pgscripts-9.3.mo +%%GETTEXT%%share/locale/sv/LC_MESSAGES/psql-9.3.mo +%%GETTEXT%%share/locale/ta/LC_MESSAGES/libpq5-9.3.mo +%%GETTEXT%%share/locale/ta/LC_MESSAGES/pg_config-9.3.mo +%%GETTEXT%%share/locale/ta/LC_MESSAGES/pgscripts-9.3.mo +%%GETTEXT%%share/locale/tr/LC_MESSAGES/ecpg-9.3.mo +%%GETTEXT%%share/locale/tr/LC_MESSAGES/ecpglib6-9.3.mo +%%GETTEXT%%share/locale/tr/LC_MESSAGES/libpq5-9.3.mo +%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_config-9.3.mo +%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_dump-9.3.mo +%%GETTEXT%%share/locale/tr/LC_MESSAGES/pgscripts-9.3.mo +%%GETTEXT%%share/locale/tr/LC_MESSAGES/psql-9.3.mo +%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/ecpg-9.3.mo +%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/ecpglib6-9.3.mo +%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/libpq5-9.3.mo +%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_config-9.3.mo +%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_dump-9.3.mo +%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pgscripts-9.3.mo +%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql-9.3.mo +%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/ecpg-9.3.mo +%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq5-9.3.mo +%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_config-9.3.mo +%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump-9.3.mo +%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pgscripts-9.3.mo +%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql-9.3.mo Modified: head/databases/postgresql93-server/pkg-plist-contrib ============================================================================== --- head/databases/postgresql93-server/pkg-plist-contrib Sat May 11 23:46:30 2013 (r317924) +++ head/databases/postgresql93-server/pkg-plist-contrib Sun May 12 00:00:56 2013 (r317925) @@ -3,6 +3,7 @@ bin/pg_archivecleanup bin/pg_standby bin/pg_test_timing bin/pg_upgrade +bin/pg_xlogdump bin/pgbench bin/vacuumlo lib/postgresql/_int.so @@ -36,6 +37,7 @@ lib/postgresql/pgcrypto.so lib/postgresql/pgrowlocks.so lib/postgresql/pgstattuple.so lib/postgresql/pgxml.so +lib/postgresql/postgres_fdw.so lib/postgresql/refint.so lib/postgresql/seg.so lib/postgresql/sslinfo.so @@ -45,6 +47,7 @@ lib/postgresql/test_parser.so lib/postgresql/timetravel.so lib/postgresql/tsearch2.so lib/postgresql/unaccent.so +lib/postgresql/worker_spi.so %%OSSP%%lib/postgresql/uuid-ossp.so %%DOCSDIR%%/README-contrib %%DOCSDIR%%/extension/README @@ -77,7 +80,8 @@ share/postgresql/extension/citext.contro share/postgresql/extension/cube--1.0.sql share/postgresql/extension/cube--unpackaged--1.0.sql share/postgresql/extension/cube.control -share/postgresql/extension/dblink--1.0.sql +share/postgresql/extension/dblink--1.0--1.1.sql +share/postgresql/extension/dblink--1.1.sql share/postgresql/extension/dblink--unpackaged--1.0.sql share/postgresql/extension/dblink.control share/postgresql/extension/dict_int--1.0.sql @@ -119,6 +123,8 @@ share/postgresql/extension/ltree.control share/postgresql/extension/moddatetime--1.0.sql *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-all@FreeBSD.ORG Sun May 12 00:31:01 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 47AA2294; Sun, 12 May 2013 00:31:01 +0000 (UTC) (envelope-from s.montgomerysmith@gmail.com) Received: from mail-ie0-x22a.google.com (mail-ie0-x22a.google.com [IPv6:2607:f8b0:4001:c03::22a]) by mx1.freebsd.org (Postfix) with ESMTP id F1511130; Sun, 12 May 2013 00:31:00 +0000 (UTC) Received: by mail-ie0-f170.google.com with SMTP id aq17so10443509iec.1 for ; Sat, 11 May 2013 17:31:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:message-id:date:from:user-agent:mime-version:to :subject:references:in-reply-to:x-enigmail-version:content-type :content-transfer-encoding; bh=mAHi+Z7rE6z5jGUzMC5mZcmlAAFKpQmMa2ZFXas9kWY=; b=IZQx4GZ3DCsVefQbcmxAXfUcFdSLTmlH2db3UZ1HNfLm0tIwUZHyog+1JidkZnbt0F Gatj2phDnMrJsNh2CESgVq1QWbU59/9i/6p7pL5SYTY0L3CqX7YuRborNO8Ao7sitT2z cHIoXnv9pmOuXp91eydMXYxn3sx+MUq5q2GYVhgemRbDFM9YT6FVMe8Z/ygl+88imBUz qGVag+meE+k1ws56wpUsYoJf1LgtfYLg/lYqv1Iyjw5gOzo+5Nb+ArLik3d3HmS0qclR ENsOEpexRUEicto21B6nMY54wqYVQAhzT2F2Ryomm/ySMXMfFrd88QdfEaUv1peTSFsX M7cw== X-Received: by 10.50.60.41 with SMTP id e9mr6010352igr.94.1368318660696; Sat, 11 May 2013 17:31:00 -0700 (PDT) Received: from [192.168.0.11] (50-82-246-58.client.mchsi.com. [50.82.246.58]) by mx.google.com with ESMTPSA id lr1sm8295503igb.6.2013.05.11.17.30.58 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 11 May 2013 17:30:59 -0700 (PDT) Sender: Stephen Montgomery-Smith Message-ID: <518EE2C1.4020504@missouri.edu> Date: Sat, 11 May 2013 19:30:57 -0500 From: Stephen Montgomery-Smith User-Agent: Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/20130329 Thunderbird/17.0.5 MIME-Version: 1.0 To: Stephen Montgomery-Smith , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r317895 - head/cad/gmsh References: <201305111718.r4BHImXG081664@svn.freebsd.org> <20130511213455.GA60339@graf.pompo.net> In-Reply-To: <20130511213455.GA60339@graf.pompo.net> X-Enigmail-Version: 1.5.1 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 00:31:01 -0000 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 05/11/2013 04:34 PM, Thierry Thomas wrote: > Hello Stephen, > > Le sam 11 mai 13 à 19:18:48 +0200, Stephen Montgomery-Smith > écrivait : > >> Modified: head/cad/gmsh/distinfo >> ============================================================================== >> >> - --- head/cad/gmsh/distinfo Sat May 11 16:57:07 2013 (r317894) >> +++ head/cad/gmsh/distinfo Sat May 11 17:18:48 2013 (r317895) @@ >> -1,4 +1,4 @@ -SHA256 (gmsh/gmsh-2.7.0-source.tgz) = >> 4a6910f9ebbbfcff47a3f9b3b91abb83572b905edfa6d7003954941ea47150c3 >> -SIZE (gmsh/gmsh-2.7.0-source.tgz) = 8138155 +SHA256 >> (gmsh/gmsh-2.7.1-source.tgz) = >> c1fea9ded6889dbb1e7fd1acb0542ce7f0b97f50a71301e66d51c42a87db683e >> +SIZE (gmsh/gmsh-2.7.1-source.tgz) = 8181073 SHA256 >> (gmsh/manual.pdf) = >> 8a682ee7f02380f52d5efdde5f9f9d8e927a4f4eb29287a878c1016225568911 >> SIZE (gmsh/manual.pdf) = 206713 > > Seems it has been rerolled: > > => gmsh-2.7.1-source.tgz doesn't seem to exist in > /usr/ports/distfiles/gmsh. => Attempting to fetch > http://www.geuz.org/gmsh/src/gmsh-2.7.1-source.tgz fetch: > http://www.geuz.org/gmsh/src/gmsh-2.7.1-source.tgz: size mismatch: > expected 8181073, actual 8181328 => Attempting to fetch > http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/gmsh-2.7.1-source.tgz > > fetch: http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/gmsh-2.7.1-source.tgz: Not Found > > Could you please check its diff? I checked the diff, and it looks harmless. I'll check it builds, and then commit. I don't remember if I am supposed to bump portrevision. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBAgAGBQJRjuLBAAoJEC3xK9GaktgHfWYH/2eC5n2cv4bRQ/AA5exC4dUs gO0qpa3JnQGJAh1FosUh+J9PAruc0M5xc1dDuUpEcoE3pZS7oX78564tzQ7iZVTa B+aZ5Mfuh4ffCRohVzgk53mTM/Zp7umyh7Arl8+v6PvAgz+eZ9HQZsO3v56Adr++ ArdonuBdzCL5HX8cOrRd3wTJ3oreR/7DSXJbhIUCo8b0vaveYQvDrBOgzR9kQuj9 DF/pUFEOp1eX+P7NQXXrIY+TO0UsPRVtzyk42cim5ITmgSrBLS8ipO+SB26u8eX/ gk55bWUtwU4wzLQyJ5Ve48cHChfosej9uqM4rSfDdHsgIpea/rfi+DwwV5EPHYE= =9pxO -----END PGP SIGNATURE----- From owner-svn-ports-all@FreeBSD.ORG Sun May 12 01:15:51 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id A6D2C200; Sun, 12 May 2013 01:15:51 +0000 (UTC) (envelope-from stephen@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 9807823D; Sun, 12 May 2013 01:15:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4C1FpIC057870; Sun, 12 May 2013 01:15:51 GMT (envelope-from stephen@svn.freebsd.org) Received: (from stephen@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4C1Fpnw057868; Sun, 12 May 2013 01:15:51 GMT (envelope-from stephen@svn.freebsd.org) Message-Id: <201305120115.r4C1Fpnw057868@svn.freebsd.org> From: Stephen Montgomery-Smith Date: Sun, 12 May 2013 01:15:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317926 - head/cad/gmsh X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 01:15:51 -0000 Author: stephen Date: Sun May 12 01:15:50 2013 New Revision: 317926 URL: http://svnweb.freebsd.org/changeset/ports/317926 Log: - Source tarball was rerolled. Diffing old and new sources indicates changes are not a security risk. - Bumped portrevision because difference in code indicates difference in binaries. Pointed out by: thierry@ Modified: head/cad/gmsh/Makefile head/cad/gmsh/distinfo Modified: head/cad/gmsh/Makefile ============================================================================== --- head/cad/gmsh/Makefile Sun May 12 00:00:56 2013 (r317925) +++ head/cad/gmsh/Makefile Sun May 12 01:15:50 2013 (r317926) @@ -3,6 +3,7 @@ PORTNAME= gmsh PORTVERSION= 2.7.1 +PORTREVISION= 1 CATEGORIES= cad MASTER_SITES= http://www.geuz.org/gmsh/src/ \ http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/ Modified: head/cad/gmsh/distinfo ============================================================================== --- head/cad/gmsh/distinfo Sun May 12 00:00:56 2013 (r317925) +++ head/cad/gmsh/distinfo Sun May 12 01:15:50 2013 (r317926) @@ -1,4 +1,4 @@ -SHA256 (gmsh/gmsh-2.7.1-source.tgz) = c1fea9ded6889dbb1e7fd1acb0542ce7f0b97f50a71301e66d51c42a87db683e -SIZE (gmsh/gmsh-2.7.1-source.tgz) = 8181073 +SHA256 (gmsh/gmsh-2.7.1-source.tgz) = 5f853487d6988d389e59294765519458256634bdfe99ca3c1055118a58305e31 +SIZE (gmsh/gmsh-2.7.1-source.tgz) = 8181328 SHA256 (gmsh/manual.pdf) = 8a682ee7f02380f52d5efdde5f9f9d8e927a4f4eb29287a878c1016225568911 SIZE (gmsh/manual.pdf) = 206713 From owner-svn-ports-all@FreeBSD.ORG Sun May 12 01:51:11 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 240BFC01; Sun, 12 May 2013 01:51:11 +0000 (UTC) (envelope-from wxs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 1583B35B; Sun, 12 May 2013 01:51:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4C1pAhv070842; Sun, 12 May 2013 01:51:10 GMT (envelope-from wxs@svn.freebsd.org) Received: (from wxs@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4C1pApH070840; Sun, 12 May 2013 01:51:10 GMT (envelope-from wxs@svn.freebsd.org) Message-Id: <201305120151.r4C1pApH070840@svn.freebsd.org> From: Wesley Shields Date: Sun, 12 May 2013 01:51:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317927 - head/sysutils/bsdconfig X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 01:51:11 -0000 Author: wxs Date: Sun May 12 01:51:10 2013 New Revision: 317927 URL: http://svnweb.freebsd.org/changeset/ports/317927 Log: Update to 0.8.3. Submitted by: dteske (maintainer) Modified: head/sysutils/bsdconfig/Makefile head/sysutils/bsdconfig/distinfo Modified: head/sysutils/bsdconfig/Makefile ============================================================================== --- head/sysutils/bsdconfig/Makefile Sun May 12 01:15:50 2013 (r317926) +++ head/sysutils/bsdconfig/Makefile Sun May 12 01:51:10 2013 (r317927) @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= bsdconfig -PORTVERSION= 0.8.2 +PORTVERSION= 0.8.3 CATEGORIES= sysutils MASTER_SITES= http://druidbsd.sourceforge.net/download/bsdconfig/ -DISTNAME= ${PORTNAME}.130509 +DISTNAME= ${PORTNAME}.130511 EXTRACT_SUFX= .txz PATCH_SITES= ${MASTER_SITES} Modified: head/sysutils/bsdconfig/distinfo ============================================================================== --- head/sysutils/bsdconfig/distinfo Sun May 12 01:15:50 2013 (r317926) +++ head/sysutils/bsdconfig/distinfo Sun May 12 01:51:10 2013 (r317927) @@ -1,4 +1,4 @@ -SHA256 (bsdconfig.130509.txz) = a5036dc37d93cf1c555ce7d0e6c35a3e12738eb742152d8ce34fd08f0defefd0 -SIZE (bsdconfig.130509.txz) = 135928 -SHA256 (bsdconfig.130509-0.8.2.diff.gz) = a33a64696fde09a9775ab101135e94d689655a8477622a4f3f4a41c00e9bd8bc -SIZE (bsdconfig.130509-0.8.2.diff.gz) = 222 +SHA256 (bsdconfig.130511.txz) = 9e9ee7d9904bdeb6abc79365a798704dcce9aba928f702e220ca042b492b0aa7 +SIZE (bsdconfig.130511.txz) = 136156 +SHA256 (bsdconfig.130511-0.8.3.diff.gz) = a33a64696fde09a9775ab101135e94d689655a8477622a4f3f4a41c00e9bd8bc +SIZE (bsdconfig.130511-0.8.3.diff.gz) = 222 From owner-svn-ports-all@FreeBSD.ORG Sun May 12 04:30:14 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 1033) id F3B6D35D; Sun, 12 May 2013 04:30:13 +0000 (UTC) Date: Sun, 12 May 2013 04:30:13 +0000 From: Alexey Dokuchaev To: Wen Heping Subject: Re: svn commit: r317890 - head/sysutils/less Message-ID: <20130512043013.GA35859@FreeBSD.org> References: <201305111537.r4BFbuOk046168@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201305111537.r4BFbuOk046168@svn.freebsd.org> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 04:30:14 -0000 On Sat, May 11, 2013 at 03:37:56PM +0000, Wen Heping wrote: > New Revision: 317890 > URL: http://svnweb.freebsd.org/changeset/ports/317890 > > @@ -11,18 +11,23 @@ MASTER_SITE_SUBDIR= less > MAINTAINER= jharris@widomaker.com > COMMENT= A better pager utility You could have trimmed indefinite article from COMMENT while you're here. > +LICENSE= GPLv3 > + > +OPTIONS_DEFINE= COLOR_LESS > +COLOR_LESS_DESC=Enables color support via escape sequence This is a poorly chosen knob name: in English, it would rather mean "less(1) without colors" (= colorless) than "color-enabled less(1)". I would suggest you rename it to just "COLORS" or "COLOR_SUPPORT" (a bit too long I guess). Also notice missing tab after COLOR_LESS_DESC= -- I assume it was dropped because COLOR_LESS_DESC= is 16 chars long; shortening option name would help knobs to align nicely without having to sacrifice whitespace. > -.if defined(COLOUR_LESS) || defined(COLOR_LESS) > +.if ${PORT_OPTIONS:MCOLOUR_LESS} Option name uses American (that is, correct) spelling of COLOR, but here you check for COLOUR. This would not work. portlint(1) should have warned about it. ./danfe From owner-svn-ports-all@FreeBSD.ORG Sun May 12 04:48:06 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id CFA1B6A8; Sun, 12 May 2013 04:48:06 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id BC50AA7D; Sun, 12 May 2013 04:48:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4C4m61A032637; Sun, 12 May 2013 04:48:06 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4C4m6FR032636; Sun, 12 May 2013 04:48:06 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201305120448.r4C4m6FR032636@svn.freebsd.org> From: Alexey Dokuchaev Date: Sun, 12 May 2013 04:48:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317928 - head/Mk X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 04:48:06 -0000 Author: danfe Date: Sun May 12 04:48:06 2013 New Revision: 317928 URL: http://svnweb.freebsd.org/changeset/ports/317928 Log: Add shared Hunspell spell checker description. Modified: head/Mk/bsd.options.desc.mk Modified: head/Mk/bsd.options.desc.mk ============================================================================== --- head/Mk/bsd.options.desc.mk Sun May 12 01:51:10 2013 (r317927) +++ head/Mk/bsd.options.desc.mk Sun May 12 04:48:06 2013 (r317928) @@ -132,6 +132,7 @@ HAL_DESC?= HAL (Hardware Abstraction La HDF5_DESC?= HDF-5 data format support HTTPD_DESC?= httpd output streaming support HTTPS_DESC?= HTTPS protocol support +HUNSPELL_DESC?= Spell checking support via Hunspell ICONS_DESC?= Install icon theme(s) ICONV_DESC?= Encoding conversion support via iconv ICU_DESC?= Unicode support via ICU From owner-svn-ports-all@FreeBSD.ORG Sun May 12 04:52:40 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 3B2C9869; Sun, 12 May 2013 04:52:40 +0000 (UTC) (envelope-from rm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 1313AAB1; Sun, 12 May 2013 04:52:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4C4qd5E035045; Sun, 12 May 2013 04:52:39 GMT (envelope-from rm@svn.freebsd.org) Received: (from rm@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4C4qdmv035040; Sun, 12 May 2013 04:52:39 GMT (envelope-from rm@svn.freebsd.org) Message-Id: <201305120452.r4C4qdmv035040@svn.freebsd.org> From: Ruslan Mahmatkhanov Date: Sun, 12 May 2013 04:52:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317929 - head/net/py-txamqp X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 04:52:40 -0000 Author: rm Date: Sun May 12 04:52:39 2013 New Revision: 317929 URL: http://svnweb.freebsd.org/changeset/ports/317929 Log: - fix pkg-plist - bump PORTREVISION while here: - trim Makefile header - eliminate PYTHON_SITELIBDIR from depends - limit python version to 2.x only (print/except) Reported by: pointyhat (miwi) Modified: head/net/py-txamqp/Makefile head/net/py-txamqp/pkg-plist Modified: head/net/py-txamqp/Makefile ============================================================================== --- head/net/py-txamqp/Makefile Sun May 12 04:48:06 2013 (r317928) +++ head/net/py-txamqp/Makefile Sun May 12 04:52:39 2013 (r317929) @@ -1,12 +1,9 @@ -# New ports collection makefile for: txamqp -# Date created: 2009-07-04 -# Whom: Bruce Simpson -# +# Created by: Bruce Simpson # $FreeBSD$ -# PORTNAME= txamqp PORTVERSION= 0.3 +PORTREVISION= 1 CATEGORIES= net python MASTER_SITES= http://launchpadlibrarian.net/30388120/ \ # http://launchpad.net/txamqp/trunk/${PORTVERSION}/+download/ @@ -16,17 +13,17 @@ DISTNAME= python-${PORTNAME}_${PORTVERSI MAINTAINER= ports@FreeBSD.org COMMENT= Twisted Python library for the AMQP messaging protocol -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/thrift/__init__.py:${PORTSDIR}/devel/py-thrift +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}thrift>0:${PORTSDIR}/devel/py-thrift -USE_PYTHON= 2.5+ -USE_PYDISTUTILS= easy_install +USE_PYTHON= -2.7 +USE_PYDISTUTILS=easy_install USE_TWISTED= yes WRKSRC= ${WRKDIR}/python-${PORTNAME}-${PORTVERSION} PYDISTUTILS_PKGNAME= txAMQP PYDISTUTILS_PKGVERSION= 0.3 -PLIST_SUB= PORTNAME="${PORTNAME}" +PLIST_SUB= PORTNAME="${PORTNAME}" # TODO: Install txAMQP examples. Modified: head/net/py-txamqp/pkg-plist ============================================================================== --- head/net/py-txamqp/pkg-plist Sun May 12 04:48:06 2013 (r317928) +++ head/net/py-txamqp/pkg-plist Sun May 12 04:52:39 2013 (r317929) @@ -85,7 +85,6 @@ %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/xmlutil.pyc %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/xmlutil.pyo @dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/test -@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/contrib/test @dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/contrib/thrift @dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/contrib @dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp From owner-svn-ports-all@FreeBSD.ORG Sun May 12 04:55:53 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id D641F97C; Sun, 12 May 2013 04:55:53 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id C912EAC2; Sun, 12 May 2013 04:55:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4C4tr1Y035692; Sun, 12 May 2013 04:55:53 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4C4trIV035691; Sun, 12 May 2013 04:55:53 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201305120455.r4C4trIV035691@svn.freebsd.org> From: Alexey Dokuchaev Date: Sun, 12 May 2013 04:55:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317930 - head/editors/tea X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 04:55:53 -0000 Author: danfe Date: Sun May 12 04:55:53 2013 New Revision: 317930 URL: http://svnweb.freebsd.org/changeset/ports/317930 Log: - Utilize standard HUNSPELL_DESC from bsd.options.desc.mk (thus fix a typo) - Move OPTIONS block where it belongs (after other knobs) and kill stray empty line where at it Modified: head/editors/tea/Makefile Modified: head/editors/tea/Makefile ============================================================================== --- head/editors/tea/Makefile Sun May 12 04:52:39 2013 (r317929) +++ head/editors/tea/Makefile Sun May 12 04:55:53 2013 (r317930) @@ -11,11 +11,6 @@ COMMENT= Simple and powerful Qt4-based t LICENSE= GPLv3 -OPTIONS_RADIO= SPELL -OPTIONS_RADIO_SPELL= ASPELL HUNSPELL -OPTIONS_DEFAULT= ASPELL -HUNSPELL_DESC= Spell cheecking support via Hunspell - USE_BZIP2= yes USE_DOS2UNIX= rvln.* USE_QT4= gui moc_build qmake_build rcc_build @@ -23,6 +18,9 @@ MAKE_JOBS_SAFE= yes PLIST_FILES= bin/${PORTNAME} +OPTIONS_RADIO= SPELL +OPTIONS_RADIO_SPELL= ASPELL HUNSPELL +OPTIONS_DEFAULT= ASPELL .include From owner-svn-ports-all@FreeBSD.ORG Sun May 12 05:42:17 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id D3AA4DC7; Sun, 12 May 2013 05:42:17 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id C6E6CBE9; Sun, 12 May 2013 05:42:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4C5gHDd052321; Sun, 12 May 2013 05:42:17 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4C5gHsH052319; Sun, 12 May 2013 05:42:17 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201305120542.r4C5gHsH052319@svn.freebsd.org> From: Alexey Dokuchaev Date: Sun, 12 May 2013 05:42:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317931 - head/net-im/hotot X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 05:42:17 -0000 Author: danfe Date: Sun May 12 05:42:16 2013 New Revision: 317931 URL: http://svnweb.freebsd.org/changeset/ports/317931 Log: Update to version 0.9.8.14. Modified: head/net-im/hotot/Makefile head/net-im/hotot/distinfo Modified: head/net-im/hotot/Makefile ============================================================================== --- head/net-im/hotot/Makefile Sun May 12 04:55:53 2013 (r317930) +++ head/net-im/hotot/Makefile Sun May 12 05:42:16 2013 (r317931) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= hotot -PORTVERSION= 0.9.8.13 +PORTVERSION= 0.9.8.14 CATEGORIES= net-im www MAINTAINER= danfe@FreeBSD.org @@ -14,7 +14,7 @@ USE_GITHUB= yes GH_ACCOUNT= lyricat GH_PROJECT= Hotot GH_TAGNAME= master -GH_COMMIT= e0c78bf +GH_COMMIT= 1f68d33 USES= cmake gettext USE_PYTHON= yes Modified: head/net-im/hotot/distinfo ============================================================================== --- head/net-im/hotot/distinfo Sun May 12 04:55:53 2013 (r317930) +++ head/net-im/hotot/distinfo Sun May 12 05:42:16 2013 (r317931) @@ -1,2 +1,2 @@ -SHA256 (hotot-0.9.8.13.tar.gz) = 64c91ca2119baca9bba4117b0b81250b9ba68b3eed57a883469e82691d602234 -SIZE (hotot-0.9.8.13.tar.gz) = 1231377 +SHA256 (hotot-0.9.8.14.tar.gz) = 144ee6ce7e43cac6ba9b45b355b21d3d343bd83bf63273de22dcef892f7a29a4 +SIZE (hotot-0.9.8.14.tar.gz) = 1234375 From owner-svn-ports-all@FreeBSD.ORG Sun May 12 06:05:05 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 1F72A199; Sun, 12 May 2013 06:05:05 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 00C37CCA; Sun, 12 May 2013 06:05:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4C654b4059975; Sun, 12 May 2013 06:05:04 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4C653CC059962; Sun, 12 May 2013 06:05:03 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201305120605.r4C653CC059962@svn.freebsd.org> From: Baptiste Daroussin Date: Sun, 12 May 2013 06:05:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317932 - in head/lang: dmd maude metaocaml mlton mpd munger see see-devel X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 06:05:05 -0000 Author: bapt Date: Sun May 12 06:05:03 2013 New Revision: 317932 URL: http://svnweb.freebsd.org/changeset/ports/317932 Log: Convert to new options framework Modified: head/lang/dmd/Makefile head/lang/maude/Makefile head/lang/metaocaml/Makefile head/lang/mlton/Makefile head/lang/mpd/Makefile head/lang/munger/Makefile head/lang/see-devel/Makefile head/lang/see/Makefile Modified: head/lang/dmd/Makefile ============================================================================== --- head/lang/dmd/Makefile Sun May 12 05:42:16 2013 (r317931) +++ head/lang/dmd/Makefile Sun May 12 06:05:03 2013 (r317932) @@ -1,9 +1,5 @@ -# New ports collection makefile for: dmd -# Date created: November 15 2010 -# Whom: Ruben -# +# Created by: Ruben # $FreeBSD$ -# PORTNAME= dmd PORTVERSION= 1.076 @@ -27,13 +23,14 @@ LICENSE_NAME_DMD= digital mars license LICENSE_FILE_DMD= ${WRKSRC}/../../license.txt LICENSE_PERMS_DMD= no-pkg-mirror auto-accept -OPTIONS= SOURCE "Compile dmd and phobos from source" off +OPTIONS_DEFINE= SOURCE DOCS +SOURCE_DESC= Compile dmd and phobos from source -.include +.include MODULEDIR= ${PREFIX}/include/d/phobos -.if defined(WITH_SOURCE) +.if ${PORT_OPTIONS:MSOURCE} MAKEFILE= posix.mak .else NO_BUILD= yes @@ -46,7 +43,7 @@ MAKE_ARGS+= MODEL=32 .endif post-patch: -.if defined(WITH_SOURCE) +.if ${PORT_OPTIONS:MSOURCE} @${REINPLACE_CMD} -e "s|gcc|${CC}|" \ ${WRKSRC}/../phobos/freebsd.mak \ ${WRKSRC}/../phobos/etc/c/zlib/freebsd.mak \ @@ -88,7 +85,7 @@ do-install: ${MKDIR} ${MODULEDIR}/etc/c ${INSTALL_DATA} ${WRKSRC}/../phobos/etc/c/zlib.d ${MODULEDIR}/etc/c cd ${WRKSRC}/../phobos && ${COPYTREE_SHARE} std ${MODULEDIR} -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/*.txt ${DOCSDIR} cd ${WRKDIR}/dmd && ${COPYTREE_SHARE} html ${DOCSDIR} @@ -97,4 +94,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/../phobos/std.ddoc ${DOCSDIR}/phobos .endif -.include +.include Modified: head/lang/maude/Makefile ============================================================================== --- head/lang/maude/Makefile Sun May 12 05:42:16 2013 (r317931) +++ head/lang/maude/Makefile Sun May 12 06:05:03 2013 (r317932) @@ -23,11 +23,14 @@ LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --datadir=${DATADIR} FULL_MAUDE_VER= 26b -OPTIONS= FULL_MAUDE "Install full-maude${FULL_MAUDE_VER}" On + +OPTIONS_DEFINE= FULL_MAUDE +OPTIONS_DEFAULT= FULL_MAUDE +FULL_MAUDE_DESC= Install full-maude${FULL_MAUDE_VER} .include -.if defined(WITH_FULL_MAUDE) +.if ${PORT_OPTIONS:MFULL_MAUDE} MASTER_SITES+= http://maude.lcc.uma.es/FullMaude/FM${FULL_MAUDE_VER}/:fm FULL_MAUDE= full-maude${FULL_MAUDE_VER}.maude FULL_MAUDE_DIST= ${FULL_MAUDE}.zip @@ -40,7 +43,7 @@ PLIST_SUB+= FULL_MAUDE_VER="${FULL_MAUDE PLIST_SUB+= FULL_MAUDE="@comment " .endif -.if defined(WITH_FULL_MAUDE) +.if ${PORT_OPTIONS:MFULL_MAUDE} post-extract: ${UNZIP_CMD} ${DISTDIR}/${FULL_MAUDE_DIST} ${FULL_MAUDE} -d ${WRKDIR} .endif @@ -49,7 +52,7 @@ post-patch: @${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|' \ ${WRKSRC}/src/Mixfix/global.hh -.if defined(WITH_FULL_MAUDE) +.if ${PORT_OPTIONS:MFULL_MAUDE} post-install: ${INSTALL_DATA} ${WRKDIR}/${FULL_MAUDE} ${DATADIR} .endif Modified: head/lang/metaocaml/Makefile ============================================================================== --- head/lang/metaocaml/Makefile Sun May 12 05:42:16 2013 (r317931) +++ head/lang/metaocaml/Makefile Sun May 12 06:05:03 2013 (r317932) @@ -1,9 +1,5 @@ -# New ports collection makefile for: metaocaml -# Date created: 16 June 2005 -# Whom: Geoffrey Mainland -# +# Created by: Geoffrey Mainland # $FreeBSD$ -# PORTNAME= metaocaml PORTVERSION= 3.09.a30 @@ -60,8 +56,9 @@ MLINKS= ocamlc.1 ocamlc.opt.1 ocamlopt. camlp4.1 camlp4o.opt.1 camlp4.1 camlp4r.opt.1 \ camlp4.1 ocpp.1 -OPTIONS= X11 "build the X11 graphics library" on \ - LABLTK "build the LablTk library" on +OPTIONS_DEFINE= X11 LABELTK +OPTIONS_DEFAULT= X11 LABELTK +LABLTK_DESC= build the LablTk library PLISTDIR= ${PREFIX}/lib/metaocaml \ ${PREFIX}/share/examples/metaocaml \ @@ -69,12 +66,12 @@ PLISTDIR= ${PREFIX}/lib/metaocaml \ ${PREFIX}/bin/metaocamlc \ ${PREFIX}/bin/metaocamlopt -.include +.include # Have to set this here and can't use ${DATADIR} or MLINKS get screwed up MANPREFIX= ${PREFIX}/share/metaocaml -.if defined(WITH_X11) +.if ${PORT_OPTIONS:MX11} USE_XORG= x11 CONFIGURE_ARGS+=-x11include ${LOCALBASE}/include -x11lib ${LOCALBASE}/lib PLIST_SUB+= X11="" @@ -84,12 +81,12 @@ PLIST_SUB+= X11="@comment " # We would like to use bsd.tcl.mk here, but we can't USE_TCL after including # bsd.port.pre.mk and we can't test WITH_LABLTK before including bsd.port.pre.mk -.if defined(WITH_LABLTK) +.if ${PORT_OPTIONS:MLABLTK} LIB_DEPENDS+= tk84.1:${PORTSDIR}/x11-toolkits/tk84 CONFIGURE_ARGS+=-tkdefs "-I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4" CONFIGURE_ARGS+=-tklibs "-L${LOCALBASE}/lib" PLIST_SUB+= LABLTK="" -.if defined(WITHOUT_X11) +.if ! ${PORT_OPTIONS:MX11} CONFIGURE_ARGS+=-tk-no-x11 .endif .else @@ -115,7 +112,7 @@ post-patch: s,-O,,' {} \; post-install: -.if defined(WITH_LABLTK) +.if ${PORT_OPTIONS:MLABLTK} . for d in camltk labltk ${MKDIR} ${EXAMPLESDIR}/${d} ${CP} -R ${WRKSRC}/otherlibs/labltk/examples_${d}/* ${EXAMPLESDIR}/${d} @@ -145,4 +142,4 @@ post-install: echo "@dirrm ${MANPREFIX:S|${PREFIX}/||}" >> ${TMPPLIST} @${CAT} ${PKGMESSAGE} -.include +.include Modified: head/lang/mlton/Makefile ============================================================================== --- head/lang/mlton/Makefile Sun May 12 05:42:16 2013 (r317931) +++ head/lang/mlton/Makefile Sun May 12 06:05:03 2013 (r317932) @@ -24,12 +24,13 @@ LIB_DEPENDS= gmp.10:${PORTSDIR}/math/gmp RUN_DEPENDS= bash:${PORTSDIR}/shells/bash BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash -OPTIONS= SMLNJ "Bootstrap with SML/NJ (can take >15 hours)" off \ - MINGW32 "Add the mingw32 target (requires wine)" off +OPTIONS_DEFINE= SMLNJ MINGW32 +SMLNJ_DESC= Bootstrap with SML/NJ (can take >15 hours) +MINGW32_DESC= Add the mingw32 target (requires wine) -.include +.include -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} BUILD_DEPENDS+= gsed:${PORTSDIR}/textproc/gsed \ htmldoc:${PORTSDIR}/textproc/htmldoc USE_TEX= latex:build @@ -40,11 +41,11 @@ ALL_TARGET= all-no-docs SRC_DIST= ${DISTNAME}-1.src.tgz -.if defined(WITH_SMLNJ) +.if ${PORT_OPTIONS:MSMLNJ} BUILD_DEPENDS+= smlnj-devel>=110.65:${PORTSDIR}/lang/sml-nj-devel BOOT_DIST= MAKE_ENV+= SMLNJ_DEVEL=yes -.if defined(NOPORTDOCS) +.if ! ${PORT_OPTIONS:MDOCS} ALL_TARGET= nj-mlton all-no-docs .else ALL_TARGET= bootstrap-nj @@ -54,7 +55,7 @@ BOOT_DIST= ${PORTNAME}-${BOOT_VER}-1.${M MAKE_ENV+= LD_LIBMAP=libgmp.so.7=libgmp.so.10 .endif -.if defined(WITH_MINGW32) +.if ${PORT_OPTIONS:MMINGW32} BUILD_DEPENDS+= wine:${PORTSDIR}/emulators/wine \ mingw32-gcc:${PORTSDIR}/devel/mingw32-gcc \ ${LOCALBASE}/mingw32/lib/libgmp.a:${PORTSDIR}/math/mingw32-libgmp @@ -94,7 +95,7 @@ BOOT_VER= 20070826 post-extract: @${CP} ${FILESDIR}/add-local-cross ${WRKSRC}/bin/ -.if defined(WITH_SMLNJ) +.if ${PORT_OPTIONS:MSMLNJ} @${CP} ${FILESDIR}/upgrade-basis.sml ${WRKSRC}/mlton/ @for f in `ls ${FILESDIR}/ml.* ${FILESDIR}/mlb.*`; do \ ${CP} $$f ${WRKSRC}/mlton/front-end/; \ @@ -131,7 +132,7 @@ post-patch: ${WRKSRC}/doc/guide/Installation.bak post-build: -.if defined(WITH_MINGW32) +.if ${PORT_OPTIONS:MMINGW32} @${ECHO} Adding mingw32 target... ${WRKSRC}/bin/add-local-cross mingw32 x86 mingw .endif @@ -147,10 +148,10 @@ post-install: ${FIND} ${PREFIX}/lib/mlton -type d -exec ${CHMOD} a+rx {} \; ${CHMOD} a+x ${PREFIX}/lib/mlton/mlton-compile ${CHMOD} a+x ${PREFIX}/lib/mlton/platform -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} ${FIND} ${DOCSDIR} -type f -exec ${CHMOD} a+r {} \; ${FIND} ${DOCSDIR} -type d -exec ${CHMOD} a+rx {} \; .endif -.include +.include Modified: head/lang/mpd/Makefile ============================================================================== --- head/lang/mpd/Makefile Sun May 12 05:42:16 2013 (r317931) +++ head/lang/mpd/Makefile Sun May 12 06:05:03 2013 (r317932) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mpd -# Date Created: 2007-02-05 -# Whom: Kai Wang -# +# Created by: Kai Wang # $FreeBSD$ -# PORTNAME= mpd PORTVERSION= 1.0.1 @@ -26,7 +22,8 @@ NO_LATEST_LINK= yes USE_GMAKE= yes -OPTIONS= X11 "Enable X11 support" on +OPTIONS_DEFINE= X11 DOCS +OPTIONS_DEFAULT= X11 MAN1= mpd.1 mpdl.1 mpdm.1 mpdprof.1 MAN3= mpdanimator.3 mpdgetopt.3 mpdwin.3 @@ -34,7 +31,7 @@ MAN5= mpdmap.5 mpdtrace.5 .include -.if defined(WITHOUT_X11) +.if ! ${PORT_OPTIONS:MX11} PLIST_SUB+= X11="@comment " .else PLIST_SUB+= X11="" @@ -47,7 +44,7 @@ post-patch: s%^(MPDSRC =) .*%\1 ${WRKSRC}%; \ s%^((MPD(CMD|LIB)|MAN[135]) =) /usr/local%\1 ${PREFIX}%" \ ${WRKSRC}/Configuration -.if !defined(WITHOUT_X11) +.if ${PORT_OPTIONS:MX11} @${REINPLACE_CMD} -Ee 's%^(XINCL =) .*%\1 ${LOCALBASE}/include%' \ ${WRKSRC}/Configuration .else @@ -58,7 +55,7 @@ pre-install: @${MKDIR} ${PREFIX}/lib/mpd post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} @${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR} @${MKDIR} ${EXAMPLESDIR} Modified: head/lang/munger/Makefile ============================================================================== --- head/lang/munger/Makefile Sun May 12 05:42:16 2013 (r317931) +++ head/lang/munger/Makefile Sun May 12 06:05:03 2013 (r317932) @@ -16,13 +16,14 @@ DATADIR= ${PREFIX}/share/${PORTNAME}-${P MAN1= munger.1 MANCOMPRESSED= yes -OPTIONS= SQL "include SQLite interface" on +OPTIONS_DEFINE= SQLITE +OPTIONS_DEFAULT= SQLITE USE_LDCONFIG= yes -.include +.include -.if !defined(WITHOUT_SQL) +.if ${PORT_OPTIONS:MSQLITE} USE_SQLITE= 3 MAKE_ARGS+= -DWITH_SQL .endif @@ -31,4 +32,4 @@ MAKE_ARGS+= -DWITH_SQL BROKEN= Does not link on sparc64 .endif -.include +.include Modified: head/lang/see-devel/Makefile ============================================================================== --- head/lang/see-devel/Makefile Sun May 12 05:42:16 2013 (r317931) +++ head/lang/see-devel/Makefile Sun May 12 06:05:03 2013 (r317932) @@ -1,9 +1,5 @@ -# New ports collection makefile for: see-devel -# Date created: 29 Oct 2005 -# Whom: Simun Mikecin -# +# Created by: Simun Mikecin # $FreeBSD$ -# PORTNAME= see PORTVERSION= 3.0.1376 @@ -16,10 +12,10 @@ PKGNAMESUFFIX= -devel MAINTAINER= numisemis@yahoo.com COMMENT= Simple ECMAScript Engine (SEE) -OPTIONS= GC "Use Boehm-Weiser garbage collection package" on \ - OPTIMIZED_CFLAGS "Enable some additional optimizations" off \ - SEE_DEBUG "Internal SEE library debugging" off \ - MULTIPLE_THREADS "Enable thread-safety" on +OPTIONS_DEFINE= GC OPTIMIZED_CFLAGS SEE_DEBUG THREADS DOCS +OPTIONS_DEFAULT= GC THREADS +GC_DESC= Use Boehm-Weiser garbage collection package +SEE_DEBUG_DESC= Internal SEE library debugging CONFLICTS= see-[0-9]* @@ -31,25 +27,25 @@ GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -.include +.include -.if defined(WITH_MULTIPLE_THREADS) +.if ${PORT_OPTIONS:MMULTIPLE_THREADS} CFLAGS+= -DMULTIPLE_THREADS .endif -.if !defined(WITH_SEE_DEBUG) +.if ! ${PORT_OPTIONS:MSEE_DEBUG} CFLAGS+= -DNDEBUG .endif -.if defined(WITH_OPTIMIZED_CFLAGS) +.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} CFLAGS+= -O3 -fomit-frame-pointer .endif -.if defined(WITH_GC) +.if ${PORT_OPTIONS:MGC} LIB_DEPENDS+= gc:${PORTSDIR}/devel/boehm-gc .else CONFIGURE_ARGS+= --without-boehm-gc -.if !defined(WITH_MULTIPLE_THREADS) +.if ! ${PORT_OPTIONS:MTHREADS} PTHREAD_CFLAGS= PTHREAD_LIBS= .endif @@ -59,7 +55,7 @@ post-patch: @${REINPLACE_CMD} -e "s|PACKAGE_BUGREPORT='leonard@users|PACKAGE_BUGREPORT='leonard\\\@users|" \ ${WRKSRC}/configure -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} post-install: ${MKDIR} ${DOCSDIR} .for f in doc/USAGE.html AUTHORS NEWS README TODO COPYING @@ -67,4 +63,4 @@ post-install: .endfor .endif -.include +.include Modified: head/lang/see/Makefile ============================================================================== --- head/lang/see/Makefile Sun May 12 05:42:16 2013 (r317931) +++ head/lang/see/Makefile Sun May 12 06:05:03 2013 (r317932) @@ -1,9 +1,5 @@ -# New ports collection makefile for: see -# Date created: 29 Oct 2005 -# Whom: Simun Mikecin -# +# Created by: Simun Mikecin # $FreeBSD$ -# PORTNAME= see PORTVERSION= 2.0.1131 @@ -15,10 +11,10 @@ MASTER_SITES= http://www.powerband.net.a MAINTAINER= numisemis@yahoo.com COMMENT= Simple ECMAScript Engine (SEE) -OPTIONS= GC "Use Boehm-Weiser garbage collection package" on \ - OPTIMIZED_CFLAGS "Enable some additional optimizations" off \ - SEE_DEBUG "Internal SEE library debugging" off \ - MULTIPLE_THREADS "Enable thread-safety" on +OPTIONS_DEFINE= GC OPTIMIZED_CFLAGS SEE_DEBUG THREADS DOCS +OPTIONS_DEFAULT= GC THREADS +GC_DESC= Use Boehm-Weiser garbage collection package +SEE_DEBUG_DESC= Internal SEE library debugging CONFLICTS= see-devel-[0-9]* @@ -34,23 +30,23 @@ LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_L .include -.if defined(WITH_MULTIPLE_THREADS) +.if ${PORT_OPTIONS:MMULTIPLE_THREADS} CFLAGS+= -DMULTIPLE_THREADS .endif -.if !defined(WITH_SEE_DEBUG) +.if ! ${PORT_OPTIONS:MSEE_DEBUG} CFLAGS+= -DNDEBUG .endif -.if defined(WITH_OPTIMIZED_CFLAGS) +.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} CFLAGS+= -O3 -fomit-frame-pointer .endif -.if defined(WITH_GC) +.if ${PORT_OPTIONS:MGC} LIB_DEPENDS+= gc:${PORTSDIR}/devel/boehm-gc .else CONFIGURE_ARGS+= --without-boehm-gc -.if !defined(WITH_MULTIPLE_THREADS) +.if ! ${PORT_OPTIONS:MTHREADS} PTHREAD_CFLAGS= PTHREAD_LIBS= .endif @@ -60,7 +56,7 @@ post-patch: @${REINPLACE_CMD} -e "s|PACKAGE_BUGREPORT='leonard@users|PACKAGE_BUGREPORT='leonard\\\@users|" \ ${WRKSRC}/configure -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} post-install: ${MKDIR} ${DOCSDIR} .for f in doc/USAGE.html AUTHORS NEWS README TODO COPYING From owner-svn-ports-all@FreeBSD.ORG Sun May 12 06:35:07 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 67E157D8; Sun, 12 May 2013 06:35:07 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 5979CD7E; Sun, 12 May 2013 06:35:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4C6Z7L1070499; Sun, 12 May 2013 06:35:07 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4C6Z6R4070487; Sun, 12 May 2013 06:35:06 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201305120635.r4C6Z6R4070487@svn.freebsd.org> From: Alexey Dokuchaev Date: Sun, 12 May 2013 06:35:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317933 - in head/games: doom-data duke3d-data openarena quake-data quake2-data quake3-data X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 06:35:07 -0000 Author: danfe Date: Sun May 12 06:35:05 2013 New Revision: 317933 URL: http://svnweb.freebsd.org/changeset/ports/317933 Log: - Slightly improve usage description (comment) in quake2-data/Makefile.include - Synchronize other games' -data/Makefile.include files (consistently use LOCALBASE, drop obvious comments, adjust formatting, etc.) Modified: head/games/doom-data/Makefile.include (contents, props changed) head/games/duke3d-data/Makefile.include head/games/openarena/Makefile.include head/games/quake-data/Makefile.include head/games/quake2-data/Makefile.include head/games/quake3-data/Makefile.include Modified: head/games/doom-data/Makefile.include ============================================================================== --- head/games/doom-data/Makefile.include Sun May 12 06:05:03 2013 (r317932) +++ head/games/doom-data/Makefile.include Sun May 12 06:35:05 2013 (r317933) @@ -1,25 +1,16 @@ -# Makefile for defining variables used by other Doom related ports -# $FreeBSD$ +# Makefile for defining variables used by other Doom related ports. -# Set variables - -DMPKGNAMEPREFIX?=doom- +DMPKGNAMEPREFIX?= doom- DMDIR?= ${LOCALBASE}/share/doom -# Add them to the environment - MAKE_ENV+= DMDIR="${DMDIR}" PLIST_SUB+= DMDIR="${DMDIR:S/${LOCALBASE}\///}" SUB_LIST+= DMDIR="${DMDIR}" -# Add the dependency - .if ${PORTNAME} != "data" RUN_DEPENDS+= ${DMDIR}:${PORTSDIR}/games/doom-data .endif -# DOS to Unix text conversion - .if defined(USE_CRLF) . if defined(USE_ZIP) EXTRACT_BEFORE_ARGS= -aqo Modified: head/games/duke3d-data/Makefile.include ============================================================================== --- head/games/duke3d-data/Makefile.include Sun May 12 06:05:03 2013 (r317932) +++ head/games/duke3d-data/Makefile.include Sun May 12 06:35:05 2013 (r317933) @@ -5,27 +5,21 @@ # is installed (i.e. no need for pkg-message asking to copy duke3d.grp). # # The following variables are defined, and can be used in the port. -# DN3DPKGNAMEPREFIX - The package name prefix for Duke Nukem 3D additions. +# DN3DPKGNAMEPREFIX - The package name prefix for Duke Nukem 3D additions # DN3DDIR - The Duke Nukem 3D data directory (also added to -# MAKE_ENV, PLIST_SUB and SUB_LIST). +# MAKE_ENV, PLIST_SUB, and SUB_LIST) # # For notes about this kind of ports see /usr/ports/games/quake2-data (some # rules apply to this ports, like search paths). # -# Set variables. - -DN3DPKGNAMEPREFIX?=duke3d- +DN3DPKGNAMEPREFIX?= duke3d- DN3DDIR?= ${LOCALBASE}/share/duke3d -# Add them to the ports system. - MAKE_ENV+= DN3DDIR="${DN3DDIR}" PLIST_SUB+= DN3DDIR="${DN3DDIR:S/${LOCALBASE}\///}" SUB_LIST+= DN3DDIR="${DN3DDIR}" -# Add the dependency. - .if ${PORTNAME} != "data" RUN_DEPENDS+= ${DN3DDIR}:${PORTSDIR}/games/duke3d-data .endif Modified: head/games/openarena/Makefile.include ============================================================================== --- head/games/openarena/Makefile.include Sun May 12 06:05:03 2013 (r317932) +++ head/games/openarena/Makefile.include Sun May 12 06:35:05 2013 (r317933) @@ -11,7 +11,7 @@ RUN_DEPENDS+= ${OABIN}:${PORTSDIR}/games .include -# You only need server or client. +# You only need server or client .if exists(${LOCALBASE}/bin/oa_ded) OABIN= oa_ded .elif exists(${LOCALBASE}/bin/openarena) Modified: head/games/quake-data/Makefile.include ============================================================================== --- head/games/quake-data/Makefile.include Sun May 12 06:05:03 2013 (r317932) +++ head/games/quake-data/Makefile.include Sun May 12 06:35:05 2013 (r317933) @@ -1,19 +1,13 @@ # Makefile for defining variables used by other Quake related ports. See -# `games/quake2-data/Makefile.include' for extensive description. - -# Set variables +# `games/quake2-data/Makefile.include' for extensive description and usage. Q1PKGNAMEPREFIX?= quake- Q1DIR?= ${LOCALBASE}/share/quake -# Add them to the environment - MAKE_ENV+= Q1DIR="${Q1DIR}" PLIST_SUB+= Q1DIR="${Q1DIR:S/${LOCALBASE}\///}" SUB_LIST+= Q1DIR="${Q1DIR}" -# Add the dependency - .if ${PORTNAME} != "data" RUN_DEPENDS+= ${Q1DIR}/id1/pak0.pak:${PORTSDIR}/games/quake-data .endif Modified: head/games/quake2-data/Makefile.include ============================================================================== --- head/games/quake2-data/Makefile.include Sun May 12 06:05:03 2013 (r317932) +++ head/games/quake2-data/Makefile.include Sun May 12 06:35:05 2013 (r317933) @@ -5,58 +5,53 @@ # is installed (i.e. no need for pkg-message asking to copy the .pak files), # and the main game.so (except the engine incompatible with the original one). # -# The following variables are defined, and can be used in the port. -# Q2PKGNAMEPREFIX - The package name prefix for Quake II additions. -# Q2DIR - The Quake II data directory (also added to MAKE_ENV, -# PLIST_SUB and SUB_LIST). +# The following variables are defined, and can be used in the port: +# +# Q2PKGNAMEPREFIX - The package name prefix for Quake II additions +# Q2DIR - The Quake II data directory (also added to +# MAKE_ENV, PLIST_SUB, and SUB_LIST) +# +# Some notes for making such kind of ports: # -# The following are some notes for making this kind of ports. # - The game engines should be modified to add ${Q2DIR} as the first search # path (it's a stack so new paths override previous ones), and add -# "~/.${PORTNAME}" as the last one (this is where it writes the -# configuration, saved games, etc.), which may need to be created if doesn't -# exist. +# "~/.${PORTNAME}" as the last one (this is where it writes configuration, +# saved games, etc.), which may need to be created if doesn't exist; # - If the engine needs to load additional data (renderers, pak files, etc.) # don't install it in ${Q2DIR}, use ${PREFIX}/lib/${PORTNAME} instead and -# add that directory to the search paths immediately after ${Q2DIR}. +# add that directory to the search paths immediately after ${Q2DIR}; # - The reason to use "~/.${PORTNAME}" for writing is in the case the program # isn't compatible with the original engine (e.g. new console variables, # different saved game format, etc.). If just the configuration is # different it can write in "~/.quake2" but use a different configuration -# file name (not config.cfg). +# file name (not config.cfg); # - Search path summary (ordered): -# - cddir - Directory to be prepended (optional, configurable). -# - ${Q2DIR} - Base shared data directory. -# - ${LIBDIR} - Program specific data directory (optional). -# - basedir - Base data directory (configurable). -# - "~/.${PORTNAME}" - Writing directory. +# - cddir - Directory to be prepended (optional, configurable) +# - ${Q2DIR} - Base shared data directory +# - ${LIBDIR} - Program specific data directory (optional) +# - basedir - Base data directory (configurable) +# - "~/.${PORTNAME}" - Writing directory # - The "game${ARCH}.so" in game engines and modifications should be changed # to just "game.so" (the ${ARCH} can cause incompatibilities with new -# platforms and is unnecessary). +# platforms and is unnecessary); # - The modifications and data which is common to all the engines should be -# installed in ${Q2DIR}. +# installed in ${Q2DIR}; # - The engines should not install game.so files for the normal game, CTF, # Rogue, Xatrix, and all other which exist as a separate port. If the -# version the engine provides is different than the original one then add it -# as an option (off by default). If the engine is not compatible with the -# game.so files provided by the ports then ignore this rule. +# version the engine provides is different than the original one then add +# it as an option (off by default). If the engine is not compatible with +# the game.so files provided by the ports then ignore this rule. # -# For examples see the existing ports. +# For the examples please see existing ports. # -# Set variables - Q2PKGNAMEPREFIX?= quake2- Q2DIR?= ${LOCALBASE}/share/quake2 -# Add them to the ports system - MAKE_ENV+= Q2DIR="${Q2DIR}" PLIST_SUB+= Q2DIR="${Q2DIR:S/${LOCALBASE}\///}" SUB_LIST+= Q2DIR="${Q2DIR}" -# Add the dependency - .if ${PORTNAME} != "data" RUN_DEPENDS+= ${Q2DIR}:${PORTSDIR}/games/quake2-data .endif Modified: head/games/quake3-data/Makefile.include ============================================================================== --- head/games/quake3-data/Makefile.include Sun May 12 06:05:03 2013 (r317932) +++ head/games/quake3-data/Makefile.include Sun May 12 06:35:05 2013 (r317933) @@ -1,25 +1,17 @@ # Makefile for defining variables used by other Quake3 related ports. See -# `games/quake2-data/Makefile.include' for extensive description. - -# Set variables +# `games/quake2-data/Makefile.include' for extensive description and usage. Q3PKGNAMEPREFIX?= quake3- -Q3DIR?= ${PREFIX}/share/quake3 - -# Add them to the environment +Q3DIR?= ${LOCALBASE}/share/quake3 MAKE_ENV+= Q3DIR="${Q3DIR}" -PLIST_SUB+= Q3DIR="${Q3DIR:S/${PREFIX}\///}" +PLIST_SUB+= Q3DIR="${Q3DIR:S/${LOCALBASE}\///}" SUB_LIST+= Q3DIR="${Q3DIR}" -# Add the dependency - .if ${PORTNAME} != "data" RUN_DEPENDS+= ${Q3DIR}/baseq3/pak1.pk3:${PORTSDIR}/games/quake3-data .endif -# DOS to Unix text conversion - .if defined(USE_CRLF) . if defined(USE_ZIP) EXTRACT_BEFORE_ARGS= -aqo From owner-svn-ports-all@FreeBSD.ORG Sun May 12 08:06:33 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 99B8A52C; Sun, 12 May 2013 08:06:33 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 8B535F96; Sun, 12 May 2013 08:06:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4C86Xq8001724; Sun, 12 May 2013 08:06:33 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4C86W9X001716; Sun, 12 May 2013 08:06:32 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201305120806.r4C86W9X001716@svn.freebsd.org> From: Alexey Dokuchaev Date: Sun, 12 May 2013 08:06:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317934 - in head/games: doom-data duke3d-data quake-data quake2-data quake3-data X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 08:06:33 -0000 Author: danfe Date: Sun May 12 08:06:32 2013 New Revision: 317934 URL: http://svnweb.freebsd.org/changeset/ports/317934 Log: If port is setting PKGNAMEPREFIX=${FOOPKGNAMEPREFIX}, but .include's this file before , options handling gets broken because options will be loaded from OPTIONSFILE which is based on UNIQUENAME and thus PKGNAMEPREFIX, which is empty at that point. Prevent this: ensure that FOOPKGNAMEPREFIX is defined in advance for ports that use it to set their PKGNAMEPREFIX and having OPTIONS. Modified: head/games/doom-data/Makefile.include head/games/duke3d-data/Makefile.include head/games/quake-data/Makefile.include head/games/quake2-data/Makefile.include head/games/quake3-data/Makefile.include Modified: head/games/doom-data/Makefile.include ============================================================================== --- head/games/doom-data/Makefile.include Sun May 12 06:35:05 2013 (r317933) +++ head/games/doom-data/Makefile.include Sun May 12 08:06:32 2013 (r317934) @@ -3,6 +3,10 @@ DMPKGNAMEPREFIX?= doom- DMDIR?= ${LOCALBASE}/share/doom +.if ${PKGNAMEPREFIX} == ${DMPKGNAMEPREFIX} && defined(OPTIONSMKINCLUDED) +. error include before if using DMPKGNAMEPREFIX +.endif + MAKE_ENV+= DMDIR="${DMDIR}" PLIST_SUB+= DMDIR="${DMDIR:S/${LOCALBASE}\///}" SUB_LIST+= DMDIR="${DMDIR}" Modified: head/games/duke3d-data/Makefile.include ============================================================================== --- head/games/duke3d-data/Makefile.include Sun May 12 06:35:05 2013 (r317933) +++ head/games/duke3d-data/Makefile.include Sun May 12 08:06:32 2013 (r317934) @@ -16,6 +16,10 @@ DN3DPKGNAMEPREFIX?= duke3d- DN3DDIR?= ${LOCALBASE}/share/duke3d +.if ${PKGNAMEPREFIX} == ${DN3DPKGNAMEPREFIX} && defined(OPTIONSMKINCLUDED) +. error include before if using DN3DPKGNAMEPREFIX +.endif + MAKE_ENV+= DN3DDIR="${DN3DDIR}" PLIST_SUB+= DN3DDIR="${DN3DDIR:S/${LOCALBASE}\///}" SUB_LIST+= DN3DDIR="${DN3DDIR}" Modified: head/games/quake-data/Makefile.include ============================================================================== --- head/games/quake-data/Makefile.include Sun May 12 06:35:05 2013 (r317933) +++ head/games/quake-data/Makefile.include Sun May 12 08:06:32 2013 (r317934) @@ -4,6 +4,10 @@ Q1PKGNAMEPREFIX?= quake- Q1DIR?= ${LOCALBASE}/share/quake +.if ${PKGNAMEPREFIX} == ${Q1PKGNAMEPREFIX} && defined(OPTIONSMKINCLUDED) +. error include before if using Q1PKGNAMEPREFIX +.endif + MAKE_ENV+= Q1DIR="${Q1DIR}" PLIST_SUB+= Q1DIR="${Q1DIR:S/${LOCALBASE}\///}" SUB_LIST+= Q1DIR="${Q1DIR}" Modified: head/games/quake2-data/Makefile.include ============================================================================== --- head/games/quake2-data/Makefile.include Sun May 12 06:35:05 2013 (r317933) +++ head/games/quake2-data/Makefile.include Sun May 12 08:06:32 2013 (r317934) @@ -11,7 +11,7 @@ # Q2DIR - The Quake II data directory (also added to # MAKE_ENV, PLIST_SUB, and SUB_LIST) # -# Some notes for making such kind of ports: +# Some notes for making this kind of ports: # # - The game engines should be modified to add ${Q2DIR} as the first search # path (it's a stack so new paths override previous ones), and add @@ -42,12 +42,16 @@ # it as an option (off by default). If the engine is not compatible with # the game.so files provided by the ports then ignore this rule. # -# For the examples please see existing ports. +# For the examples, please see existing ports. # Q2PKGNAMEPREFIX?= quake2- Q2DIR?= ${LOCALBASE}/share/quake2 +.if ${PKGNAMEPREFIX} == ${Q2PKGNAMEPREFIX} && defined(OPTIONSMKINCLUDED) +. error include before if using Q2PKGNAMEPREFIX +.endif + MAKE_ENV+= Q2DIR="${Q2DIR}" PLIST_SUB+= Q2DIR="${Q2DIR:S/${LOCALBASE}\///}" SUB_LIST+= Q2DIR="${Q2DIR}" Modified: head/games/quake3-data/Makefile.include ============================================================================== --- head/games/quake3-data/Makefile.include Sun May 12 06:35:05 2013 (r317933) +++ head/games/quake3-data/Makefile.include Sun May 12 08:06:32 2013 (r317934) @@ -4,6 +4,10 @@ Q3PKGNAMEPREFIX?= quake3- Q3DIR?= ${LOCALBASE}/share/quake3 +.if ${PKGNAMEPREFIX} == ${Q3PKGNAMEPREFIX} && defined(OPTIONSMKINCLUDED) +. error include before if using Q3PKGNAMEPREFIX +.endif + MAKE_ENV+= Q3DIR="${Q3DIR}" PLIST_SUB+= Q3DIR="${Q3DIR:S/${LOCALBASE}\///}" SUB_LIST+= Q3DIR="${Q3DIR}" From owner-svn-ports-all@FreeBSD.ORG Sun May 12 08:38:50 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 8E895751; Sun, 12 May 2013 08:38:50 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 7F98886; Sun, 12 May 2013 08:38:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4C8cnhS012403; Sun, 12 May 2013 08:38:49 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4C8cnPq012398; Sun, 12 May 2013 08:38:49 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201305120838.r4C8cnPq012398@svn.freebsd.org> From: Raphael Kubo da Costa Date: Sun, 12 May 2013 08:38:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317935 - in head/graphics/openimageio: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 08:38:50 -0000 Author: rakuco Date: Sun May 12 08:38:48 2013 New Revision: 317935 URL: http://svnweb.freebsd.org/changeset/ports/317935 Log: Update to 1.1.10. The change to thread.h has been reported upstream in https://github.com/OpenImageIO/oiio/issues/529. PR: ports/178505 Submitted by: Shane Ambler (maintainer) Added: head/graphics/openimageio/files/patch-include__thread.h (contents, props changed) Modified: head/graphics/openimageio/Makefile head/graphics/openimageio/distinfo head/graphics/openimageio/files/patch-include__fmath.h head/graphics/openimageio/pkg-plist Modified: head/graphics/openimageio/Makefile ============================================================================== --- head/graphics/openimageio/Makefile Sun May 12 08:06:32 2013 (r317934) +++ head/graphics/openimageio/Makefile Sun May 12 08:38:48 2013 (r317935) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= openimageio -PORTVERSION= 1.1.6 +PORTVERSION= 1.1.10 PORTREVISION?= 0 CATEGORIES?= graphics multimedia @@ -22,7 +22,7 @@ USE_GITHUB= yes GH_ACCOUNT= OpenImageIO GH_PROJECT= oiio GH_TAGNAME= Release-${PORTVERSION} -GH_COMMIT= 5fcd523 +GH_COMMIT= f28f5c4 WRKSRC= ${WRKDIR}/OpenImageIO-oiio-${GH_COMMIT}/src # fbm also installs bin/idiff Modified: head/graphics/openimageio/distinfo ============================================================================== --- head/graphics/openimageio/distinfo Sun May 12 08:06:32 2013 (r317934) +++ head/graphics/openimageio/distinfo Sun May 12 08:38:48 2013 (r317935) @@ -1,2 +1,2 @@ -SHA256 (openimageio-1.1.6.tar.gz) = a4d8bf7cedade3b3177bc5f46c3f0bb45de9ba32720d273d6334c03c3dfa2815 -SIZE (openimageio-1.1.6.tar.gz) = 8300662 +SHA256 (openimageio-1.1.10.tar.gz) = 1510287790113f0c64421623be7bf5b9317a1c9cfd6e85125bae81bc6c07a275 +SIZE (openimageio-1.1.10.tar.gz) = 9501836 Modified: head/graphics/openimageio/files/patch-include__fmath.h ============================================================================== --- head/graphics/openimageio/files/patch-include__fmath.h Sun May 12 08:06:32 2013 (r317934) +++ head/graphics/openimageio/files/patch-include__fmath.h Sun May 12 08:38:48 2013 (r317935) @@ -1,6 +1,6 @@ --- include/fmath.h.orig 2013-01-21 11:39:43.845857535 +1030 +++ include/fmath.h 2013-01-21 11:39:52.142857433 +1030 -@@ -972,7 +972,7 @@ +@@ -976,7 +976,7 @@ // Functions missing from FreeBSD Added: head/graphics/openimageio/files/patch-include__thread.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/openimageio/files/patch-include__thread.h Sun May 12 08:38:48 2013 (r317935) @@ -0,0 +1,12 @@ +--- include/thread.h.orig 2013-03-01 21:46:47.380515836 +1030 ++++ include/thread.h 2013-03-01 21:46:56.456181119 +1030 +@@ -110,9 +110,7 @@ + #endif + + #if defined(__GNUC__) && (defined(_GLIBCXX_ATOMIC_BUILTINS) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 401)) +-#if !defined(__FreeBSD__) || defined(__x86_64__) + #define USE_GCC_ATOMICS +-#endif + #endif + + OIIO_NAMESPACE_ENTER Modified: head/graphics/openimageio/pkg-plist ============================================================================== --- head/graphics/openimageio/pkg-plist Sun May 12 08:06:32 2013 (r317934) +++ head/graphics/openimageio/pkg-plist Sun May 12 08:38:48 2013 (r317935) @@ -38,7 +38,7 @@ include/OpenImageIO/version.h lib/libOpenImageIO.so lib/libOpenImageIO.so.1 lib/libOpenImageIO.so.1.1 -lib/libOpenImageIO.so.1.1.6 +lib/libOpenImageIO.so.1.1.10 %%PORTDOCS%%%%DOCSDIR%%/CHANGES %%PORTDOCS%%%%DOCSDIR%%/LICENSE %%PORTDOCS%%%%DOCSDIR%%/openimageio.pdf From owner-svn-ports-all@FreeBSD.ORG Sun May 12 08:39:31 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 2BB9286B; Sun, 12 May 2013 08:39:31 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 1DB9692; Sun, 12 May 2013 08:39:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4C8dUm2012631; Sun, 12 May 2013 08:39:31 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4C8dUVL012623; Sun, 12 May 2013 08:39:30 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201305120839.r4C8dUVL012623@svn.freebsd.org> From: Alexey Dokuchaev Date: Sun, 12 May 2013 08:39:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317936 - in head/games: doom-data duke3d-data quake-data quake2-data quake3-data X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 08:39:31 -0000 Author: danfe Date: Sun May 12 08:39:29 2013 New Revision: 317936 URL: http://svnweb.freebsd.org/changeset/ports/317936 Log: Toughen the check and unbreak INDEX. Modified: head/games/doom-data/Makefile.include head/games/duke3d-data/Makefile.include head/games/quake-data/Makefile.include head/games/quake2-data/Makefile.include head/games/quake3-data/Makefile.include Modified: head/games/doom-data/Makefile.include ============================================================================== --- head/games/doom-data/Makefile.include Sun May 12 08:38:48 2013 (r317935) +++ head/games/doom-data/Makefile.include Sun May 12 08:39:29 2013 (r317936) @@ -3,7 +3,7 @@ DMPKGNAMEPREFIX?= doom- DMDIR?= ${LOCALBASE}/share/doom -.if ${PKGNAMEPREFIX} == ${DMPKGNAMEPREFIX} && defined(OPTIONSMKINCLUDED) +.if defined(PKGNAMEPREFIX) && ${PKGNAMEPREFIX} == ${DMPKGNAMEPREFIX} && defined(OPTIONSMKINCLUDED) . error include before if using DMPKGNAMEPREFIX .endif Modified: head/games/duke3d-data/Makefile.include ============================================================================== --- head/games/duke3d-data/Makefile.include Sun May 12 08:38:48 2013 (r317935) +++ head/games/duke3d-data/Makefile.include Sun May 12 08:39:29 2013 (r317936) @@ -16,7 +16,7 @@ DN3DPKGNAMEPREFIX?= duke3d- DN3DDIR?= ${LOCALBASE}/share/duke3d -.if ${PKGNAMEPREFIX} == ${DN3DPKGNAMEPREFIX} && defined(OPTIONSMKINCLUDED) +.if defined(PKGNAMEPREFIX) && ${PKGNAMEPREFIX} == ${DN3DPKGNAMEPREFIX} && defined(OPTIONSMKINCLUDED) . error include before if using DN3DPKGNAMEPREFIX .endif Modified: head/games/quake-data/Makefile.include ============================================================================== --- head/games/quake-data/Makefile.include Sun May 12 08:38:48 2013 (r317935) +++ head/games/quake-data/Makefile.include Sun May 12 08:39:29 2013 (r317936) @@ -4,7 +4,7 @@ Q1PKGNAMEPREFIX?= quake- Q1DIR?= ${LOCALBASE}/share/quake -.if ${PKGNAMEPREFIX} == ${Q1PKGNAMEPREFIX} && defined(OPTIONSMKINCLUDED) +.if defined(PKGNAMEPREFIX) && ${PKGNAMEPREFIX} == ${Q1PKGNAMEPREFIX} && defined(OPTIONSMKINCLUDED) . error include before if using Q1PKGNAMEPREFIX .endif Modified: head/games/quake2-data/Makefile.include ============================================================================== --- head/games/quake2-data/Makefile.include Sun May 12 08:38:48 2013 (r317935) +++ head/games/quake2-data/Makefile.include Sun May 12 08:39:29 2013 (r317936) @@ -48,7 +48,7 @@ Q2PKGNAMEPREFIX?= quake2- Q2DIR?= ${LOCALBASE}/share/quake2 -.if ${PKGNAMEPREFIX} == ${Q2PKGNAMEPREFIX} && defined(OPTIONSMKINCLUDED) +.if defined(PKGNAMEPREFIX) && ${PKGNAMEPREFIX} == "${Q2PKGNAMEPREFIX}" && defined(OPTIONSMKINCLUDED) . error include before if using Q2PKGNAMEPREFIX .endif Modified: head/games/quake3-data/Makefile.include ============================================================================== --- head/games/quake3-data/Makefile.include Sun May 12 08:38:48 2013 (r317935) +++ head/games/quake3-data/Makefile.include Sun May 12 08:39:29 2013 (r317936) @@ -4,7 +4,7 @@ Q3PKGNAMEPREFIX?= quake3- Q3DIR?= ${LOCALBASE}/share/quake3 -.if ${PKGNAMEPREFIX} == ${Q3PKGNAMEPREFIX} && defined(OPTIONSMKINCLUDED) +.if defined(PKGNAMEPREFIX) && ${PKGNAMEPREFIX} == ${Q3PKGNAMEPREFIX} && defined(OPTIONSMKINCLUDED) . error include before if using Q3PKGNAMEPREFIX .endif From owner-svn-ports-all@FreeBSD.ORG Sun May 12 08:42:19 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 94E70990; Sun, 12 May 2013 08:42:19 +0000 (UTC) (envelope-from makc@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 57940A8; Sun, 12 May 2013 08:42:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4C8gJRH014798; Sun, 12 May 2013 08:42:19 GMT (envelope-from makc@svn.freebsd.org) Received: (from makc@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4C8gIOW014794; Sun, 12 May 2013 08:42:18 GMT (envelope-from makc@svn.freebsd.org) Message-Id: <201305120842.r4C8gIOW014794@svn.freebsd.org> From: Max Brazhnikov Date: Sun, 12 May 2013 08:42:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317937 - head/irc/quassel X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 08:42:19 -0000 Author: makc Date: Sun May 12 08:42:18 2013 New Revision: 317937 URL: http://svnweb.freebsd.org/changeset/ports/317937 Log: - Update to 0.9.0 - Switch to ouf of source build - Add KDE option (off by default), and use separate plist for not overcomplicating the matter - Sync list of Qt 4 components with project requirements - Trim Makefile header - Reformat description Added: head/irc/quassel/pkg-plist.kde (contents, props changed) - copied, changed from r317858, head/irc/quassel/pkg-plist Modified: head/irc/quassel/Makefile head/irc/quassel/distinfo (contents, props changed) head/irc/quassel/pkg-descr (contents, props changed) Modified: head/irc/quassel/Makefile ============================================================================== --- head/irc/quassel/Makefile Sun May 12 08:39:29 2013 (r317936) +++ head/irc/quassel/Makefile Sun May 12 08:42:18 2013 (r317937) @@ -1,13 +1,8 @@ -# New ports collection makefile for: quassel -# Date created: 2008-08-10 -# Whom: Martin Wilke -# +# Created by: Martin Wilke # $FreeBSD$ -# PORTNAME= quassel -PORTVERSION= 0.8.0 -PORTREVISION= 1 +PORTVERSION= 0.9.0 CATEGORIES= irc MASTER_SITES= http://www.quassel-irc.org/pub/ @@ -17,18 +12,20 @@ COMMENT= Qt4 based distributed IRC clien LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo USE_BZIP2= yes -USES= cmake -USE_QT4= qmake_build moc_build rcc_build uic_build +USES= cmake:outsource +USE_QT4= corelib network script sql \ + qmake_build moc_build rcc_build uic_build MAKE_JOBS_SAFE= yes -OPTIONS_DEFINE= NLS +OPTIONS_DEFINE= KDE NLS OPTIONS_MULTI= MODULE OPTIONS_MULTI_MODULE= MONO CORE CLIENT OPTIONS_DEFAULT= ${OPTIONS_MULTI_MODULE} MONO_DESC= Quassel standalone client -CORE_DESC= Quassel core -CLIENT_DESC= Quassel client +CORE_DESC= Quassel core (for use with client) +CLIENT_DESC= Quassel client (for use with core) +KDE_DESC= KDE 4 integration (for clients only) CMAKE_ARGS+= -DWANT_MONO=${QUASSEL_MONO} \ -DWANT_CORE=${QUASSEL_CORE} \ @@ -41,14 +38,22 @@ CMAKE_ARGS+= -DWANT_MONO=${QUASSEL_MONO} USE_QT4+= linguist_build .endif -.if !${PORT_OPTIONS:MMONO} && !${PORT_OPTIONS:MCLIENT} -PLIST_SUB+= MONO_OR_CLIENT="@comment " -.else +.if ${PORT_OPTIONS:MMONO} || ${PORT_OPTIONS:MCLIENT} +. if ${PORT_OPTIONS:MKDE} +USE_KDE4= automoc4 kdelibs +CMAKE_ARGS+= -DWITH_KDE=ON +PLIST= ${PKGDIR}/pkg-plist.kde +. else +CMAKE_ARGS+= -DWITH_KDE=OFF +. endif +USE_QT4+= dbus gui phonon webkit xml xmlpatterns +LIB_DEPENDS+= dbusmenu-qt:${PORTSDIR}/devel/libdbusmenu-qt PLIST_SUB+= MONO_OR_CLIENT="" +.else +PLIST_SUB+= MONO_OR_CLIENT="@comment " .endif .if ${PORT_OPTIONS:MMONO} -USE_QT4+= dbus gui network script sql xml webkit QUASSEL_MONO= ON PLIST_SUB+= MONO="" .else @@ -57,7 +62,8 @@ PLIST_SUB+= MONO="@comment " .endif .if ${PORT_OPTIONS:MCORE} -USE_QT4+= network script sql sql-sqlite3_run +LIB_DEPENDS+= qca.2:${PORTSDIR}/devel/qca +USE_QT4+= sql-sqlite3_run QUASSEL_CORE= ON PLIST_SUB+= CORE="" @@ -71,7 +77,6 @@ PLIST_SUB+= CORE="@comment " .endif .if ${PORT_OPTIONS:MCLIENT} -USE_QT4+= dbus gui network xml webkit QUASSEL_CLIENT= ON PLIST_SUB+= CLIENT="" .else @@ -84,6 +89,8 @@ pre-configure: ${REINPLACE_CMD} -e '/add_subdirectory(i18n)/d' \ ${WRKSRC}/CMakeLists.txt .endif + ${REINPLACE_CMD} -e 's,knotifyconfig,$${KDE4_KNOTIFYCONFIG_LIBRARY},' \ + ${WRKSRC}/CMakeLists.txt post-install: .if ${PORT_OPTIONS:MCORE} Modified: head/irc/quassel/distinfo ============================================================================== --- head/irc/quassel/distinfo Sun May 12 08:39:29 2013 (r317936) +++ head/irc/quassel/distinfo Sun May 12 08:42:18 2013 (r317937) @@ -1,2 +1,2 @@ -SHA256 (quassel-0.8.0.tar.bz2) = a3515bd18e2b100eb9a72480e76b1faefaa5e84cdb236b6af1f05b477a1e9071 -SIZE (quassel-0.8.0.tar.bz2) = 2663465 +SHA256 (quassel-0.9.0.tar.bz2) = 2e3fe06ae3731c829aa3c2f6bb5320619bad264c831f322985c3aa3fe58b6027 +SIZE (quassel-0.9.0.tar.bz2) = 2751143 Modified: head/irc/quassel/pkg-descr ============================================================================== --- head/irc/quassel/pkg-descr Sun May 12 08:39:29 2013 (r317936) +++ head/irc/quassel/pkg-descr Sun May 12 08:42:18 2013 (r317937) @@ -1,10 +1,10 @@ Quassel IRC is a modern, cross-platform, distributed IRC client -based on the Qt4 framework. Distributed means that one (or multiple) +based on the Qt 4 framework. Distributed means that one (or multiple) client(s) can attach to and detach from a central core that stays -permanently online. Re-attaching your client will show your IRC +permanently online. Re-attaching your client will show your IRC session in the same state as you left it in (plus whatever happened while you were gone), and this even when you re-attach from a -different location. An optional Beginner's Mode completely hides +different location. An optional Beginner's Mode completely hides this feature, so Quassel IRC can be used like a traditional client. -WWW: http://www.quassel-irc.org/ +WWW: http://www.quassel-irc.org/ Copied and modified: head/irc/quassel/pkg-plist.kde (from r317858, head/irc/quassel/pkg-plist) ============================================================================== --- head/irc/quassel/pkg-plist Sat May 11 09:00:05 2013 (r317858, copy source) +++ head/irc/quassel/pkg-plist.kde Sun May 12 08:42:18 2013 (r317937) @@ -1,16 +1,102 @@ %%MONO%%bin/quassel %%CLIENT%%bin/quasselclient %%CORE%%bin/quasselcore -%%MONO%%share/applications/quassel.desktop -%%CLIENT%%share/applications/quasselclient.desktop +%%MONO%%share/applications/kde4/quassel.desktop +%%CLIENT%%share/applications/kde4/quasselclient.desktop +%%MONO_OR_CLIENT%%share/apps/quassel/icons/oxygen/16x16/status/irc-channel-active.png +%%MONO_OR_CLIENT%%share/apps/quassel/icons/oxygen/16x16/status/irc-channel-inactive.png +%%MONO_OR_CLIENT%%share/apps/quassel/icons/oxygen/AUTHORS +%%MONO_OR_CLIENT%%share/apps/quassel/icons/oxygen/CONTRIBUTING +%%MONO_OR_CLIENT%%share/apps/quassel/icons/oxygen/COPYING +%%MONO_OR_CLIENT%%share/apps/quassel/icons/oxygen/scalable/status/irc-channel-active.svgz +%%MONO_OR_CLIENT%%share/apps/quassel/icons/oxygen/scalable/status/irc-channel-inactive.svgz +%%MONO_OR_CLIENT%%share/apps/quassel/networks.ini +%%MONO_OR_CLIENT%%share/apps/quassel/quassel.notifyrc %%MONO_OR_CLIENT%%share/apps/quassel/scripts/inxi %%MONO_OR_CLIENT%%share/apps/quassel/scripts/mpris +%%MONO_OR_CLIENT%%share/apps/quassel/stylesheets/LinuxDolt-bluestheme.qss +%%MONO_OR_CLIENT%%share/apps/quassel/stylesheets/default.qss +%%MONO_OR_CLIENT%%share/apps/quassel/stylesheets/jussi01-darktheme.qss +%%MONO_OR_CLIENT%%share/apps/quassel/stylesheets/m4yer.qss +%%MONO_OR_CLIENT%%share/apps/quassel/translations/cs.qm +%%MONO_OR_CLIENT%%share/apps/quassel/translations/da.qm +%%MONO_OR_CLIENT%%share/apps/quassel/translations/de.qm +%%MONO_OR_CLIENT%%share/apps/quassel/translations/el.qm +%%MONO_OR_CLIENT%%share/apps/quassel/translations/en_GB.qm +%%MONO_OR_CLIENT%%share/apps/quassel/translations/en_US.qm +%%MONO_OR_CLIENT%%share/apps/quassel/translations/eo.qm +%%MONO_OR_CLIENT%%share/apps/quassel/translations/es.qm +%%MONO_OR_CLIENT%%share/apps/quassel/translations/fi.qm +%%MONO_OR_CLIENT%%share/apps/quassel/translations/fr.qm +%%MONO_OR_CLIENT%%share/apps/quassel/translations/gl.qm +%%MONO_OR_CLIENT%%share/apps/quassel/translations/hu.qm +%%MONO_OR_CLIENT%%share/apps/quassel/translations/it.qm +%%MONO_OR_CLIENT%%share/apps/quassel/translations/ja.qm +%%MONO_OR_CLIENT%%share/apps/quassel/translations/ko.qm +%%MONO_OR_CLIENT%%share/apps/quassel/translations/lt.qm +%%MONO_OR_CLIENT%%share/apps/quassel/translations/nb.qm +%%MONO_OR_CLIENT%%share/apps/quassel/translations/nl.qm +%%MONO_OR_CLIENT%%share/apps/quassel/translations/oc.qm +%%MONO_OR_CLIENT%%share/apps/quassel/translations/pl.qm +%%MONO_OR_CLIENT%%share/apps/quassel/translations/pt.qm +%%MONO_OR_CLIENT%%share/apps/quassel/translations/pt_BR.qm +%%MONO_OR_CLIENT%%share/apps/quassel/translations/ro.qm +%%MONO_OR_CLIENT%%share/apps/quassel/translations/ru.qm +%%MONO_OR_CLIENT%%share/apps/quassel/translations/sl.qm +%%MONO_OR_CLIENT%%share/apps/quassel/translations/sq.qm +%%MONO_OR_CLIENT%%share/apps/quassel/translations/sr.qm +%%MONO_OR_CLIENT%%share/apps/quassel/translations/sv.qm +%%MONO_OR_CLIENT%%share/apps/quassel/translations/tr.qm +%%MONO_OR_CLIENT%%share/apps/quassel/translations/uk.qm +%%MONO_OR_CLIENT%%share/apps/quassel/translations/zh_CN.qm +%%MONO_OR_CLIENT%%share/icons/hicolor/128x128/apps/quassel.png +%%MONO_OR_CLIENT%%share/icons/hicolor/128x128/status/quassel-inactive.png +%%MONO_OR_CLIENT%%share/icons/hicolor/128x128/status/quassel-message.png +%%MONO_OR_CLIENT%%share/icons/hicolor/16x16/apps/quassel.png +%%MONO_OR_CLIENT%%share/icons/hicolor/16x16/status/quassel-inactive.png +%%MONO_OR_CLIENT%%share/icons/hicolor/16x16/status/quassel-message.png +%%MONO_OR_CLIENT%%share/icons/hicolor/22x22/apps/quassel.png +%%MONO_OR_CLIENT%%share/icons/hicolor/22x22/status/quassel-inactive.png +%%MONO_OR_CLIENT%%share/icons/hicolor/22x22/status/quassel-message.png +%%MONO_OR_CLIENT%%share/icons/hicolor/32x32/apps/quassel.png +%%MONO_OR_CLIENT%%share/icons/hicolor/32x32/status/quassel-inactive.png +%%MONO_OR_CLIENT%%share/icons/hicolor/32x32/status/quassel-message.png %%MONO_OR_CLIENT%%share/icons/hicolor/48x48/apps/quassel.png +%%MONO_OR_CLIENT%%share/icons/hicolor/48x48/status/quassel-inactive.png +%%MONO_OR_CLIENT%%share/icons/hicolor/48x48/status/quassel-message.png +%%MONO_OR_CLIENT%%share/icons/hicolor/64x64/apps/quassel.png +%%MONO_OR_CLIENT%%share/icons/hicolor/64x64/status/quassel-inactive.png +%%MONO_OR_CLIENT%%share/icons/hicolor/64x64/status/quassel-message.png +%%MONO_OR_CLIENT%%@dirrmtry share/icons/hicolor/64x64/status +%%MONO_OR_CLIENT%%@dirrmtry share/icons/hicolor/64x64/apps +%%MONO_OR_CLIENT%%@dirrmtry share/icons/hicolor/64x64 +%%MONO_OR_CLIENT%%@dirrmtry share/icons/hicolor/48x48/status %%MONO_OR_CLIENT%%@dirrmtry share/icons/hicolor/48x48/apps %%MONO_OR_CLIENT%%@dirrmtry share/icons/hicolor/48x48 +%%MONO_OR_CLIENT%%@dirrmtry share/icons/hicolor/32x32/status +%%MONO_OR_CLIENT%%@dirrmtry share/icons/hicolor/32x32/apps +%%MONO_OR_CLIENT%%@dirrmtry share/icons/hicolor/32x32 +%%MONO_OR_CLIENT%%@dirrmtry share/icons/hicolor/22x22/status +%%MONO_OR_CLIENT%%@dirrmtry share/icons/hicolor/22x22/apps +%%MONO_OR_CLIENT%%@dirrmtry share/icons/hicolor/22x22 +%%MONO_OR_CLIENT%%@dirrmtry share/icons/hicolor/16x16/status +%%MONO_OR_CLIENT%%@dirrmtry share/icons/hicolor/16x16/apps +%%MONO_OR_CLIENT%%@dirrmtry share/icons/hicolor/16x16 +%%MONO_OR_CLIENT%%@dirrmtry share/icons/hicolor/128x128/status +%%MONO_OR_CLIENT%%@dirrmtry share/icons/hicolor/128x128/apps +%%MONO_OR_CLIENT%%@dirrmtry share/icons/hicolor/128x128 %%MONO_OR_CLIENT%%@dirrmtry share/icons/hicolor %%MONO_OR_CLIENT%%@dirrmtry share/icons +%%MONO_OR_CLIENT%%@dirrm share/apps/quassel/translations +%%MONO_OR_CLIENT%%@dirrm share/apps/quassel/stylesheets %%MONO_OR_CLIENT%%@dirrm share/apps/quassel/scripts +%%MONO_OR_CLIENT%%@dirrm share/apps/quassel/icons/oxygen/scalable/status +%%MONO_OR_CLIENT%%@dirrm share/apps/quassel/icons/oxygen/scalable +%%MONO_OR_CLIENT%%@dirrm share/apps/quassel/icons/oxygen/16x16/status +%%MONO_OR_CLIENT%%@dirrm share/apps/quassel/icons/oxygen/16x16 +%%MONO_OR_CLIENT%%@dirrm share/apps/quassel/icons/oxygen +%%MONO_OR_CLIENT%%@dirrm share/apps/quassel/icons %%MONO_OR_CLIENT%%@dirrm share/apps/quassel %%MONO_OR_CLIENT%%@dirrmtry share/apps +%%MONO_OR_CLIENT%%@dirrmtry share/applications/kde4 %%MONO_OR_CLIENT%%@dirrmtry share/applications From owner-svn-ports-all@FreeBSD.ORG Sun May 12 08:46:20 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 03DE4A89; Sun, 12 May 2013 08:46:20 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id E94A2BB; Sun, 12 May 2013 08:46:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4C8kJNF015609; Sun, 12 May 2013 08:46:19 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4C8kJZ8015608; Sun, 12 May 2013 08:46:19 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201305120846.r4C8kJZ8015608@svn.freebsd.org> From: Raphael Kubo da Costa Date: Sun, 12 May 2013 08:46:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317938 - head/print/lyx X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 08:46:20 -0000 Author: rakuco Date: Sun May 12 08:46:19 2013 New Revision: 317938 URL: http://svnweb.freebsd.org/changeset/ports/317938 Log: Use shared HUNSPELL description added in r317928. Modified: head/print/lyx/Makefile Modified: head/print/lyx/Makefile ============================================================================== --- head/print/lyx/Makefile Sun May 12 08:42:18 2013 (r317937) +++ head/print/lyx/Makefile Sun May 12 08:46:19 2013 (r317938) @@ -43,7 +43,6 @@ MAN1= lyx.1 lyxclient.1 tex2lyx.1 OPTIONS_DEFINE= ASPELL ENCHANT HUNSPELL NLS OPTIONS_DEFAULT= HUNSPELL NLS ENCHANT_DESC= Spell checking using Enchant -HUNSPELL_DESC= Spell checking using Hunspell .include From owner-svn-ports-all@FreeBSD.ORG Sun May 12 08:49:11 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 44D27B7F; Sun, 12 May 2013 08:49:11 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 37F33CB; Sun, 12 May 2013 08:49:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4C8nBMY016143; Sun, 12 May 2013 08:49:11 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4C8nBa1016142; Sun, 12 May 2013 08:49:11 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201305120849.r4C8nBa1016142@svn.freebsd.org> From: Alexey Dokuchaev Date: Sun, 12 May 2013 08:49:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317939 - head/games/fuhquake X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 08:49:11 -0000 Author: danfe Date: Sun May 12 08:49:10 2013 New Revision: 317939 URL: http://svnweb.freebsd.org/changeset/ports/317939 Log: Sort OPTIONS knobs around a bit; add missing CLIENT_DESC. Modified: head/games/fuhquake/Makefile Modified: head/games/fuhquake/Makefile ============================================================================== --- head/games/fuhquake/Makefile Sun May 12 08:46:19 2013 (r317938) +++ head/games/fuhquake/Makefile Sun May 12 08:49:10 2013 (r317939) @@ -24,13 +24,14 @@ WRKSRC= ${WRKDIR}/source DATADIR= ${Q1DIR} MAKE_ENV= DATADIR="${DATADIR}" +OPTIONS_DEFINE= HUD OPTIMIZED_CFLAGS XMMS DOCS OPTIONS_MULTI= CLIENT OPTIONS_MULTI_CLIENT= GLX X11 -OPTIONS_DEFINE_i386= ASM -OPTIONS_DEFINE= HUD OPTIMIZED_CFLAGS XMMS DOCS OPTIONS_DEFAULT= GLX OPTIMIZED_CFLAGS X11 DOCS +OPTIONS_DEFINE_i386= ASM OPTIONS_DEFAULT_i386= ASM +CLIENT_DESC= Clients GLX_DESC= Build GLX client X11_DESC= Build X11 client HUD_DESC= Install high quality HUD images From owner-svn-ports-all@FreeBSD.ORG Sun May 12 09:45:25 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 42A60AE5; Sun, 12 May 2013 09:45:25 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 1ABB52E2; Sun, 12 May 2013 09:45:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4C9jO6u036411; Sun, 12 May 2013 09:45:24 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4C9jObU036408; Sun, 12 May 2013 09:45:24 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201305120945.r4C9jObU036408@svn.freebsd.org> From: Alexey Dokuchaev Date: Sun, 12 May 2013 09:45:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317940 - head/games/quake3-ut X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 09:45:25 -0000 Author: danfe Date: Sun May 12 09:45:24 2013 New Revision: 317940 URL: http://svnweb.freebsd.org/changeset/ports/317940 Log: - Cleanup Makefile, unmute installation commands, etc. - Update project URL in port description; drop maintainership NB: Urban Terror was recently converted to standalone game that does not require Quake III Arena anymore. Their current version is 4.2. Perhaps this port should be update to chase upstream. Modified: head/games/quake3-ut/Makefile head/games/quake3-ut/pkg-descr Modified: head/games/quake3-ut/Makefile ============================================================================== --- head/games/quake3-ut/Makefile Sun May 12 08:49:10 2013 (r317939) +++ head/games/quake3-ut/Makefile Sun May 12 09:45:24 2013 (r317940) @@ -1,4 +1,4 @@ -# Created by: pat +# Created by: Patrick Li # $FreeBSD$ PORTNAME= ut @@ -8,8 +8,8 @@ MASTER_SITES= ftp://ftp.snt.utwente.nl/p PKGNAMEPREFIX= ${Q3PKGNAMEPREFIX} DISTNAME= urbanTerror${PORTVERSION:S/.//}_full -MAINTAINER= danfe@FreeBSD.org -COMMENT= Quake III Arena Mod: Urban Terror +MAINTAINER= ports@FreeBSD.org +COMMENT= Quake III Arena mod: Urban Terror USE_ZIP= yes USE_CRLF= yes @@ -21,21 +21,21 @@ USE_GMAKE= yes .endif DATADIR= ${Q3DIR}/${PORTNAME} +PORT_OPTIONS= DOCS +.include "${.CURDIR}/../quake3-data/Makefile.include" .include do-install: @${MKDIR} ${DATADIR} .for f in *.pk3 description.txt - @${INSTALL_DATA} ${WRKSRC}/${f} ${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/${f} ${DATADIR} .endfor .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} -.for f in beta3.html radio_commands.txt readme*.txt - @${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} -.endfor +. for f in beta3.html radio_commands.txt readme*.txt + ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} +. endfor .endif -.include "${.CURDIR}/../quake3-data/Makefile.include" - .include Modified: head/games/quake3-ut/pkg-descr ============================================================================== --- head/games/quake3-ut/pkg-descr Sun May 12 08:49:10 2013 (r317939) +++ head/games/quake3-ut/pkg-descr Sun May 12 09:45:24 2013 (r317940) @@ -1,3 +1,3 @@ Urban Terror is a realism based "total conversion mod" for Quake III Arena. -WWW: http://www.urbanterror.net/ +WWW: http://www.urbanterror.info/ From owner-svn-ports-all@FreeBSD.ORG Sun May 12 10:10:38 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 7BB94E4A; Sun, 12 May 2013 10:10:38 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 6A21936A; Sun, 12 May 2013 10:10:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4CAAcef046072; Sun, 12 May 2013 10:10:38 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4CAAbpm046069; Sun, 12 May 2013 10:10:37 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201305121010.r4CAAbpm046069@svn.freebsd.org> From: Alexey Dokuchaev Date: Sun, 12 May 2013 10:10:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317941 - head/games/quake-reaper X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 10:10:38 -0000 Author: danfe Date: Sun May 12 10:10:37 2013 New Revision: 317941 URL: http://svnweb.freebsd.org/changeset/ports/317941 Log: - Unbreak the build after r317934 - Utilize USE_DOS2UNIX for text file conversion - Utilize PORTDOCS and offload pkg-plist Modified: head/games/quake-reaper/Makefile head/games/quake-reaper/pkg-plist Modified: head/games/quake-reaper/Makefile ============================================================================== --- head/games/quake-reaper/Makefile Sun May 12 09:45:24 2013 (r317940) +++ head/games/quake-reaper/Makefile Sun May 12 10:10:37 2013 (r317941) @@ -12,13 +12,16 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Quake 1 bots USE_ZIP= yes +USE_DOS2UNIX= ${PORTDOCS} NO_BUILD= yes NO_WRKSUBDIR= yes DATADIR= ${Q1DIR}/${PORTNAME} +PORTDOCS= B08chg.txt Dedserv.txt Reaprb80.txt Skinspec.txt OPTIONS_DEFINE= DOCS +.include "${.CURDIR}/../quake-data/Makefile.include" .include do-install: @@ -28,11 +31,9 @@ do-install: .endfor .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} -. for f in B08chg.txt Dedserv.txt Reaprb80.txt Skinspec.txt - @${REINPLACE_CMD} -e "s|`${ECHO_CMD} -e '\r'`$$||" ${WRKSRC}/${f} +. for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/${f:L} . endfor .endif -.include "${.CURDIR}/../quake-data/Makefile.include" .include Modified: head/games/quake-reaper/pkg-plist ============================================================================== --- head/games/quake-reaper/pkg-plist Sun May 12 09:45:24 2013 (r317940) +++ head/games/quake-reaper/pkg-plist Sun May 12 10:10:37 2013 (r317941) @@ -1,8 +1,3 @@ -%%PORTDOCS%%%%DOCSDIR%%/b08chg.txt -%%PORTDOCS%%%%DOCSDIR%%/dedserv.txt -%%PORTDOCS%%%%DOCSDIR%%/reaprb80.txt -%%PORTDOCS%%%%DOCSDIR%%/skinspec.txt %%DATADIR%%/autoexec.cfg %%DATADIR%%/progs.dat @dirrm %%DATADIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%% From owner-svn-ports-all@FreeBSD.ORG Sun May 12 10:20:46 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id D46BFF9B; Sun, 12 May 2013 10:20:46 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id B74BF3C7; Sun, 12 May 2013 10:20:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4CAKkPI048088; Sun, 12 May 2013 10:20:46 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4CAKkE2048085; Sun, 12 May 2013 10:20:46 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201305121020.r4CAKkE2048085@svn.freebsd.org> From: Alexey Dokuchaev Date: Sun, 12 May 2013 10:20:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317942 - head/games/quake2-ctf X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 10:20:47 -0000 Author: danfe Date: Sun May 12 10:20:46 2013 New Revision: 317942 URL: http://svnweb.freebsd.org/changeset/ports/317942 Log: - Tighten Makefile header and COMMENT line - Sort the knobs, NOPORTDOCS -> PORT_OPTIONS:MDOCS - Mute MKDIR's and adjust port description text Modified: head/games/quake2-ctf/Makefile head/games/quake2-ctf/pkg-descr Modified: head/games/quake2-ctf/Makefile ============================================================================== --- head/games/quake2-ctf/Makefile Sun May 12 10:10:37 2013 (r317941) +++ head/games/quake2-ctf/Makefile Sun May 12 10:20:46 2013 (r317942) @@ -1,9 +1,5 @@ -# New ports collection makefile for: quake2-ctf -# Date created: 26 Jul 2006 -# Whom: alepulver -# +# Created by: Alejandro Pulver # $FreeBSD$ -# PORTNAME= ctf PORTVERSION= 1.52 @@ -17,21 +13,22 @@ DISTFILES= ${CTF_DATA}:data \ DIST_SUBDIR= quake2lnx MAINTAINER= danfe@FreeBSD.org -COMMENT= Quake II CTF (Capture The Flag) modification +COMMENT= Quake II CTF (Capture The Flag) mod USE_ZIP= yes USE_DOS2UNIX= ../../../ctf/readme.txt ../../../ctf/server.cfg WRKSRC= ${WRKDIR}/${CTF_SRC:S/.tar.gz//}/src/ctf -LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME} DOCSDIR= ${PREFIX}/share/doc/${LATEST_LINK} +LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME} CTF_DATA= q2ctf150.zip CTF_SRC= quake2-r0.16.2.tar.gz -.include "${.CURDIR}/../quake2-data/Makefile.include" +OPTIONS_DEFINE= DOCS -.include +.include "${.CURDIR}/../quake2-data/Makefile.include" +.include do-extract: @${MKDIR} ${WRKDIR} @@ -44,15 +41,15 @@ post-extract: @${CP} ${FILESDIR}/${MAKEFILE} ${WRKSRC} do-install: - ${MKDIR} ${Q2DIR}/ctf + @${MKDIR} ${Q2DIR}/ctf ${INSTALL_PROGRAM} ${WRKSRC}/game.so ${Q2DIR}/ctf .for f in *.cfg *.pak ${INSTALL_DATA} ${WRKDIR}/ctf/${f} ${Q2DIR}/ctf .endfor -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} +.if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/* ${DOCSDIR} ${INSTALL_DATA} ${WRKDIR}/ctf/readme.txt ${DOCSDIR} .endif -.include +.include Modified: head/games/quake2-ctf/pkg-descr ============================================================================== --- head/games/quake2-ctf/pkg-descr Sun May 12 10:10:37 2013 (r317941) +++ head/games/quake2-ctf/pkg-descr Sun May 12 10:20:46 2013 (r317942) @@ -1,10 +1,10 @@ -Capture the Flag offers an exciting variation on team play. It gives more +Capture the Flag offers an exciting variation on team play. It gives more meaning to base defense along with offensive positioning and organized strikes. The basic premise is this: -Attack the enemy base, grab their flag, then take it back to your base. In +Attack the enemy base, grab their flag, then take it back to your base. In this variation you must touch your base flag when carrying the enemy flag in -order to score - if your flag isn't at your base when you return, you or your -team must get it back to gain points and captures. +order to score -- if your flag isn't at your base when you return, you or +your team must get it back to gain points and captures. From owner-svn-ports-all@FreeBSD.ORG Sun May 12 10:30:50 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 9285E176; Sun, 12 May 2013 10:30:50 +0000 (UTC) (envelope-from thierry@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 852A2405; Sun, 12 May 2013 10:30:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4CAUook051880; Sun, 12 May 2013 10:30:50 GMT (envelope-from thierry@svn.freebsd.org) Received: (from thierry@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4CAUoW0051850; Sun, 12 May 2013 10:30:50 GMT (envelope-from thierry@svn.freebsd.org) Message-Id: <201305121030.r4CAUoW0051850@svn.freebsd.org> From: Thierry Thomas Date: Sun, 12 May 2013 10:30:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317943 - head/finance/grisbi X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 10:30:50 -0000 Author: thierry Date: Sun May 12 10:30:50 2013 New Revision: 317943 URL: http://svnweb.freebsd.org/changeset/ports/317943 Log: Don't try to remove /usr/local/share/mime-info. Reported by: miwi Modified: head/finance/grisbi/pkg-plist (contents, props changed) Modified: head/finance/grisbi/pkg-plist ============================================================================== --- head/finance/grisbi/pkg-plist Sun May 12 10:20:46 2013 (r317942) +++ head/finance/grisbi/pkg-plist Sun May 12 10:30:50 2013 (r317943) @@ -319,7 +319,6 @@ share/mime-info/grisbi.keys share/mime-info/grisbi.mime @dirrm %%DATADIR%%/pixmaps/flags @dirrm %%DATADIR%%/pixmaps -@dirrmtry share/mime-info @dirrm %%DATADIR%%/categories/ru @dirrm %%DATADIR%%/categories/fr_FR @dirrm %%DATADIR%%/categories/fr From owner-svn-ports-all@FreeBSD.ORG Sun May 12 11:25:14 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 89F83645; Sun, 12 May 2013 11:25:14 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 6CF6677A; Sun, 12 May 2013 11:25:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4CBPEVZ071146; Sun, 12 May 2013 11:25:14 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4CBPEom071144; Sun, 12 May 2013 11:25:14 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201305121125.r4CBPEom071144@svn.freebsd.org> From: Alexey Dokuchaev Date: Sun, 12 May 2013 11:25:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317944 - head/games/quake3-wfa X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 11:25:14 -0000 Author: danfe Date: Sun May 12 11:25:13 2013 New Revision: 317944 URL: http://svnweb.freebsd.org/changeset/ports/317944 Log: - Trim traditional Makefile header - Cleanup Makefile, NOPORTDOCS -> PORT_OPTIONS:MDOCS - Unmute installation commands (INSTALL_DATA, CP) - Provide something that looks like real port description Modified: head/games/quake3-wfa/Makefile head/games/quake3-wfa/pkg-descr Modified: head/games/quake3-wfa/Makefile ============================================================================== --- head/games/quake3-wfa/Makefile Sun May 12 10:30:50 2013 (r317943) +++ head/games/quake3-wfa/Makefile Sun May 12 11:25:13 2013 (r317944) @@ -1,9 +1,5 @@ -# New ports collection makefile for: Q3 Mod: Weapons Factory Arena -# Date created: Sun Jun 3 15:03:11 EDT 2001 -# Whom: pat@databits.net -# +# Created by: Patrick Li # $FreeBSD$ -# PORTNAME= wfa PORTVERSION= 3.5b @@ -14,10 +10,10 @@ DISTFILES= WFA35Engine.zip WFA35MapPack1 WFA_v35b.zip 35b_mappack1.zip DIST_SUBDIR= ${PORTNAME} -MAINTAINER= danfe@FreeBSD.org -COMMENT= Quake III Arena Mod: Weapons Factory Arena +MAINTAINER= ports@FreeBSD.org +COMMENT= Quake III Arena mod: Weapons Factory Arena -NO_PACKAGE= "Package will be 138MB, set FORCE_PACKAGE if you really want to build it" +NO_PACKAGE= Package will be 200MB, set FORCE_PACKAGE if you really want it USE_ZIP= yes USE_CRLF= yes @@ -26,21 +22,22 @@ NO_WRKSUBDIR= yes DATADIR= ${Q3DIR}/${PORTNAME} +OPTIONS_DEFINE= DOCS + +.include "${.CURDIR}/../quake3-data/Makefile.include" +.include + post-extract: @${RM} ${WRKSRC}/help/BobWFACfgV236.exe do-install: @${MKDIR} ${DATADIR} .for f in *.cfg *.pk3 - @${INSTALL_DATA} ${WRKSRC}/${f} ${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/${f} ${DATADIR} .endfor -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} -.for f in EnglishRadioHelp help - @${CP} -R ${WRKSRC}/${f} ${DOCSDIR} -.endfor + ${CP} -a ${WRKSRC}/EnglishRadioHelp ${WRKSRC}/help ${DOCSDIR} .endif -.include "${.CURDIR}/../quake3-data/Makefile.include" - .include Modified: head/games/quake3-wfa/pkg-descr ============================================================================== --- head/games/quake3-wfa/pkg-descr Sun May 12 10:30:50 2013 (r317943) +++ head/games/quake3-wfa/pkg-descr Sun May 12 11:25:13 2013 (r317944) @@ -1,3 +1,16 @@ -Quake III Arena Mod: Weapons Factory Arena +Quake III Arena mod: Weapons Factory Arena, is one of the most complex, +dynamic, and fast-paced modifications for Quake III Arena written to date. -WWW: http://www.captured.com/weaponsfactory/quake3/ +It requires the standard deathmatch skills of any Quake game, plus the added +strategy of team-based CTF, with the tactical skill of mastering and +understanding eight different classes and over twenty different weapons. + +Your goal in every game will be to evaluate what your team needs most, then +to choose the class that will properly augment your team and lead them to +victory. + +The best way to start in WFA is to learn the basics of each class: their +specialties and nuances, strengths and weaknesses. And the best class to +start with is the marine. + +WWW: http://www.weaponsfactoryarena.com/ From owner-svn-ports-all@FreeBSD.ORG Sun May 12 11:34:09 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 806F9809; Sun, 12 May 2013 11:34:09 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 72CEB7B3; Sun, 12 May 2013 11:34:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4CBY9vx074359; Sun, 12 May 2013 11:34:09 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4CBY8Y0074356; Sun, 12 May 2013 11:34:08 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201305121134.r4CBY8Y0074356@svn.freebsd.org> From: Alexey Dokuchaev Date: Sun, 12 May 2013 11:34:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317945 - head/games/cube X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 11:34:09 -0000 Author: danfe Date: Sun May 12 11:34:08 2013 New Revision: 317945 URL: http://svnweb.freebsd.org/changeset/ports/317945 Log: - Tighten Makefile header and COMMENT line - Utilize DISTVERSION (simplifies things) - Sort the knobs, cleanup OPTIONS a bit, fix a typo - Rename DEDICATED option to SERVER - Define USE_GL more strictly as "glu" instead of vague "yes" - Reformat port description for better readability Modified: head/games/cube/Makefile head/games/cube/pkg-descr head/games/cube/pkg-plist Modified: head/games/cube/Makefile ============================================================================== --- head/games/cube/Makefile Sun May 12 11:25:13 2013 (r317944) +++ head/games/cube/Makefile Sun May 12 11:34:08 2013 (r317945) @@ -1,61 +1,60 @@ -# New ports collection makefile for: cube -# Date created: 17 October 2002 -# Whom: Arjan van Leeuwen -# +# Created by: Arjan van Leeuwen # $FreeBSD$ -# PORTNAME= cube -PORTVERSION= 2005.08.29 +DISTVERSION= 2005_08_29 PORTREVISION= 11 CATEGORIES= games -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/2005_08_29 +MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION} DISTFILES= ${CUBE_DATA} ${CUBE_SRC} EXTRACT_ONLY= ${CUBE_SRC} MAINTAINER= ports@FreeBSD.org -COMMENT= An OpenGL 3D First Person Shooter game +COMMENT= OpenGL 3D FPS (first person shooter) game BUILD_DEPENDS= ${LOCALBASE}/lib/libenet.a:${PORTSDIR}/net/enet USE_ZIP= yes USE_DOS2UNIX= yes USE_GMAKE= yes -WRKSRC= ${WRKDIR}/${PORTNAME}_source/src -CFLAGS+= -fsigned-char -ALL_TARGET= #empty -MALE_JOBS_SAFE= yes +ALL_TARGET= # +MAKE_JOBS_SAFE= yes -OPTIONS_DEFINE= OPTIMIZED_CFLAGS DOCS -OPTIONS_MULTI= TYPE -OPTIONS_MULTI_TYPE= CLIENT DEDICATED -OPTIONS_DEFAULT= CLIENT DEDICATED -CLIENT_DESC= Build client -DEDICATED_DESC= Build dedicated server +CFLAGS+= -fsigned-char +WRKSRC= ${WRKDIR}/${PORTNAME}_source/src SUB_FILES= cube_client cube_server -CUBE_DATA= ${PORTNAME}_${PORTVERSION:S/./_/g}_unix.tar.gz -CUBE_SRC= ${PORTNAME}_${PORTVERSION:S/./_/g}_src.zip +CUBE_DATA= ${PORTNAME}_${DISTVERSION}_unix.tar.gz +CUBE_SRC= ${PORTNAME}_${DISTVERSION}_src.zip + +OPTIONS_DEFINE= OPTIMIZED_CFLAGS DOCS +OPTIONS_MULTI= FLAVOR +OPTIONS_MULTI_FLAVOR= CLIENT SERVER +OPTIONS_DEFAULT= CLIENT SERVER + +FLAVOR_DESC= Clients and servers +CLIENT_DESC= Build client +SERVER_DESC= Build dedicated server .include .if ${PORT_OPTIONS:MCLIENT} -USE_GL= yes +USE_GL= glu USE_SDL= image mixer sdl ALL_TARGET+= client -PLIST_SUB+= CLIENT="" CUBE_BIN+= client +PLIST_SUB+= CLIENT="" .else PLIST_SUB+= CLIENT="@comment " .endif -.if ${PORT_OPTIONS:MDEDICATED} +.if ${PORT_OPTIONS:MSERVER} ALL_TARGET+= server -PLIST_SUB+= DEDICATED="" CUBE_BIN+= server +PLIST_SUB+= SERVER="" .else -PLIST_SUB+= DEDICATED="@comment " +PLIST_SUB+= SERVER="@comment " .endif .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} @@ -70,13 +69,13 @@ do-install: ${INSTALL_SCRIPT} ${WRKDIR}/cube_${f} ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/cube_${f} ${PREFIX}/libexec .endfor - ${MKDIR} ${DATADIR} - @(cd ${WRKDIR}/cube && ${COPYTREE_SHARE} "data packages" ${DATADIR}/) + @${MKDIR} ${DATADIR} + @(cd ${WRKDIR}/cube && ${COPYTREE_SHARE} "data packages" ${DATADIR}) ${INSTALL_DATA} ${WRKDIR}/cube/autoexec.cfg ${DATADIR} .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} + @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKDIR}/cube/readme.html ${DOCSDIR} - @(cd ${WRKDIR}/cube/docs && ${COPYTREE_SHARE} \* ${DOCSDIR}/) + @(cd ${WRKDIR}/cube/docs && ${COPYTREE_SHARE} . ${DOCSDIR}) .endif .include Modified: head/games/cube/pkg-descr ============================================================================== --- head/games/cube/pkg-descr Sun May 12 11:25:13 2013 (r317944) +++ head/games/cube/pkg-descr Sun May 12 11:34:08 2013 (r317945) @@ -1,20 +1,18 @@ -Cube is a 3D First Person Shooter that uses OpenGL and SDL. +Cube is a 3D First Person Shooter that uses OpenGL and SDL. It features: -Features: -- Single-player and Multiplayer gameplay. -- Allows in-engine editing of geometry in full 3D (you fly around the map, - point / drag stuff to select it / modify it), which can even be done with - multiple people at once (a first!). -- Has simplistic but effective fine grain vertex lighting that looks like - lightmapping and can do dynamic lights & shadows. -- Doesn't need any kind of map precompilation, even lighting is done on the - fly. -- Has very simplistic quad-tree world structure that can do slopes - (heightfields with caps) and slants, water. -- Does decent collision detection & physics. -- Has client/server networking that goes a long way in giving a lag-free game - experience. -- Features a Doom/Quake-style singleplayer and multiplayer game with some - uncompromising brutal oldskool gameplay. + - Single- and multi-player gameplay + - In-engine editing of geometry in full 3D (you fly around the map, point + and drag stuff to select or modify it), which can even be done with + multiple people at once + - Simplistic, but effective fine grain vertex lighting that looks like + lightmapping and can do dynamic lights and shadows + - No need for any kind of map precompilation, even lighting is done on fly + - Very simplistic quad-tree world structure that can do slopes (height- + fields with caps) and slants, water + - Decent collision detection and physics + - Client/server networking that goes a long way in giving a lag-free game + experience + - Doom/Quake-style singleplayer and multiplayer game with some + uncompromising brutal old-school gameplay WWW: http://www.cubeengine.com/ Modified: head/games/cube/pkg-plist ============================================================================== --- head/games/cube/pkg-plist Sun May 12 11:25:13 2013 (r317944) +++ head/games/cube/pkg-plist Sun May 12 11:34:08 2013 (r317945) @@ -1,7 +1,7 @@ %%CLIENT%%bin/cube_client -%%DEDICATED%%bin/cube_server +%%SERVER%%bin/cube_server %%CLIENT%%libexec/cube_client -%%DEDICATED%%libexec/cube_server +%%SERVER%%libexec/cube_server %%DATADIR%%/autoexec.cfg %%DATADIR%%/data/Health.png %%DATADIR%%/data/crosshair.png From owner-svn-ports-all@FreeBSD.ORG Sun May 12 11:37:15 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 118D791D; Sun, 12 May 2013 11:37:15 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 046517CC; Sun, 12 May 2013 11:37:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4CBbExH074978; Sun, 12 May 2013 11:37:14 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4CBbEVa074972; Sun, 12 May 2013 11:37:14 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201305121137.r4CBbEVa074972@svn.freebsd.org> From: Alexey Dokuchaev Date: Sun, 12 May 2013 11:37:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317946 - head/games/fteqw X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 11:37:15 -0000 Author: danfe Date: Sun May 12 11:37:14 2013 New Revision: 317946 URL: http://svnweb.freebsd.org/changeset/ports/317946 Log: - Convert old-school Makefile header to the new style - Refactor OPTIONS knobs and provide better descriptions - Define USE_GL more strictly as "gl" instead of vague "yes" - Drop a few shlib ABI versions from LIB_DEPENDS - Get rid of FTE_TARGETS variable (convert to use PLIST_FILES) - Cleanup Makefile and reformat port description while here Modified: head/games/fteqw/Makefile head/games/fteqw/pkg-descr Modified: head/games/fteqw/Makefile ============================================================================== --- head/games/fteqw/Makefile Sun May 12 11:34:08 2013 (r317945) +++ head/games/fteqw/Makefile Sun May 12 11:37:14 2013 (r317946) @@ -1,9 +1,5 @@ -# New ports collection makefile for: fteqw -# Date created: 2 Sep 2006 -# Whom: alepulver -# +# Created by: Alejandro Pulver # $FreeBSD$ -# PORTNAME= fteqw PORTVERSION= 3343 @@ -20,49 +16,49 @@ USE_GMAKE= yes USE_CSTD= gnu89 NO_WRKSUBDIR= yes -OPTIONS_MULTI= EXE -OPTIONS_MULTI_EXE= DEDICATED OPENGL SDL -OPTIONS_DEFINE= OPTIMIZED_CFLAGS -OPTIONS_DEFAULT= DEDICATED OPENGL OPTIMIZED_CFLAGS SDL -DEDICATED_DESC= Build dedicated server - SUB_FILES= pkg-message -.include "${.CURDIR}/../quake-data/Makefile.include" +OPTIONS_DEFINE= OPTIMIZED_CFLAGS +OPTIONS_MULTI= FLAVOR +OPTIONS_MULTI_FLAVOR= GLCLIENT SDLCLIENT SERVER +OPTIONS_DEFAULT= GLCLIENT SDLCLIENT SERVER OPTIMIZED_CFLAGS + +FLAVOR_DESC= Clients and servers +GLCLIENT_DESC= Build OpenGL client +SDLCLIENT_DESC= Build SDL client +SERVER_DESC= Build dedicated server +.include "${.CURDIR}/../quake-data/Makefile.include" .include -.if ${PORT_OPTIONS:MDEDICATED} +.if ${PORT_OPTIONS:MSERVER} ALL_TARGET+= sv-rel PLIST_FILES+= bin/fteqw-sv -FTE_TARGETS+= fteqw.sv .endif -.if ${PORT_OPTIONS:MGL} || !empty(PORT_OPTIONS:MSDL) -LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \ +.if ${PORT_OPTIONS:MGLCLIENT} || !empty(PORT_OPTIONS:MSDLCLIENT) +LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg \ png15:${PORTSDIR}/graphics/png \ - vorbis.4:${PORTSDIR}/audio/libvorbis + vorbis:${PORTSDIR}/audio/libvorbis CFLAGS+= -I${LOCALBASE}/include/libpng15 .endif -.if ${PORT_OPTIONS:MGL} -USE_GL= yes +.if ${PORT_OPTIONS:MGLCLIENT} +USE_GL= gl ALL_TARGET+= gl-rel PLIST_FILES+= bin/fteqw-gl -FTE_TARGETS+= fteqw.gl -.endif - -.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} -MAKE_ENV+= OPTIMIZED_CFLAGS=true .endif # SDL is used instead of the native X11 software version as it reports a -# memory allocation error at startup. It also fails with USEASM=true. -.if ${PORT_OPTIONS:MSDL} +# memory allocation error at startup. It also fails with USEASM=true. +.if ${PORT_OPTIONS:MSDLCLIENT} USE_SDL= sdl ALL_TARGET+= sw-rel PLIST_FILES+= bin/fteqw-sdl -FTE_TARGETS+= fteqw.sdl +.endif + +.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} +MAKE_ENV+= OPTIMIZED_CFLAGS=true .endif post-patch: @@ -72,8 +68,8 @@ post-patch: ${WRKSRC}/common/plugin.c ${WRKSRC}/server/svq3_game.c do-install: -.for f in ${FTE_TARGETS} - ${INSTALL_PROGRAM} ${WRKSRC}/release/${f} ${PREFIX}/bin/${f:S/./-/} +.for f in ${PLIST_FILES:T} + ${INSTALL_PROGRAM} ${WRKSRC}/release/${f:S/-/./} ${PREFIX}/bin/${f} .endfor post-install: Modified: head/games/fteqw/pkg-descr ============================================================================== --- head/games/fteqw/pkg-descr Sun May 12 11:34:08 2013 (r317945) +++ head/games/fteqw/pkg-descr Sun May 12 11:37:14 2013 (r317946) @@ -1,10 +1,10 @@ The intentions to the FTE QuakeWorld mod are to add some cool features to QuakeWorld, without loosing any (backwards) compatibility. -All QuakeWorld clients should be able to connect to an FTE server, and all FTE -clients should connect to any other QW server. +All QuakeWorld clients should be able to connect to an FTE server, and all +FTE clients should connect to any other QW server. -The FTE client, supports Quake, NetQuake, QuakeWorld, Quake II, Quake III -Arena, Hexen 2, Nexuiz and others. +The FTE client supports Quake, NetQuake, QuakeWorld, Quake II, Quake III +Arena, Hexen 2, Nexuiz, and others. WWW: http://fteqw.com/ From owner-svn-ports-all@FreeBSD.ORG Sun May 12 11:48:54 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 898FCBB9; Sun, 12 May 2013 11:48:54 +0000 (UTC) (envelope-from makc@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 7786A825; Sun, 12 May 2013 11:48:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4CBmsFt078839; Sun, 12 May 2013 11:48:54 GMT (envelope-from makc@svn.freebsd.org) Received: (from makc@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4CBmobl078813; Sun, 12 May 2013 11:48:50 GMT (envelope-from makc@svn.freebsd.org) Message-Id: <201305121148.r4CBmobl078813@svn.freebsd.org> From: Max Brazhnikov Date: Sun, 12 May 2013 11:48:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317947 - in head: audio/mp3unicode cad/librecad emulators/qtemu games/darkplaces games/frozenbubble games/toppler games/trigger games/trophy games/warmux irc/kvirc math/qtiplot math/sp... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 11:48:54 -0000 Author: makc Date: Sun May 12 11:48:49 2013 New Revision: 317947 URL: http://svnweb.freebsd.org/changeset/ports/317947 Log: - Add global options (DOCS, NLS, etc) to the OPTIONS_DEFINE and partly revert r315222 [1] - Convert WITH_DEBUG to new options framework - Trim Makefile header - Adjust COMMENTs - Reformat/update description [1] See follow-up discussion: http://lists.freebsd.org/pipermail/svn-ports-head/2013-March/016094.html Modified: head/audio/mp3unicode/Makefile head/audio/mp3unicode/pkg-descr (contents, props changed) head/cad/librecad/Makefile head/cad/librecad/pkg-descr (contents, props changed) head/emulators/qtemu/Makefile head/games/darkplaces/Makefile head/games/frozenbubble/Makefile head/games/toppler/Makefile head/games/trigger/Makefile head/games/trophy/Makefile head/games/warmux/Makefile head/games/warmux/pkg-descr (contents, props changed) head/irc/kvirc/Makefile head/math/qtiplot/Makefile head/math/speedcrunch/Makefile head/multimedia/minitube/Makefile head/multimedia/minitube/pkg-descr (contents, props changed) head/net-im/psi/Makefile head/x11-toolkits/qwt5/Makefile head/x11-toolkits/qwt6/Makefile Modified: head/audio/mp3unicode/Makefile ============================================================================== --- head/audio/mp3unicode/Makefile Sun May 12 11:37:14 2013 (r317946) +++ head/audio/mp3unicode/Makefile Sun May 12 11:48:49 2013 (r317947) @@ -1,9 +1,4 @@ -# New ports collection makefile for: mp3unicode -# Date created: 2007-09-29 -# Whom: Max Brazhnikov -# # $FreeBSD$ -# PORTNAME= mp3unicode PORTVERSION= 1.2 @@ -26,6 +21,8 @@ MAN1= mp3unicode.1 PLIST_FILES= bin/mp3unicode PORTDOCS= COPYING README +OPTIONS_DEFINE= DOCS + .include pre-configure: Modified: head/audio/mp3unicode/pkg-descr ============================================================================== --- head/audio/mp3unicode/pkg-descr Sun May 12 11:37:14 2013 (r317946) +++ head/audio/mp3unicode/pkg-descr Sun May 12 11:48:49 2013 (r317947) @@ -1,4 +1,4 @@ MP3Unicode is a command line utility to convert ID3 tags in mp3 files between different encodings. -WWW: http://mp3unicode.sourceforge.net/ +WWW: http://mp3unicode.sourceforge.net/ Modified: head/cad/librecad/Makefile ============================================================================== --- head/cad/librecad/Makefile Sun May 12 11:37:14 2013 (r317946) +++ head/cad/librecad/Makefile Sun May 12 11:48:49 2013 (r317947) @@ -1,9 +1,4 @@ -# New ports collection makefile for: librecad -# Date created: 2012-01-03 -# Whom: Max Brazhnikov -# # $FreeBSD$ -# PORTNAME= librecad PORTVERSION= 1.0.0 @@ -19,6 +14,8 @@ USE_QT4= help qt3support help-tools_buil rcc_build uic_build uic3_build MAKE_JOBS_SAFE= yes +OPTIONS_DEFINE= NLS + .include .if ${PORT_OPTIONS:MNLS} Modified: head/cad/librecad/pkg-descr ============================================================================== --- head/cad/librecad/pkg-descr Sun May 12 11:37:14 2013 (r317946) +++ head/cad/librecad/pkg-descr Sun May 12 11:48:49 2013 (r317947) @@ -1,4 +1,4 @@ LibreCAD is a 2D CAD drawing application based on the community edition of QCad (www.qcad.org). -WWW: http://librecad.org +WWW: http://librecad.org Modified: head/emulators/qtemu/Makefile ============================================================================== --- head/emulators/qtemu/Makefile Sun May 12 11:37:14 2013 (r317946) +++ head/emulators/qtemu/Makefile Sun May 12 11:48:49 2013 (r317947) @@ -7,7 +7,7 @@ CATEGORIES= emulators MASTER_SITES= SF MAINTAINER= makc@FreeBSD.org -COMMENT= Qt4-based frontend for QEMU +COMMENT= Qt 4 based frontend for QEMU USE_BZIP2= yes USE_QT4= gui xml uic_build moc_build qmake_build rcc_build @@ -17,6 +17,8 @@ CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} DESKTOP_ENTRIES="QtEmu" "QEMU frontend" "" \ "qtemu" "" false +OPTIONS_DEFINE= DOCS NLS + .include .if ${PORT_OPTIONS:MNLS} Modified: head/games/darkplaces/Makefile ============================================================================== --- head/games/darkplaces/Makefile Sun May 12 11:37:14 2013 (r317946) +++ head/games/darkplaces/Makefile Sun May 12 11:48:49 2013 (r317947) @@ -21,6 +21,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} MAKEFILE= makefile ALL_TARGET= # +OPTIONS_DEFINE= DOCS OPTIONS_MULTI= MODULE OPTIONS_MULTI_MODULE= CLIENT DEDICATED SDL OPTIONS_DEFAULT= ${OPTIONS_MULTI_MODULE} Modified: head/games/frozenbubble/Makefile ============================================================================== --- head/games/frozenbubble/Makefile Sun May 12 11:37:14 2013 (r317946) +++ head/games/frozenbubble/Makefile Sun May 12 11:48:49 2013 (r317947) @@ -1,9 +1,5 @@ -# New ports collection makefile for: frozen-bubble -# Date created: 2002-10-06 -# Whom: Klaus Goger -# +# Created by: Klaus Goger # $FreeBSD$ -# PORTNAME= frozenbubble PORTVERSION= 2.2.0 @@ -30,6 +26,8 @@ MAN6= frozen-bubble-editor.6 frozen-bub LEXECDIR= ${PREFIX}/libexec/${PORTNAME} +OPTIONS_DEFINE= NLS + .include .if ${PORT_OPTIONS:MNLS} Modified: head/games/toppler/Makefile ============================================================================== --- head/games/toppler/Makefile Sun May 12 11:37:14 2013 (r317946) +++ head/games/toppler/Makefile Sun May 12 11:48:49 2013 (r317947) @@ -1,9 +1,5 @@ -# New ports collection makefile for: toppler -# Date created: 18 Jan 2002 -# Whom: Dom Mitchell -# +# Created by: Dom Mitchell # $FreeBSD$ -# PORTNAME= toppler PORTVERSION= 1.1.5 @@ -12,7 +8,7 @@ CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME} MAINTAINER= makc@FreeBSD.org -COMMENT= A game where you have to climb the tower and avoid the monsters +COMMENT= Climb a tower and avoid monsters USE_SDL= mixer sdl USES= gettext @@ -25,6 +21,8 @@ MAN6= ${PORTNAME}.6 CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +OPTIONS_DEFINE= DOCS + .include post-patch: Modified: head/games/trigger/Makefile ============================================================================== --- head/games/trigger/Makefile Sun May 12 11:37:14 2013 (r317946) +++ head/games/trigger/Makefile Sun May 12 11:48:49 2013 (r317947) @@ -33,6 +33,8 @@ DESKTOP_ENTRIES="Trigger" "${COMMENT}" " PORTDOCS= README-stereo.txt README.txt +OPTIONS_DEFINE= DOCS + .include post-patch: Modified: head/games/trophy/Makefile ============================================================================== --- head/games/trophy/Makefile Sun May 12 11:37:14 2013 (r317946) +++ head/games/trophy/Makefile Sun May 12 11:48:49 2013 (r317947) @@ -8,7 +8,7 @@ CATEGORIES= games MASTER_SITES= SF MAINTAINER= makc@FreeBSD.org -COMMENT= A single player racing game +COMMENT= Single player racing game LICENSE= GPLv2 @@ -23,6 +23,8 @@ MAN6= trophy.6 PORTDOCS= AUTHORS COPYING ChangeLog README TODO +OPTIONS_DEFINE= DOCS + .include pre-configure: Modified: head/games/warmux/Makefile ============================================================================== --- head/games/warmux/Makefile Sun May 12 11:37:14 2013 (r317946) +++ head/games/warmux/Makefile Sun May 12 11:48:49 2013 (r317947) @@ -1,9 +1,5 @@ -# Ports collection makefile for: wormux -# Date created: Thu Dec 16 18:46:55 EET 2004 -# Whom: Anton Yudin -# +# Created by: Anton Yudin # $FreeBSD$ -# PORTNAME= warmux DISTVERSION= 11.04.1 @@ -13,7 +9,7 @@ MASTER_SITES= http://download.gna.org/${ http://download.gna.org/${PORTNAME}/archive/ MAINTAINER= makc@FreeBSD.org -COMMENT= Wormux game +COMMENT= Turn-based artillery game with free software mascots LIB_DEPENDS= xml++-2.6.2:${PORTSDIR}/textproc/libxml++26 \ curl:${PORTSDIR}/ftp/curl @@ -30,7 +26,7 @@ USE_DOS2UNIX= fixed_class.h MANCOMPRESSED= no MAN6= warmux.6 -OPTIONS_DEFINE= FRIBIDI SERVER NLS +OPTIONS_DEFINE= FRIBIDI SERVER NLS DEBUG FRIBIDI_DESC= Enable bi-directional unicode support SERVER_DESC= Enable dedicated server @@ -44,7 +40,7 @@ post-patch: ${REINPLACE_CMD} -e "s,warmux_files.desktop,," ${WRKSRC}/data/Makefile.in ${FIND} -d ${WRKSRC}/data/ -name "*.*~" -delete -.if defined(WITH_DEBUG) +.if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+= --enable-debug \ --enable-logging .endif Modified: head/games/warmux/pkg-descr ============================================================================== --- head/games/warmux/pkg-descr Sun May 12 11:37:14 2013 (r317946) +++ head/games/warmux/pkg-descr Sun May 12 11:48:49 2013 (r317947) @@ -1,17 +1,17 @@ -Almost everyone has heard of the Worms(R) series of games, developed by Team17. -Worms was created in 1990, the goal of the game consisting of a several teams of -"worms" fighting to the death on a 2D map. Wormux is heavily influenced by all -games in this genre, including Scorched Earth and Liero. +Almost everyone has heard of the Worms(R) series of games, developed +by Team17. Worms was created in 1990, the goal of the game consisting +of a several teams of "worms" fighting to the death on a 2D map. +WarMUX (WAR of Mascots from UniX) is heavily influenced by all games +in this genre, including Scorched Earth and Liero. -Wormux is free software clone of this game concept. Though currently under heavy -development, it is already very playable, with lots of weapons (Dynamite, -Baseball Bat, Teleportation, etc.). There are also lots of maps available for -your battling pleasure! Wormux takes the genre to the next level, with great -customisation options leading to great gameplay. There is a wide selection of -teams, from the Aliens to the Chickens. Also, new battlefields can be downloaded -from the Internet, making strategy an important part of each battle. +WarMUX is free software clone of this game concept. Though currently +under heavy development, it is already very playable, with lots of +weapons (Dynamite, Baseball Bat, Teleportation, etc.). There are +also lots of maps available for your battling pleasure! WarMUX +takes the genre to the next level, with great customisation options +leading to great gameplay. There is a wide selection of teams, +from the Aliens to the Chickens. Also, new battlefields can be +downloaded from the Internet, making strategy an important part of +each battle. -Renamed to WarMUX (WAR of Mascots from UniX): -http://www.wormux.org/phpboost/news/news-0-17+wormux-becomes-warmux.php - -WWW: http://www.wormux.org/ +WWW: http://sourceforge.net/projects/warmux.mirror/ Modified: head/irc/kvirc/Makefile ============================================================================== --- head/irc/kvirc/Makefile Sun May 12 11:37:14 2013 (r317946) +++ head/irc/kvirc/Makefile Sun May 12 11:48:49 2013 (r317947) @@ -1,9 +1,5 @@ -# New ports collection makefile for: kvirc -# Date created: 05 January 2004 -# Whom: Michael Ranner -# +# Created by: Michael Ranner # $FreeBSD$ -# PORTNAME= kvirc PORTVERSION= 4.2.0 @@ -19,7 +15,7 @@ MASTER_SITES= ftp://ftp.kvirc.de/pub/kvi MASTER_SITE_SUBDIR= ${PORTVERSION}/source MAINTAINER= makc@FreeBSD.org -COMMENT?= IRC client for KDE4 +COMMENT?= IRC client for KDE 4 .if !defined(PKGNAMESUFFIX) CONFLICTS_INSTALL= kvirc-qt4-4.* @@ -40,7 +36,7 @@ MAKE_JOBS_SAFE= yes MAN1= kvirc.1 MANLANG= "" de fr it pt uk -OPTIONS_DEFINE= AUDIOFILE GSM PERL PYTHON +OPTIONS_DEFINE= AUDIOFILE GSM PERL PYTHON DEBUG AUDIOFILE_DESC= Support for various audio formats GSM_DESC= u-law to gsm audio converter support @@ -75,7 +71,7 @@ USE_KDE4= kdelibs automoc4 kdeprefix PLIST_SUB+= QT="@comment " KDE="" .endif #defined(PKGNAMESUFFIX) -.if defined(WITH_DEBUG) +.if ${PORT_OPTIONS:MDEBUG} CMAKE_ARGS+= -DWITH_DEBUG=yes -DVERBOSE=yes .endif Modified: head/math/qtiplot/Makefile ============================================================================== --- head/math/qtiplot/Makefile Sun May 12 11:37:14 2013 (r317946) +++ head/math/qtiplot/Makefile Sun May 12 11:48:49 2013 (r317947) @@ -33,7 +33,7 @@ DESKTOP_ENTRIES="QtiPlot" "Data analysis "${DATADIR}/qtiplot.png" \ "qtiplot" "" false -OPTIONS_DEFINE= DOCS PYTHON NLS +OPTIONS_DEFINE= DOCS PYTHON NLS DEBUG OPTIONS_DEFAULT= ${OPTIONS_DEFINE} DOCS_DESC= Install the QtiPlot Handbook @@ -89,7 +89,7 @@ post-patch: ${WRKSRC}/fitPlugins/*/*.pro @${REINPLACE_CMD} -e '/^system($$$$LUPDATE/d; /^system($$$$LRELEASE/d' \ ${WRKSRC}/${PORTNAME}/qtiplot.pro -.if defined(WITH_DEBUG) +.if ${PORT_OPTIONS:MDEBUG} @${REINPLACE_CMD} -e \ "/^CONFIG.*release/s|release|debug|" \ ${WRKSRC}/build.conf Modified: head/math/speedcrunch/Makefile ============================================================================== --- head/math/speedcrunch/Makefile Sun May 12 11:37:14 2013 (r317946) +++ head/math/speedcrunch/Makefile Sun May 12 11:48:49 2013 (r317947) @@ -1,9 +1,5 @@ -# New ports collection makefile for: speedcrunch -# Date created: 27 Jul 2007 -# Whom: Yinghong.Liu -# +# Created by: Yinghong.Liu # $FreeBSD$ -# PORTNAME= speedcrunch DISTVERSION= 0.10.1 @@ -23,6 +19,8 @@ MAKE_JOBS_SAFE= yes LRELEASE_CMD= ${LOCALBASE}/bin/lrelease-qt4 LRELEASE_ARGS= -compress -silent +OPTIONS_DEFINE= NLS + .include .if ${PORT_OPTIONS:MNLS} Modified: head/multimedia/minitube/Makefile ============================================================================== --- head/multimedia/minitube/Makefile Sun May 12 11:37:14 2013 (r317946) +++ head/multimedia/minitube/Makefile Sun May 12 11:48:49 2013 (r317947) @@ -22,6 +22,8 @@ LRELEASE= ${LOCALBASE}/bin/lrelease-qt4 STRIP_FILES= bin/minitube +OPTIONS_DEFINE= NLS + .include .if ${PORT_OPTIONS:MNLS} Modified: head/multimedia/minitube/pkg-descr ============================================================================== --- head/multimedia/minitube/pkg-descr Sun May 12 11:37:14 2013 (r317946) +++ head/multimedia/minitube/pkg-descr Sun May 12 11:48:49 2013 (r317947) @@ -1,5 +1,5 @@ -Minitube is a native YouTube client. With it you can watch YouTube +Minitube is a native YouTube client. With it you can watch YouTube videos in a new way: you type a keyword, Minitube gives you an -endless video stream. Minitube does not require the Flash Player. +endless video stream. Minitube does not require the Flash Player. -WWW: http://flavio.tordini.org/minitube/ +WWW: http://flavio.tordini.org/minitube/ Modified: head/net-im/psi/Makefile ============================================================================== --- head/net-im/psi/Makefile Sun May 12 11:37:14 2013 (r317946) +++ head/net-im/psi/Makefile Sun May 12 11:48:49 2013 (r317947) @@ -7,7 +7,7 @@ CATEGORIES= net-im MASTER_SITES= SF/${PORTNAME}/Psi/${PORTVERSION} MAINTAINER= makc@FreeBSD.org -COMMENT= A Qt-based Jabber client +COMMENT= Qt 4 based Jabber client LIB_DEPENDS= qca.2:${PORTSDIR}/devel/qca RUN_DEPENDS= qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl \ @@ -26,7 +26,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX} --qtd CONFIGURE_ENV= QMAKEFLAGS='${QMAKEFLAGS}' MAKE_JOBS_SAFE= yes -OPTIONS_DEFINE= ASPELL ENCHANT DBUS +OPTIONS_DEFINE= ASPELL ENCHANT DBUS DEBUG OPTIONS_DEFAULT= ASPELL DBUS ASPELL_DESC= Use aspell for spell checking @@ -34,7 +34,7 @@ ENCHANT_DESC= Use Enchant for spell chec .include -.if defined(WITH_DEBUG) +.if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+= --debug PLIST_SUB+= DEBUG="" .else Modified: head/x11-toolkits/qwt5/Makefile ============================================================================== --- head/x11-toolkits/qwt5/Makefile Sun May 12 11:37:14 2013 (r317946) +++ head/x11-toolkits/qwt5/Makefile Sun May 12 11:48:49 2013 (r317947) @@ -23,6 +23,8 @@ PLIST_SUB= SHLIB_VER=${PORTVERSION} \ STRIP_FILES= lib/libqwt.so.${PORTVERSION} +OPTIONS_DEFINE= DOCS + .include .include <${FILESDIR}/Makefile.man> Modified: head/x11-toolkits/qwt6/Makefile ============================================================================== --- head/x11-toolkits/qwt6/Makefile Sun May 12 11:37:14 2013 (r317946) +++ head/x11-toolkits/qwt6/Makefile Sun May 12 11:48:49 2013 (r317947) @@ -28,6 +28,8 @@ PLIST_SUB= INCLUDEDIR=include/${LATEST_L STRIP_FILES= lib/libqwt6.so.${PORTVERSION} \ lib/libqwtmathml.so.${PORTVERSION} +OPTIONS_DEFINE= DOCS + .include post-patch: From owner-svn-ports-all@FreeBSD.ORG Sun May 12 12:03:06 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 8A9CB79; Sun, 12 May 2013 12:03:06 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 7E6B78C3; Sun, 12 May 2013 12:03:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4CC362U084751; Sun, 12 May 2013 12:03:06 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4CC369H084750; Sun, 12 May 2013 12:03:06 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201305121203.r4CC369H084750@svn.freebsd.org> From: Alexey Dokuchaev Date: Sun, 12 May 2013 12:03:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317948 - head/games/quake-extras X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 12:03:06 -0000 Author: danfe Date: Sun May 12 12:03:06 2013 New Revision: 317948 URL: http://svnweb.freebsd.org/changeset/ports/317948 Log: Unbreak after r317934. Modified: head/games/quake-extras/Makefile Modified: head/games/quake-extras/Makefile ============================================================================== --- head/games/quake-extras/Makefile Sun May 12 11:48:49 2013 (r317947) +++ head/games/quake-extras/Makefile Sun May 12 12:03:06 2013 (r317948) @@ -33,6 +33,7 @@ RETEXTURE_HQ_DESC= High quality textures RETEXTURE_LW_DESC= Low (still good) quality textures (15MB) SKYBOXES_DESC= Skyboxes (sky replacement images) +.include "${.CURDIR}/../quake-data/Makefile.include" .include .if ${PORT_OPTIONS:MREMODEL} || ${PORT_OPTIONS:MSKYBOXES} @@ -135,5 +136,4 @@ do-install: ${CP} -a ${WRKSRC}/skyboxes/* ${DATADIR}/id1 .endif -.include "${.CURDIR}/../quake-data/Makefile.include" .include From owner-svn-ports-all@FreeBSD.ORG Sun May 12 12:15:23 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id EA5C05B1; Sun, 12 May 2013 12:15:23 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id CD17D92C; Sun, 12 May 2013 12:15:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4CCFNb3089107; Sun, 12 May 2013 12:15:23 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4CCFNZ6089105; Sun, 12 May 2013 12:15:23 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201305121215.r4CCFNZ6089105@svn.freebsd.org> From: Alexey Dokuchaev Date: Sun, 12 May 2013 12:15:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317949 - head/games/worldofpadman X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 12:15:24 -0000 Author: danfe Date: Sun May 12 12:15:23 2013 New Revision: 317949 URL: http://svnweb.freebsd.org/changeset/ports/317949 Log: - Rename DEDICATED option to SERVER, add missing FLAVOR_DESC - Ensure that USE_GL is set, as SDL can be compiled without GL support - Adjust one PLIST_SUB: SMP -> SMPCLIENT Modified: head/games/worldofpadman/Makefile head/games/worldofpadman/pkg-plist Modified: head/games/worldofpadman/Makefile ============================================================================== --- head/games/worldofpadman/Makefile Sun May 12 12:03:06 2013 (r317948) +++ head/games/worldofpadman/Makefile Sun May 12 12:15:23 2013 (r317949) @@ -22,23 +22,24 @@ MAKE_ENV= DEFAULT_BASEDIR="${DATADIR}" P ALL_TARGET= release NO_PACKAGE= package will be ~600MB; set FORCE_PACKAGE if you really want it +SRC_FILE= ${PORTNAME}-${PORTVERSION} +VM_ARCHS= amd64 i386 powerpc + OPTIONS_DEFINE= CURL CURL_DLOPEN GAMELIBS MP3 OPENAL OPENAL_DLOPEN \ OPTIMIZED_CFLAGS VORBIS -OPTIONS_MULTI= TYPE -OPTIONS_MULTI_TYPE= CLIENT DEDICATED SMP_CLIENT -OPTIONS_DEFAULT= CLIENT CURL CURL_DLOPEN DEDICATED OPTIMIZED_CFLAGS \ +OPTIONS_MULTI= FLAVOR +OPTIONS_MULTI_FLAVOR= CLIENT SERVER SMP_CLIENT +OPTIONS_DEFAULT= CLIENT CURL CURL_DLOPEN SERVER OPTIMIZED_CFLAGS \ VORBIS SMP_CLIENT +FLAVOR_DESC= Clients and servers CLIENT_DESC= Build client CURL_DLOPEN_DESC= Enable dynamic loading of cURL -DEDICATED_DESC= Build dedicated server +SERVER_DESC= Build dedicated server GAMELIBS_DESC= Force building game libraries OPENAL_DLOPEN_DESC= Enable dynamic loading of OpenAL SMP_CLIENT_DESC= Build SMP (threaded) client -SRC_FILE= ${PORTNAME}-${PORTVERSION} -VM_ARCHS= amd64 i386 powerpc - .include .for arch in ${ARCH} @@ -69,6 +70,7 @@ MAKE_ENV+= USE_OPENAL_DLOPEN=1 . endif . endif # SDL +USE_GL= glu USE_SDL= sdl # Vorbis . if ${PORT_OPTIONS:MVORBIS} @@ -85,12 +87,12 @@ WOPBIN+= wop PLIST_SUB+= CLIENT="@comment " .endif -.if ${PORT_OPTIONS:MDEDICATED} +.if ${PORT_OPTIONS:MSERVER} MAKE_ENV+= BUILD_SERVER=1 -PLIST_SUB+= DEDICATED="" +PLIST_SUB+= SERVER="" WOPBIN+= wopded .else -PLIST_SUB+= DEDICATED="@comment " +PLIST_SUB+= SERVER="@comment " .endif .if ${PORT_OPTIONS:MGAMELIBS} || !defined(HAVE_VM_COMPILED) @@ -111,10 +113,10 @@ MAKE_ENV+= USE_OPTIMIZED_CFLAGS=1 .if ${PORT_OPTIONS:MSMP_CLIENT} MAKE_ENV+= BUILD_CLIENT_SMP=1 -PLIST_SUB+= SMP="" +PLIST_SUB+= SMPCLIENT="" WOPBIN+= wop-smp .else -PLIST_SUB+= SMP="@comment " +PLIST_SUB+= SMPCLIENT="@comment " .endif post-extract: Modified: head/games/worldofpadman/pkg-plist ============================================================================== --- head/games/worldofpadman/pkg-plist Sun May 12 12:03:06 2013 (r317948) +++ head/games/worldofpadman/pkg-plist Sun May 12 12:15:23 2013 (r317949) @@ -1,6 +1,6 @@ %%CLIENT%%bin/worldofpadman -%%SMP%%bin/worldofpadman-smp -%%DEDICATED%%bin/worldofpadmanded +%%SMPCLIENT%%bin/worldofpadman-smp +%%SERVER%%bin/worldofpadmanded %%PORTDOCS%%%%DOCSDIR%%/banner.html %%PORTDOCS%%%%DOCSDIR%%/copyright_de.html %%PORTDOCS%%%%DOCSDIR%%/copyright_en.html From owner-svn-ports-all@FreeBSD.ORG Sun May 12 12:17:41 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 1033) id 57B5B6A2; Sun, 12 May 2013 12:17:41 +0000 (UTC) Date: Sun, 12 May 2013 12:17:41 +0000 From: Alexey Dokuchaev To: Max Brazhnikov Subject: Re: svn commit: r317947 - in head: audio/mp3unicode cad/librecad emulators/qtemu games/darkplaces games/frozenbubble games/toppler games/trigger games/trophy games/warmux irc/kvirc math/qtiplot math/sp... Message-ID: <20130512121741.GA69699@FreeBSD.org> References: <201305121148.r4CBmobl078813@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201305121148.r4CBmobl078813@svn.freebsd.org> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 12:17:41 -0000 On Sun, May 12, 2013 at 11:48:50AM +0000, Max Brazhnikov wrote: > New Revision: 317947 > URL: http://svnweb.freebsd.org/changeset/ports/317947 > > Log: > - Add global options (DOCS, NLS, etc) to the OPTIONS_DEFINE and partly > revert r315222 [1] > - Convert WITH_DEBUG to new options framework > - Trim Makefile header > - Adjust COMMENTs > - Reformat/update description Very nice, thank you! ./danfe From owner-svn-ports-all@FreeBSD.ORG Sun May 12 12:25:34 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 2B925BA4; Sun, 12 May 2013 12:25:34 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 1E6CC97D; Sun, 12 May 2013 12:25:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4CCPXcb092612; Sun, 12 May 2013 12:25:34 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4CCPXPf092611; Sun, 12 May 2013 12:25:33 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201305121225.r4CCPXPf092611@svn.freebsd.org> From: Alexey Dokuchaev Date: Sun, 12 May 2013 12:25:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317950 - head/games/quake-dpmod X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 12:25:34 -0000 Author: danfe Date: Sun May 12 12:25:33 2013 New Revision: 317950 URL: http://svnweb.freebsd.org/changeset/ports/317950 Log: Cleanup Makefile; drop maintainership. Modified: head/games/quake-dpmod/Makefile Modified: head/games/quake-dpmod/Makefile ============================================================================== --- head/games/quake-dpmod/Makefile Sun May 12 12:15:23 2013 (r317949) +++ head/games/quake-dpmod/Makefile Sun May 12 12:25:33 2013 (r317950) @@ -1,9 +1,5 @@ -# New ports collection makefile for: quake-dpmod -# Date created: 14 Sep 2005 -# Whom: Alejandro Pulver -# +# Created by: Alejandro Pulver # $FreeBSD$ -# PORTNAME= dpmod PORTVERSION= 20071120 @@ -13,7 +9,7 @@ MASTER_SITES= http://offload1.icculus.or PKGNAMEPREFIX= ${Q1PKGNAMEPREFIX} DISTNAME= darkplacesmod${PORTVERSION} -MAINTAINER= danfe@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Quake 1 modification (for DarkPlaces) RUN_DEPENDS= ${LOCALBASE}/share/darkplaces/dummy:${PORTSDIR}/games/darkplaces @@ -26,16 +22,13 @@ DATADIR= ${Q1DIR}/${PORTNAME} post-extract: # Remove CVS directories - @${FIND} ${WRKDIR} -type d -name CVS -print0 | \ - ${XARGS} -0 ${RM} -rf - + @${FIND} ${WRKDIR} -type d -name CVS -print0 | ${XARGS} -0 ${RM} -rf # Fix permissions @${CHMOD} go-w ${WRKDIR}/dpmod/progs.dat do-install: - ${MKDIR} ${DATADIR} - ${CP} -R ${WRKSRC}/dpmod/* ${DATADIR} + @${MKDIR} ${DATADIR} + ${CP} -a ${WRKSRC}/dpmod/* ${DATADIR} .include "${.CURDIR}/../quake-data/Makefile.include" - .include From owner-svn-ports-all@FreeBSD.ORG Sun May 12 12:26:32 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id C3C24C88; Sun, 12 May 2013 12:26:32 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id B367A983; Sun, 12 May 2013 12:26:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4CCQW0i092863; Sun, 12 May 2013 12:26:32 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4CCQWsk092860; Sun, 12 May 2013 12:26:32 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201305121226.r4CCQWsk092860@svn.freebsd.org> From: Bryan Drewery Date: Sun, 12 May 2013 12:26:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317951 - head/x11/yad X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 12:26:32 -0000 Author: bdrewery Date: Sun May 12 12:26:32 2013 New Revision: 317951 URL: http://svnweb.freebsd.org/changeset/ports/317951 Log: - Update to 0.21.0 PR: ports/178487 Submitted by: Danilo Egea Gondolfo (maintainer) Modified: head/x11/yad/Makefile head/x11/yad/distinfo Modified: head/x11/yad/Makefile ============================================================================== --- head/x11/yad/Makefile Sun May 12 12:25:33 2013 (r317950) +++ head/x11/yad/Makefile Sun May 12 12:26:32 2013 (r317951) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= yad -PORTVERSION= 0.20.3 +PORTVERSION= 0.21.0 CATEGORIES= x11 gnome MASTER_SITES= GOOGLE_CODE Modified: head/x11/yad/distinfo ============================================================================== --- head/x11/yad/distinfo Sun May 12 12:25:33 2013 (r317950) +++ head/x11/yad/distinfo Sun May 12 12:26:32 2013 (r317951) @@ -1,2 +1,2 @@ -SHA256 (yad-0.20.3.tar.xz) = aead4eff25ccfa9348213d70aeab0a07ac093950bbdbb74dd58b05e39918f52a -SIZE (yad-0.20.3.tar.xz) = 218640 +SHA256 (yad-0.21.0.tar.xz) = 0ad7efd06bc1b89949821ffbd0ddc3d9586ef1279ce06a3d1222903edf2a36fe +SIZE (yad-0.21.0.tar.xz) = 217796 From owner-svn-ports-all@FreeBSD.ORG Sun May 12 12:40:31 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 2707778; Sun, 12 May 2013 12:40:31 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 1A0119E8; Sun, 12 May 2013 12:40:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4CCeU1X098541; Sun, 12 May 2013 12:40:30 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4CCeU1P098540; Sun, 12 May 2013 12:40:30 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201305121240.r4CCeU1P098540@svn.freebsd.org> From: Eitan Adler Date: Sun, 12 May 2013 12:40:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317952 - head/x11/xbindkeys X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 12:40:31 -0000 Author: eadler Date: Sun May 12 12:40:30 2013 New Revision: 317952 URL: http://svnweb.freebsd.org/changeset/ports/317952 Log: Prefer the more common option 'TCL' for scripting support and use the global description Modified: head/x11/xbindkeys/Makefile Modified: head/x11/xbindkeys/Makefile ============================================================================== --- head/x11/xbindkeys/Makefile Sun May 12 12:26:32 2013 (r317951) +++ head/x11/xbindkeys/Makefile Sun May 12 12:40:30 2013 (r317952) @@ -11,8 +11,7 @@ COMMENT= Allows you to launch shell comm LICENSE= GPLv2 -OPTIONS_DEFINE= GUILE TCLTK -TCLTK_DESC= Tcl Scripting Support +OPTIONS_DEFINE= GUILE TCL USE_XORG= x11 xi GNU_CONFIGURE= yes @@ -35,7 +34,7 @@ LIB_DEPENDS+= guile:${PORTSDIR}/lang/gui CONFIGURE_ARGS+= --disable-guile .endif -.if ${PORT_OPTIONS:MTCLTK} +.if ${PORT_OPTIONS:MTCL} RUN_DEPENDS+= wish8.4:${PORTSDIR}/x11-toolkits/tk84 MAN1+= xbindkeys_show.1 PLIST_FILES+= bin/xbindkeys_show From owner-svn-ports-all@FreeBSD.ORG Sun May 12 12:45:20 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id E721B1B5; Sun, 12 May 2013 12:45:19 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id DA1F1A05; Sun, 12 May 2013 12:45:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4CCjJCV099490; Sun, 12 May 2013 12:45:19 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4CCjIBR099487; Sun, 12 May 2013 12:45:18 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201305121245.r4CCjIBR099487@svn.freebsd.org> From: Alexey Dokuchaev Date: Sun, 12 May 2013 12:45:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317953 - head/games/quake2-relay X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 12:45:20 -0000 Author: danfe Date: Sun May 12 12:45:18 2013 New Revision: 317953 URL: http://svnweb.freebsd.org/changeset/ports/317953 Log: - Convert old-school Makefile header to the new style - Define LICENSE (GPLv2) - Convert misused PLIST_FILES (too many of them) into pkg-plist - Cleanup Makefile, NOPORTDOCS -> PORT_OPTIONS:MDOCS - Remove defunct URL from port description (WWW: line) Added: head/games/quake2-relay/pkg-plist (contents, props changed) Modified: head/games/quake2-relay/Makefile head/games/quake2-relay/pkg-descr Modified: head/games/quake2-relay/Makefile ============================================================================== --- head/games/quake2-relay/Makefile Sun May 12 12:40:30 2013 (r317952) +++ head/games/quake2-relay/Makefile Sun May 12 12:45:18 2013 (r317953) @@ -1,9 +1,5 @@ -# New ports collection makefile for: Q2 Relay -# Date created: 23 Mar 2006 -# Whom: Alexey Dokuchaev -# +# Created by: Alexey Dokuchaev # $FreeBSD$ -# PORTNAME= relay PORTVERSION= 0.4 @@ -16,22 +12,20 @@ DISTNAME= relay-${PORTVERSION}.src MAINTAINER= danfe@FreeBSD.org COMMENT= Quake II multi-view demo recording facility +LICENSE= GPLv2 + USE_GMAKE= yes MAKE_ARGS= MODE=release OBJ_DIR=. OUT_DIR=. Q2MODULE=game.so \ QUAKE2_DIR="${Q2DIR}" BIN_DIR="${PREFIX}/bin" \ CC="${CC}" CFLAGS="${CFLAGS}" WRKSRC= ${WRKDIR}/relay-${PORTVERSION} - -PLIST_FILES= bin/democonv bin/dm2server \ - %%Q2DIR%%/release/game.so \ - %%Q2DIR%%/proxy/relay/game.so \ - %%Q2DIR%%/proxy/replay/game.so -PLIST_DIRS= %%Q2DIR%%/proxy/replay %%Q2DIR%%/proxy/relay \ - %%Q2DIR%%/proxy %%Q2DIR%%/release PORTDOCS= FAQ README -.include +OPTIONS_DEFINE= DOCS + +.include "${.CURDIR}/../quake2-data/Makefile.include" +.include .if ${ARCH} == "amd64" || ${ARCH} == "ia64" CFLAGS+= -fPIC @@ -45,18 +39,16 @@ post-patch: .SILENT ${WRKSRC}/common/mem.c cd ${WRKSRC}/common && ${SH} -c 'for i in *.h; do \ ${ECHO_CMD} >> $${i}; done' - # Reorganize #include's (use /bin/ed to avoid a patch) +# Reorganize #include's (use /bin/ed to avoid a patch) ${ECHO_CMD} -e '35t30\n36d\nwq' | ${ED} -s ${WRKSRC}/common/net.h ${ECHO_CMD} -e '9t7\n10d\nwq' | ${ED} -s ${WRKSRC}/common/net.c post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/FAQ ${WRKSRC}/README ${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR} .endif ED?= /bin/ed -.include "${.CURDIR}/../quake2-data/Makefile.include" - -.include +.include Modified: head/games/quake2-relay/pkg-descr ============================================================================== --- head/games/quake2-relay/pkg-descr Sun May 12 12:40:30 2013 (r317952) +++ head/games/quake2-relay/pkg-descr Sun May 12 12:45:18 2013 (r317953) @@ -13,5 +13,3 @@ Benefits of Relay: - No lag - Smaller and easier than many separate demos - Many different viewing options - -WWW: http://www.planetquake.com/relay/ Added: head/games/quake2-relay/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/quake2-relay/pkg-plist Sun May 12 12:45:18 2013 (r317953) @@ -0,0 +1,9 @@ +bin/democonv +bin/dm2server +%%Q2DIR%%/release/game.so +%%Q2DIR%%/proxy/relay/game.so +%%Q2DIR%%/proxy/replay/game.so +@dirrm %%Q2DIR%%/proxy/replay +@dirrm %%Q2DIR%%/proxy/relay +@dirrm %%Q2DIR%%/proxy +@dirrm %%Q2DIR%%/release From owner-svn-ports-all@FreeBSD.ORG Sun May 12 12:48:59 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id AC61F3C9; Sun, 12 May 2013 12:48:59 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 9DEE4A33; Sun, 12 May 2013 12:48:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4CCmwqu000274; Sun, 12 May 2013 12:48:58 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4CCmwm1000272; Sun, 12 May 2013 12:48:58 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201305121248.r4CCmwm1000272@svn.freebsd.org> From: Alexey Dokuchaev Date: Sun, 12 May 2013 12:48:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317954 - head/games/quake3-ut X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 12:48:59 -0000 Author: danfe Date: Sun May 12 12:48:58 2013 New Revision: 317954 URL: http://svnweb.freebsd.org/changeset/ports/317954 Log: - Provide working mirror in MASTER_SITES and thus unbreak fetch - Sanitize NO_PACKAGE and move it to more appropriate place Modified: head/games/quake3-ut/Makefile head/games/quake3-ut/distinfo Modified: head/games/quake3-ut/Makefile ============================================================================== --- head/games/quake3-ut/Makefile Sun May 12 12:45:18 2013 (r317953) +++ head/games/quake3-ut/Makefile Sun May 12 12:48:58 2013 (r317954) @@ -4,23 +4,25 @@ PORTNAME= ut PORTVERSION= 3.7 CATEGORIES= games -MASTER_SITES= ftp://ftp.snt.utwente.nl/pub/games/urbanterror/ +MASTER_SITES= http://bigfoot.morphos-team.net/misc/Quake3Mods/ PKGNAMEPREFIX= ${Q3PKGNAMEPREFIX} -DISTNAME= urbanTerror${PORTVERSION:S/.//}_full +DISTNAME= UrbanTerror${PORTVERSION:S/.//}_full MAINTAINER= ports@FreeBSD.org COMMENT= Quake III Arena mod: Urban Terror +NO_PACKAGE= package will be 445MB, set FORCE_PACKAGE if you really want it + USE_ZIP= yes USE_CRLF= yes -NO_BUILD= yes -NO_WRKSUBDIR= yes -NO_PACKAGE= "Distfile is \>256MB\; define FORCE_PACKAGE if you really want this." .if defined(.PARSEDIR) USE_GMAKE= yes .endif +NO_BUILD= yes +NO_WRKSUBDIR= yes DATADIR= ${Q3DIR}/${PORTNAME} + PORT_OPTIONS= DOCS .include "${.CURDIR}/../quake3-data/Makefile.include" Modified: head/games/quake3-ut/distinfo ============================================================================== --- head/games/quake3-ut/distinfo Sun May 12 12:45:18 2013 (r317953) +++ head/games/quake3-ut/distinfo Sun May 12 12:48:58 2013 (r317954) @@ -1,2 +1,2 @@ -SHA256 (urbanTerror37_full.zip) = a14083baabe0984f83618df8635c94a255e5344822ae926bec72f8424109fada -SIZE (urbanTerror37_full.zip) = 463853743 +SHA256 (UrbanTerror37_full.zip) = a14083baabe0984f83618df8635c94a255e5344822ae926bec72f8424109fada +SIZE (UrbanTerror37_full.zip) = 463853743 From owner-svn-ports-all@FreeBSD.ORG Sun May 12 13:00:09 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 963D6683; Sun, 12 May 2013 13:00:09 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 885BBA93; Sun, 12 May 2013 13:00:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4CD09MY004063; Sun, 12 May 2013 13:00:09 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4CD08hQ004053; Sun, 12 May 2013 13:00:08 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201305121300.r4CD08hQ004053@svn.freebsd.org> From: Alexey Dokuchaev Date: Sun, 12 May 2013 13:00:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317955 - in head/games: quake3-data quake3-excessive quake3-freezetag quake3-ra3 quake3-ut quake3-wfa X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 13:00:09 -0000 Author: danfe Date: Sun May 12 13:00:07 2013 New Revision: 317955 URL: http://svnweb.freebsd.org/changeset/ports/317955 Log: Cleanup quake3-data a bit more: - Remove USE_CRLF knob: instead, when extracting ZIP archives, ask it to convert text files to Unix style. This should be no-op change, as all consumers of USE_CRLF also USE_ZIP - While here, remove unneeded output redirection in `do-extract' target Modified: head/games/quake3-data/Makefile head/games/quake3-data/Makefile.include head/games/quake3-excessive/Makefile head/games/quake3-freezetag/Makefile head/games/quake3-ra3/Makefile head/games/quake3-ut/Makefile head/games/quake3-wfa/Makefile Modified: head/games/quake3-data/Makefile ============================================================================== --- head/games/quake3-data/Makefile Sun May 12 12:48:58 2013 (r317954) +++ head/games/quake3-data/Makefile Sun May 12 13:00:07 2013 (r317955) @@ -37,8 +37,8 @@ PLIST_SUB+= TEAMARENA="@comment " do-extract: @${RM} -rf ${WRKDIR} @${MKDIR} ${WRKDIR} - @cd ${WRKDIR} && ${TAIL} +356 ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \ - ${TAR} zxf - >/dev/null + @cd ${WRKDIR} && ${TAIL} +356 \ + ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | ${TAR} xzf - do-install: @${MKDIR} ${DATADIR} Modified: head/games/quake3-data/Makefile.include ============================================================================== --- head/games/quake3-data/Makefile.include Sun May 12 12:48:58 2013 (r317954) +++ head/games/quake3-data/Makefile.include Sun May 12 13:00:07 2013 (r317955) @@ -16,14 +16,7 @@ SUB_LIST+= Q3DIR="${Q3DIR}" RUN_DEPENDS+= ${Q3DIR}/baseq3/pak1.pk3:${PORTSDIR}/games/quake3-data .endif -.if defined(USE_CRLF) -. if defined(USE_ZIP) +# When extracting ZIP archives, ask it to convert text files to Unix style +.if defined(USE_ZIP) EXTRACT_BEFORE_ARGS= -aqo -. else -pre-patch: - @${FIND} ${WRKDIR} -type f -print0 | \ - ${XARGS} -0 ${FILE} | ${GREP} 'CRLF' | \ - ${SED} -e "s/:.*//" | ${SED} -e 's/ /\\ /g' | \ - ${XARGS} ${REINPLACE_CMD} -i "" -e "s/`${PRINTF} '\r'`$$//" -. endif .endif Modified: head/games/quake3-excessive/Makefile ============================================================================== --- head/games/quake3-excessive/Makefile Sun May 12 12:48:58 2013 (r317954) +++ head/games/quake3-excessive/Makefile Sun May 12 13:00:07 2013 (r317955) @@ -19,7 +19,6 @@ COMMENT= Quake III Arena Mod: Excessive WRKSRC= ${WRKDIR}/${PORTNAME} USE_ZIP= yes -USE_CRLF= yes NO_BUILD= yes DATADIR= ${Q3DIR}/${PORTNAME} Modified: head/games/quake3-freezetag/Makefile ============================================================================== --- head/games/quake3-freezetag/Makefile Sun May 12 12:48:58 2013 (r317954) +++ head/games/quake3-freezetag/Makefile Sun May 12 13:00:07 2013 (r317955) @@ -20,7 +20,6 @@ COMMENT= Quake III Arena Mod: Freeze Tag WRKSRC= ${WRKDIR}/freeze USE_ZIP= yes -USE_CRLF= yes NO_BUILD= yes DATADIR= ${Q3DIR}/${PORTNAME} Modified: head/games/quake3-ra3/Makefile ============================================================================== --- head/games/quake3-ra3/Makefile Sun May 12 12:48:58 2013 (r317954) +++ head/games/quake3-ra3/Makefile Sun May 12 13:00:07 2013 (r317955) @@ -11,10 +11,9 @@ DISTNAME= ${PORTNAME}${PORTVERSION:S/.// MAINTAINER= ports@FreeBSD.org COMMENT= Quake III Arena mod: Rocket Arena 3 -NO_PACKAGE= Package will be 131MB, set FORCE_PACKAGE if you really want it +NO_PACKAGE= package will be 131MB, set FORCE_PACKAGE if you really want it USE_ZIP= yes -USE_CRLF= yes NO_BUILD= yes WRKSRC= ${WRKDIR}/arena Modified: head/games/quake3-ut/Makefile ============================================================================== --- head/games/quake3-ut/Makefile Sun May 12 12:48:58 2013 (r317954) +++ head/games/quake3-ut/Makefile Sun May 12 13:00:07 2013 (r317955) @@ -14,7 +14,6 @@ COMMENT= Quake III Arena mod: Urban Terr NO_PACKAGE= package will be 445MB, set FORCE_PACKAGE if you really want it USE_ZIP= yes -USE_CRLF= yes .if defined(.PARSEDIR) USE_GMAKE= yes .endif Modified: head/games/quake3-wfa/Makefile =====