aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Alonso Cardenas Marquez <acm@FreeBSD.org>2006-09-25 21:05:50 +0000
committerJose Alonso Cardenas Marquez <acm@FreeBSD.org>2006-09-25 21:05:50 +0000
commit8b58df389bbc9e4cec1501d3f55cb16b88987ad2 (patch)
tree73990b1ec1b5b440777976f1ef3894e5894c6d7e
parentf33b28ca83980e9376361bf3003c6c12c7f2b6e0 (diff)
downloadports-8b58df389bbc9e4cec1501d3f55cb16b88987ad2.tar.gz
ports-8b58df389bbc9e4cec1501d3f55cb16b88987ad2.zip
- Add a clean solution to compile devel/fpc-fcl, using OPT and removing the rtl
and packages directories from WRKSRC - Bump devel/fpc-fcl PORTREVISION Submitted by: Ales Katona <almindor__at__gmail.com> (via email) Modified by: me
Notes
Notes: svn path=/head/; revision=173830
-rw-r--r--devel/fpc-fcl-base/Makefile4
-rw-r--r--devel/fpc-fcl-base/fpc-fcl/Makefile4
-rw-r--r--devel/fpc-fcl-db/Makefile4
-rw-r--r--devel/fpc-fcl-fpcunit/Makefile4
-rw-r--r--devel/fpc-fcl-image/Makefile4
-rw-r--r--devel/fpc-fcl-net/Makefile4
-rw-r--r--devel/fpc-fcl-passrc/Makefile4
-rw-r--r--devel/fpc-fcl-registry/Makefile4
-rw-r--r--devel/fpc-fcl-web/Makefile4
-rw-r--r--devel/fpc-fcl-xml/Makefile4
-rw-r--r--devel/fpc-fcl/Makefile4
-rw-r--r--lang/fpc/Makefile.units5
12 files changed, 26 insertions, 23 deletions
diff --git a/devel/fpc-fcl-base/Makefile b/devel/fpc-fcl-base/Makefile
index 19228eaa498c..05f7a1eadb91 100644
--- a/devel/fpc-fcl-base/Makefile
+++ b/devel/fpc-fcl-base/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl
@@ -32,6 +32,6 @@ BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc \
UNITSDIR= ${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/${PKGNAMESUFFIX:S/-//}
-EXTRACTUNITDIR+= ${WRKUNITDIR} ${FPCSRCDIR}/rtl ${FPCSRCDIR}/packages/base
+EXTRACTUNITDIR+= ${WRKUNITDIR}
.include "${MASTERDIR}/Makefile"
diff --git a/devel/fpc-fcl-base/fpc-fcl/Makefile b/devel/fpc-fcl-base/fpc-fcl/Makefile
index 19228eaa498c..05f7a1eadb91 100644
--- a/devel/fpc-fcl-base/fpc-fcl/Makefile
+++ b/devel/fpc-fcl-base/fpc-fcl/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl
@@ -32,6 +32,6 @@ BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc \
UNITSDIR= ${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/${PKGNAMESUFFIX:S/-//}
-EXTRACTUNITDIR+= ${WRKUNITDIR} ${FPCSRCDIR}/rtl ${FPCSRCDIR}/packages/base
+EXTRACTUNITDIR+= ${WRKUNITDIR}
.include "${MASTERDIR}/Makefile"
diff --git a/devel/fpc-fcl-db/Makefile b/devel/fpc-fcl-db/Makefile
index 19228eaa498c..05f7a1eadb91 100644
--- a/devel/fpc-fcl-db/Makefile
+++ b/devel/fpc-fcl-db/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl
@@ -32,6 +32,6 @@ BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc \
UNITSDIR= ${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/${PKGNAMESUFFIX:S/-//}
-EXTRACTUNITDIR+= ${WRKUNITDIR} ${FPCSRCDIR}/rtl ${FPCSRCDIR}/packages/base
+EXTRACTUNITDIR+= ${WRKUNITDIR}
.include "${MASTERDIR}/Makefile"
diff --git a/devel/fpc-fcl-fpcunit/Makefile b/devel/fpc-fcl-fpcunit/Makefile
index 19228eaa498c..05f7a1eadb91 100644
--- a/devel/fpc-fcl-fpcunit/Makefile
+++ b/devel/fpc-fcl-fpcunit/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl
@@ -32,6 +32,6 @@ BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc \
UNITSDIR= ${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/${PKGNAMESUFFIX:S/-//}
-EXTRACTUNITDIR+= ${WRKUNITDIR} ${FPCSRCDIR}/rtl ${FPCSRCDIR}/packages/base
+EXTRACTUNITDIR+= ${WRKUNITDIR}
.include "${MASTERDIR}/Makefile"
diff --git a/devel/fpc-fcl-image/Makefile b/devel/fpc-fcl-image/Makefile
index 19228eaa498c..05f7a1eadb91 100644
--- a/devel/fpc-fcl-image/Makefile
+++ b/devel/fpc-fcl-image/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl
@@ -32,6 +32,6 @@ BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc \
UNITSDIR= ${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/${PKGNAMESUFFIX:S/-//}
-EXTRACTUNITDIR+= ${WRKUNITDIR} ${FPCSRCDIR}/rtl ${FPCSRCDIR}/packages/base
+EXTRACTUNITDIR+= ${WRKUNITDIR}
.include "${MASTERDIR}/Makefile"
diff --git a/devel/fpc-fcl-net/Makefile b/devel/fpc-fcl-net/Makefile
index 19228eaa498c..05f7a1eadb91 100644
--- a/devel/fpc-fcl-net/Makefile
+++ b/devel/fpc-fcl-net/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl
@@ -32,6 +32,6 @@ BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc \
UNITSDIR= ${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/${PKGNAMESUFFIX:S/-//}
-EXTRACTUNITDIR+= ${WRKUNITDIR} ${FPCSRCDIR}/rtl ${FPCSRCDIR}/packages/base
+EXTRACTUNITDIR+= ${WRKUNITDIR}
.include "${MASTERDIR}/Makefile"
diff --git a/devel/fpc-fcl-passrc/Makefile b/devel/fpc-fcl-passrc/Makefile
index 19228eaa498c..05f7a1eadb91 100644
--- a/devel/fpc-fcl-passrc/Makefile
+++ b/devel/fpc-fcl-passrc/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl
@@ -32,6 +32,6 @@ BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc \
UNITSDIR= ${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/${PKGNAMESUFFIX:S/-//}
-EXTRACTUNITDIR+= ${WRKUNITDIR} ${FPCSRCDIR}/rtl ${FPCSRCDIR}/packages/base
+EXTRACTUNITDIR+= ${WRKUNITDIR}
.include "${MASTERDIR}/Makefile"
diff --git a/devel/fpc-fcl-registry/Makefile b/devel/fpc-fcl-registry/Makefile
index 19228eaa498c..05f7a1eadb91 100644
--- a/devel/fpc-fcl-registry/Makefile
+++ b/devel/fpc-fcl-registry/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl
@@ -32,6 +32,6 @@ BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc \
UNITSDIR= ${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/${PKGNAMESUFFIX:S/-//}
-EXTRACTUNITDIR+= ${WRKUNITDIR} ${FPCSRCDIR}/rtl ${FPCSRCDIR}/packages/base
+EXTRACTUNITDIR+= ${WRKUNITDIR}
.include "${MASTERDIR}/Makefile"
diff --git a/devel/fpc-fcl-web/Makefile b/devel/fpc-fcl-web/Makefile
index 19228eaa498c..05f7a1eadb91 100644
--- a/devel/fpc-fcl-web/Makefile
+++ b/devel/fpc-fcl-web/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl
@@ -32,6 +32,6 @@ BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc \
UNITSDIR= ${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/${PKGNAMESUFFIX:S/-//}
-EXTRACTUNITDIR+= ${WRKUNITDIR} ${FPCSRCDIR}/rtl ${FPCSRCDIR}/packages/base
+EXTRACTUNITDIR+= ${WRKUNITDIR}
.include "${MASTERDIR}/Makefile"
diff --git a/devel/fpc-fcl-xml/Makefile b/devel/fpc-fcl-xml/Makefile
index 19228eaa498c..05f7a1eadb91 100644
--- a/devel/fpc-fcl-xml/Makefile
+++ b/devel/fpc-fcl-xml/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl
@@ -32,6 +32,6 @@ BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc \
UNITSDIR= ${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/${PKGNAMESUFFIX:S/-//}
-EXTRACTUNITDIR+= ${WRKUNITDIR} ${FPCSRCDIR}/rtl ${FPCSRCDIR}/packages/base
+EXTRACTUNITDIR+= ${WRKUNITDIR}
.include "${MASTERDIR}/Makefile"
diff --git a/devel/fpc-fcl/Makefile b/devel/fpc-fcl/Makefile
index 19228eaa498c..05f7a1eadb91 100644
--- a/devel/fpc-fcl/Makefile
+++ b/devel/fpc-fcl/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl
@@ -32,6 +32,6 @@ BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc \
UNITSDIR= ${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/${PKGNAMESUFFIX:S/-//}
-EXTRACTUNITDIR+= ${WRKUNITDIR} ${FPCSRCDIR}/rtl ${FPCSRCDIR}/packages/base
+EXTRACTUNITDIR+= ${WRKUNITDIR}
.include "${MASTERDIR}/Makefile"
diff --git a/lang/fpc/Makefile.units b/lang/fpc/Makefile.units
index 87c11b134c85..386c97aec9fc 100644
--- a/lang/fpc/Makefile.units
+++ b/lang/fpc/Makefile.units
@@ -95,7 +95,10 @@ HAVE_EXAMPLES= true
.endif
.if ${PKGNAMESUFFIX} == "-fcl"
-OPT+=-Fi../ -Fu${PREFIX}/lib/${PORTNAME}/${PORTVERSION}/units/${BUILDNAME}/*
+OPT= -Fuunits/${ARCH}-freebsd -Fu../units/${ARCH}-freebsd \
+ -Fuxml/units/${ARCH}-freebsd -Fu../xml/units/${ARCH}-freebsd \
+ -Fudb/units/${ARCH}-freebsd -Fu../db/units/${ARCH}-freebsd \
+ -Fu../../units/${ARCH}-freebsd -Fu../passrc/units/${ARCH}-freebsd
HAVE_EXAMPLES= true
.endif