diff options
| author | fjoe <fjoe@FreeBSD.org> | 2006-04-28 04:37:25 +0800 |
|---|---|---|
| committer | fjoe <fjoe@FreeBSD.org> | 2006-04-28 04:37:25 +0800 |
| commit | 4f1e7a9ef947ba1180b5648a3fbcf16f293b8fd4 (patch) | |
| tree | e090a424272f4490222053a09b6697547fec9bd6 /net/openh323 | |
| parent | 7b7934c14119be0e9b1e983cc67daaed862e5c3e (diff) | |
| download | freebsd-ports-gnome-4f1e7a9ef947ba1180b5648a3fbcf16f293b8fd4.tar.gz freebsd-ports-gnome-4f1e7a9ef947ba1180b5648a3fbcf16f293b8fd4.tar.zst freebsd-ports-gnome-4f1e7a9ef947ba1180b5648a3fbcf16f293b8fd4.zip | |
- Check for LOCALBASE, not for PREFIX. This fixes dependent port
build with overridden PREFIX
- Bump PORTREVISION
Approved by: MAINTAINER
Diffstat (limited to 'net/openh323')
| -rw-r--r-- | net/openh323/Makefile | 1 | ||||
| -rw-r--r-- | net/openh323/files/patch-openh323u.mak.in | 22 |
2 files changed, 13 insertions, 10 deletions
diff --git a/net/openh323/Makefile b/net/openh323/Makefile index ecf2896602eb..320d37495a39 100644 --- a/net/openh323/Makefile +++ b/net/openh323/Makefile @@ -7,6 +7,7 @@ PORTNAME= openh323 PORTVERSION= 1.18.0 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://www.voxgratia.org/releases/ DISTNAME= ${PORTNAME}-v${PORTVERSION:S/./_/g}-src- diff --git a/net/openh323/files/patch-openh323u.mak.in b/net/openh323/files/patch-openh323u.mak.in index e68b8c4420b9..8fc762274799 100644 --- a/net/openh323/files/patch-openh323u.mak.in +++ b/net/openh323/files/patch-openh323u.mak.in @@ -1,5 +1,5 @@ ---- openh323u.mak.in.orig Tue Mar 7 15:45:47 2006 -+++ openh323u.mak.in Tue Mar 7 15:50:52 2006 +--- openh323u.mak.in.orig Mon Jan 3 12:25:51 2005 ++++ openh323u.mak.in Wed Apr 26 11:37:40 2006 @@ -163,7 +163,15 @@ # @@ -16,26 +16,28 @@ STDCCFLAGS += @STDCCFLAGS@ LDFLAGS += @LDFLAGS@ LDLIBS += @LDLIBS@ -@@ -197,12 +205,19 @@ +@@ -197,11 +205,18 @@ #OH323_SUPPRESS_H235 = 1 OH323_SRCDIR = $(OPENH323DIR)/src +-ifdef PREFIX +-OH323_INCDIR = $(PREFIX)/include/openh323 + - ifdef PREFIX - OH323_INCDIR = $(PREFIX)/include/openh323 -+OH323_LIBDIR = $(PREFIX)/lib ++ifdef LOCALBASE ++OH323_INCDIR = $(LOCALBASE)/include/openh323 ++OH323_LIBDIR = $(LOCALBASE)/lib else OH323_INCDIR = $(OPENH323DIR)/include - endif # PREFIX - +-endif # PREFIX ++endif # LOCALBASE ++ +ifdef BUILDTIME +OH323_INCDIR = ${OPENH323DIR}/include +OH323_LIBDIR = $(OPENH323DIR)/lib +endif #BUILDTIME -+ + ifndef OH323_LIBDIR OH323_LIBDIR = $(OPENH323DIR)/lib - endif # OH323_LIBDIR @@ -216,7 +231,7 @@ OH323_SUFFIX = $(OBJ_SUFFIX) endif # NOTRACE |