diff options
| author | Mark Linimon <linimon@FreeBSD.org> | 2006-06-27 19:39:17 +0000 |
|---|---|---|
| committer | Mark Linimon <linimon@FreeBSD.org> | 2006-06-27 19:39:17 +0000 |
| commit | 394661711c91212416bed29ea11bb02f8f359298 (patch) | |
| tree | 0ee53fd6fd534db5ad9e6251e87c75728bb3158b /ports-mgmt | |
| parent | 56136a652958b42b96e6f08ec4678ba2ceeb84db (diff) | |
| download | freebsd-ports-394661711c91212416bed29ea11bb02f8f359298.zip | |
Reflect its currrent state of bsd.port.mk after the last 2 checkins:
- 97406 (ghostscript refactoring) was removed from the -exp run due to errors
- 95841 (remove legacy code) was backed out after commit, due to its still
being needed for kdelibs3 among others
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/portmk/Mk/bsd.port.mk | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/ports-mgmt/portmk/Mk/bsd.port.mk b/ports-mgmt/portmk/Mk/bsd.port.mk index 20cd1338213d..fcfb8dfd8737 100644 --- a/ports-mgmt/portmk/Mk/bsd.port.mk +++ b/ports-mgmt/portmk/Mk/bsd.port.mk @@ -2002,19 +2002,23 @@ CONFIGURE_ARGS+=--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include # Set the default for the installation of Postscript(TM)- # compatible functionality. -.if !defined(GHOSTSCRIPT_PORT) +.if !defined(WITHOUT_X11) .if defined(WITH_GHOSTSCRIPT_AFPL) -GHOSTSCRIPT_PORT= print/ghostscript-afpl +GHOSTSCRIPT_PORT?= print/ghostscript-afpl .elif defined(WITH_GHOSTSCRIPT_GPL) -GHOSTSCRIPT_PORT= print/ghostscript-gpl +GHOSTSCRIPT_PORT?= print/ghostscript-gpl .else -GHOSTSCRIPT_PORT= print/ghostscript-gnu +GHOSTSCRIPT_PORT?= print/ghostscript-gnu +.endif +.else +.if defined(WITH_GHOSTSCRIPT_AFPL) +GHOSTSCRIPT_PORT?= print/ghostscript-afpl-nox11 +.elif defined(WITH_GHOSTSCRIPT_GPL) +GHOSTSCRIPT_PORT?= print/ghostscript-gpl-nox11 +.else +GHOSTSCRIPT_PORT?= print/ghostscript-gnu-nox11 .endif - -.if !defined(WITHOUT_X11) -GHOSTSCRIPT_PORT:= ${GHOSTSCRIPT_PORT}-nox11 .endif -.endif #!defined GHOSTSCRIPT_PORT # Set up the ghostscript dependencies. .if defined(USE_GHOSTSCRIPT) || defined(USE_GHOSTSCRIPT_BUILD) @@ -3099,6 +3103,12 @@ DEPENDS_TARGET= install DEPENDS_TARGET+= clean DEPENDS_ARGS+= NOCLEANDEPENDS=yes .endif +.else +DEPENDS_ARGS+= FORCE_PKG_REGISTER=yes +.endif +.if defined(DEPENDS) +# pretty much guarantees overwrite of existing installation +.MAKEFLAGS: FORCE_PKG_REGISTER=yes .endif ################################################################ |