diff options
| author | lev <lev@FreeBSD.org> | 2004-04-11 03:23:24 +0800 |
|---|---|---|
| committer | lev <lev@FreeBSD.org> | 2004-04-11 03:23:24 +0800 |
| commit | 3e0f1e4d3550c758791d0a8049f3327e168b7dbf (patch) | |
| tree | 06466686eb966271e4a60fad067e8a01489b9a9f | |
| parent | 15a5e63c9743d3bab058bb2af57023e9517a9313 (diff) | |
| download | freebsd-ports-gnome-3e0f1e4d3550c758791d0a8049f3327e168b7dbf.tar.gz freebsd-ports-gnome-3e0f1e4d3550c758791d0a8049f3327e168b7dbf.tar.zst freebsd-ports-gnome-3e0f1e4d3550c758791d0a8049f3327e168b7dbf.zip | |
Ooops... Garbaged makefile was committed. I'm very sorry about this.
Fixed.
| -rw-r--r-- | devel/apr/Makefile | 7 | ||||
| -rw-r--r-- | devel/apr0/Makefile | 7 | ||||
| -rw-r--r-- | devel/apr1/Makefile | 7 | ||||
| -rw-r--r-- | devel/apr2/Makefile | 7 |
4 files changed, 0 insertions, 28 deletions
diff --git a/devel/apr/Makefile b/devel/apr/Makefile index 31febb4fbac7..d6dbcdc3f663 100644 --- a/devel/apr/Makefile +++ b/devel/apr/Makefile @@ -45,13 +45,6 @@ APR_UTIL_CONF_ARGS= --with-apr=../apr-${PORTVERSION} \ .include <bsd.port.pre.mk> -<<<<<<< Makefile -#.if ${OSVERSION} < 500000 -#BROKEN= "Configure fails on 4.x" -#.endif - -======= ->>>>>>> 1.37 .if defined(APR_UTIL_WITHOUT_THREADS) CONFIGURE_ARGS+= --disable-threads APR_UTIL_CONF_ARGS+= --disable-threads diff --git a/devel/apr0/Makefile b/devel/apr0/Makefile index 31febb4fbac7..d6dbcdc3f663 100644 --- a/devel/apr0/Makefile +++ b/devel/apr0/Makefile @@ -45,13 +45,6 @@ APR_UTIL_CONF_ARGS= --with-apr=../apr-${PORTVERSION} \ .include <bsd.port.pre.mk> -<<<<<<< Makefile -#.if ${OSVERSION} < 500000 -#BROKEN= "Configure fails on 4.x" -#.endif - -======= ->>>>>>> 1.37 .if defined(APR_UTIL_WITHOUT_THREADS) CONFIGURE_ARGS+= --disable-threads APR_UTIL_CONF_ARGS+= --disable-threads diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile index 31febb4fbac7..d6dbcdc3f663 100644 --- a/devel/apr1/Makefile +++ b/devel/apr1/Makefile @@ -45,13 +45,6 @@ APR_UTIL_CONF_ARGS= --with-apr=../apr-${PORTVERSION} \ .include <bsd.port.pre.mk> -<<<<<<< Makefile -#.if ${OSVERSION} < 500000 -#BROKEN= "Configure fails on 4.x" -#.endif - -======= ->>>>>>> 1.37 .if defined(APR_UTIL_WITHOUT_THREADS) CONFIGURE_ARGS+= --disable-threads APR_UTIL_CONF_ARGS+= --disable-threads diff --git a/devel/apr2/Makefile b/devel/apr2/Makefile index 31febb4fbac7..d6dbcdc3f663 100644 --- a/devel/apr2/Makefile +++ b/devel/apr2/Makefile @@ -45,13 +45,6 @@ APR_UTIL_CONF_ARGS= --with-apr=../apr-${PORTVERSION} \ .include <bsd.port.pre.mk> -<<<<<<< Makefile -#.if ${OSVERSION} < 500000 -#BROKEN= "Configure fails on 4.x" -#.endif - -======= ->>>>>>> 1.37 .if defined(APR_UTIL_WITHOUT_THREADS) CONFIGURE_ARGS+= --disable-threads APR_UTIL_CONF_ARGS+= --disable-threads |