PERFORCE change 144806 for review
Alejandro Pulver
alepulver at FreeBSD.org
Mon Jul 7 02:20:31 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=144806
Change 144806 by alepulver at alepulver_deimos on 2008/07/07 02:20:06
Initial working version plus test port.
Affected files ...
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/README#1 add
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.fpc.mk#1 branch
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gcc.mk#2 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gecko.mk#1 branch
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gnome.mk#2 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gnustep.mk#2 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.licenses.mk#1 add
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.port.mk#2 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.ruby.mk#2 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.sites.mk#2 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/test-license-1/Makefile#1 add
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/test-license-1/distinfo#1 add
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/test-license-1/pkg-descr#1 add
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/test-license-1/pkg-plist#1 add
Differences ...
==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gcc.mk#2 (text+ko) ====
@@ -31,7 +31,7 @@
# If you are wondering what your port exactly does, use "make test-gcc"
# to see some debugging.
#
-# $FreeBSD: ports/Mk/bsd.gcc.mk,v 1.16 2008/05/05 23:26:30 gerald Exp $
+# $FreeBSD: ports/Mk/bsd.gcc.mk,v 1.17 2008/06/28 16:52:40 gerald Exp $
#
GCC_Include_MAINTAINER= gerald at FreeBSD.org
@@ -99,7 +99,9 @@
MAKE_ENV+= F77="${F77}" FC="${FC}" FFLAGS="${FFLAGS}"
.endif
+
.if defined(USE_GCC)
+
# See if we can use a later version
_USE_GCC:= ${USE_GCC:S/+//}
.if ${USE_GCC} != ${_USE_GCC}
@@ -190,21 +192,25 @@
.endfor
.undef V
-
.if defined(_GCC_BUILD_DEPENDS)
BUILD_DEPENDS+= ${_GCC_PORT_DEPENDS}:${PORTSDIR}/lang/${_GCC_BUILD_DEPENDS}
.endif
MAKE_ENV+= CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}"
+.endif
+# defined(USE_GCC)
+
+
test-gcc:
@echo USE_GCC=${USE_GCC}
+ @echo USE_FORTRAN=${USE_FORTRAN}
+.if defined(USE_GCC)
.if defined(_GCC_ORLATER)
@echo Port can use later versions.
.else
@echo Port cannot use later versions.
.endif
- @echo USE_FORTRAN=${USE_FORTRAN}
.for v in ${GCCVERSIONS}
@echo -n "GCC version: ${_GCCVERSION_${v}_V} "
.if defined(_GCC_FOUND${v})
@@ -214,7 +220,7 @@
# @echo ${v} - ${_GCC_FOUND${v}} - ${_GCCVERSION_${v}_L} to ${_GCCVERSION_${v}_R} - ${_GCCVERSION_${v}_V}
.endfor
@echo Using GCC version ${_USE_GCC}
+.endif
@echo CC=${CC} - CXX=${CXX} - CFLAGS=${CFLAGS}
@echo F77=${F77} - FC=${FC} - FFLAGS=${FFLAGS}
@echo BUILD_DEPENDS=${BUILD_DEPENDS}
-.endif
==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gnome.mk#2 (text+ko) ====
@@ -1,9 +1,9 @@
#-*- mode: Fundamental; tab-width: 4; -*-
# ex:ts=4
#
-# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.147 2008/05/29 16:34:11 mezz Exp $
+# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.148 2008/06/30 20:16:17 mezz Exp $
# $NetBSD: $
-# $MCom: ports/Mk/bsd.gnome.mk,v 1.447 2008/03/12 03:42:31 marcus Exp $
+# $MCom: ports-stable/Mk/bsd.gnome.mk,v 1.8 2008/06/16 21:35:56 mezz Exp $
#
# Please view me with 4 column tabs!
@@ -645,7 +645,7 @@
# Also, check to see if each component has a desktop requirement. If it does,
# and if the user's chosen desktop is not of the same version, mark the
# port as IGNORE.
-. for component in ${USE_GNOME}
+. for component in ${USE_GNOME:C/^([^:]+).*/\1/}
. if defined(GNOME_DESKTOP_VERSION) && \
defined(${component}_GNOME_DESKTOP_VERSION)
. if ${GNOME_DESKTOP_VERSION}!=${${component}_GNOME_DESKTOP_VERSION}
@@ -677,16 +677,21 @@
${PATCH_WRKSRC}/$$file; \
done;
.else
-. if ${USE_GNOME:Mltverhack}!="" || ${USE_GNOME:Mltasneededhack}!=""
+. if ${USE_GNOME:Mltverhack*}!="" || ${USE_GNOME:Mltasneededhack}!=""
IGNORE= cannot install: ${PORTNAME} uses the ltverhack and/or ltasneededhack GNOME components but does not use libtool
. endif
.endif
+.if ${USE_GNOME:Mltverhack\:*:C/^[^:]+:([^:]+).*/\1/}==""
+ltverhack_LIB_VERSION= major=.`expr $$current - $$age`
+.else
+ltverhack_LIB_VERSION= major=".${USE_GNOME:Mltverhack\:*:C/^[^:]+:([^:]+).*/\1/}"
+.endif
ltverhack_PATCH_DEPENDS=${LIBTOOL_DEPENDS}
ltverhack_PRE_PATCH= for file in gnome-ltmain.sh gnome-libtool; do \
if [ -f ${WRKDIR}/$$file ]; then \
${REINPLACE_CMD} -e \
- '/freebsd-elf)/,/;;/ s|major="\.$$current"|major=.`expr $$current - $$age`|; \
+ '/freebsd-elf)/,/;;/ s|major="\.$$current"|${ltverhack_LIB_VERSION}|; \
/freebsd-elf)/,/;;/ s|versuffix="\.$$current"|versuffix="$$major"|' \
${WRKDIR}/$$file; \
fi; \
@@ -703,9 +708,9 @@
# Then traverse through all components, check which of them
# exist in ${_USE_GNOME} and set variables accordingly
.ifdef _USE_GNOME
-. if ${USE_GNOME:Mltverhack}!= "" || ${USE_GNOME:Mltasneededhack}!= ""
+. if ${USE_GNOME:Mltverhack*}!= "" || ${USE_GNOME:Mltasneededhack}!= ""
GNOME_PRE_PATCH+= ${lthacks_PRE_PATCH}
-.endif
+. endif
. for component in ${_USE_GNOME_ALL}
. if ${_USE_GNOME:M${component}}!=""
PATCH_DEPENDS+= ${${component}_PATCH_DEPENDS}
==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gnustep.mk#2 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: ports/Mk/bsd.gnustep.mk,v 1.49 2008/05/04 21:13:21 dinoex Exp $
+# $FreeBSD: ports/Mk/bsd.gnustep.mk,v 1.50 2008/06/20 15:13:50 dinoex Exp $
#
# This file contains some variable definitions that are supposed to
# make your life easier when dealing with ports related to the GNUstep.
@@ -266,7 +266,7 @@
#
.if defined(USE_GNUSTEP_BACK)
.if defined(WITH_GNUSTEP_DEVEL)
-BACKSUFFIX?= -013
+BACKSUFFIX?= -014
.else
BACKSUFFIX?= -012
.endif
==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.port.mk#2 (text+ko) ====
@@ -1,7 +1,7 @@
#-*- mode: makefile; tab-width: 4; -*-
# ex:ts=4
#
-# $FreeBSD: ports/Mk/bsd.port.mk,v 1.593 2008/05/27 22:12:02 miwi Exp $
+# $FreeBSD: ports/Mk/bsd.port.mk,v 1.595 2008/06/30 20:16:17 mezz Exp $
# $NetBSD: $
#
# bsd.port.mk - 940820 Jordan K. Hubbard.
@@ -423,6 +423,9 @@
# USE_EFL - If set, this port use EFL libraries.
# Implies inclusion of bsd.efl.mk. (Also see
# that file for more information on USE_EFL_*).
+# USE_FPC - If set, this port relies on the Free Pascal language.
+# Implies inclusion of bsd.fpc.mk. (Also see
+# that file for more information on WANT_FPC_*).
# USE_JAVA - If set, this port relies on the Java language.
# Implies inclusion of bsd.java.mk. (Also see
# that file for more information on USE_JAVA_*).
@@ -441,6 +444,9 @@
# (Also see that file for more information on
# USE_GNUSTEP_*).
##
+# USE_GECKO - If set, this port uses the Gecko/Mozilla product.
+# See bsd.gecko.mk for more details.
+##
# USE_GNOME - A list of the Gnome dependencies the port has (e.g.,
# glib12, gtk12). Implies that the port needs Gnome.
# Implies inclusion of bsd.gnome.mk. See bsd.gnome.mk
@@ -1462,6 +1468,10 @@
.include "${PORTSDIR}/Mk/bsd.efl.mk"
.endif
+.if defined(USE_FPC) || defined(WANT_FPC_BASE) || defined(WANT_FPC_ALL)
+.include "${PORTSDIR}/Mk/bsd.fpc.mk"
+.endif
+
.if defined(USE_JAVA)
.include "${PORTSDIR}/Mk/bsd.java.mk"
.endif
@@ -1490,6 +1500,10 @@
.include "${PORTSDIR}/Mk/bsd.qt.mk"
.endif
+.if defined(WANT_GECKO) || defined(USE_GECKO)
+.include "${PORTSDIR}/Mk/bsd.gecko.mk"
+.endif
+
.if defined(WANT_GNOME) || defined(USE_GNOME) || defined(USE_GTK)
.include "${PORTSDIR}/Mk/bsd.gnome.mk"
.endif
@@ -1999,6 +2013,10 @@
.include "${PORTSDIR}/Mk/bsd.autotools.mk"
.endif
+.if defined(WANT_GECKO) || defined(USE_GECKO)
+.include "${PORTSDIR}/Mk/bsd.gecko.mk"
+.endif
+
.if defined(WANT_GNOME) || defined(USE_GNOME) || defined(USE_GTK)
.include "${PORTSDIR}/Mk/bsd.gnome.mk"
.endif
@@ -2335,6 +2353,9 @@
ALL_TARGET?= all
INSTALL_TARGET?= install
+# Integrate with the license auditing framework
+.include "${PORTSDIR}/Mk/bsd.licenses.mk"
+
# Popular master sites
.include "bsd.sites.mk"
@@ -4064,15 +4085,15 @@
.endif
_SANITY_SEQ= ${_CHROOT_SEQ} pre-everything check-makefile check-categories \
check-makevars check-desktop-entries check-depends \
- check-deprecated check-vulnerable buildanyway-message \
- options-message
+ check-deprecated check-vulnerable check-license \
+ buildanyway-message options-message
_FETCH_DEP= check-sanity
_FETCH_SEQ= fetch-depends pre-fetch pre-fetch-script \
do-fetch post-fetch post-fetch-script
_EXTRACT_DEP= fetch
_EXTRACT_SEQ= extract-message checksum extract-depends pre-extract \
pre-extract-script do-extract \
- post-extract post-extract-script
+ post-extract post-extract-script ask-license
_PATCH_DEP= extract
_PATCH_SEQ= patch-message patch-depends patch-dos2unix pre-patch \
pre-patch-script do-patch post-patch post-patch-script
@@ -4089,7 +4110,7 @@
pre-install-script generate-plist check-already-installed
_INSTALL_SUSEQ= check-umask install-mtree pre-su-install \
pre-su-install-script do-install install-desktop-entries \
- post-install post-install-script add-plist-info \
+ install-license post-install post-install-script add-plist-info \
add-plist-docs add-plist-examples add-plist-data \
add-plist-post install-rc-script compress-man \
install-ldconfig-file fake-pkg security-check
@@ -5727,6 +5748,9 @@
${CAT} /tmp/${PKGNAME}-required-by >> ${PKG_DBDIR}/${PKGNAME}/+REQUIRED_BY; \
${RM} -f /tmp/${PKGNAME}-required-by; \
fi
+.if defined(REGISTER_LICENSE)
+# XXX concat prepared file to +CONTENTS (or directly use .if exists())
+.endif
.else
@${DO_NADA}
.endif
==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.ruby.mk#2 (text+ko) ====
@@ -3,7 +3,7 @@
#
# Created by: Akinori MUSHA <knu at FreeBSD.org>
#
-# $FreeBSD: ports/Mk/bsd.ruby.mk,v 1.168 2008/04/06 10:29:53 stas Exp $
+# $FreeBSD: ports/Mk/bsd.ruby.mk,v 1.170 2008/06/25 23:00:27 stas Exp $
#
.if !defined(Ruby_Include)
@@ -167,7 +167,7 @@
# Ruby 1.8
#
RUBY_RELVERSION= 1.8.6
-RUBY_PORTREVISION= 2
+RUBY_PORTREVISION= 4
RUBY_PORTEPOCH= 1
RUBY_PATCHLEVEL= 111
==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.sites.mk#2 (text+ko) ====
@@ -20,7 +20,7 @@
#
# Note: all entries should terminate with a slash.
#
-# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.451 2008/06/02 07:42:56 itetcu Exp $
+# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.453 2008/06/23 12:18:35 tdb Exp $
#
# Where to put distfiles that don't have any other master site
@@ -1184,9 +1184,9 @@
# List: http://dl.sv.gnu.org/releases/00_MIRRORS.html
.if !defined(IGNORE_MASTER_SITE_SAVANNAH)
MASTER_SITE_SAVANNAH+= \
- http://download.savannah.nongnu.org/releases/%SUBDIR%/ \
- http://www.de-mirrors.de/nongnu/%SUBDIR%/ \
+ http://download.savannah.gnu.org/releases/%SUBDIR%/ \
http://ftp.cc.uoc.gr/mirrors/nongnu.org/%SUBDIR%/ \
+ http://www.very-clever.com/download/nongnu/%SUBDIR%/ \
http://ftp.twaren.net/Unix/NonGNU/%SUBDIR%/ \
ftp://ftp.cc.uoc.gr/mirrors/nongnu.org/%SUBDIR%/ \
ftp://ftp.twaren.net/Unix/NonGNU/%SUBDIR%/
@@ -1306,8 +1306,6 @@
http://ftp.isu.edu.tw/pub/Linux/SuSE/%SUBDIR%/ \
ftp://ftp.mirrorservice.org/sites/ftp.suse.com/pub/suse/%SUBDIR%/ \
http://www.mirrorservice.org/sites/ftp.suse.com/pub/suse/%SUBDIR%/ \
- ftp://ftp.mirror.ac.uk/sites/ftp.suse.com/%SUBDIR%/ \
- http://download.mirror.ac.uk/sites/ftp.suse.com/%SUBDIR%/ \
ftp://ftp.kde.org/pub/suse/ftp.suse.com/suse/%SUBDIR%/ \
ftp://ftp.suse.com/pub/suse/%SUBDIR%/ \
ftp://ftp.softnet.tuc.gr/pub/linux/suse/suse/%SUBDIR%/ \
More information about the p4-projects
mailing list