summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoragc <agc>1998-02-23 11:47:07 +0000
committeragc <agc>1998-02-23 11:47:07 +0000
commitf04ab337a2786e9acede06e093a983b83ad99fb9 (patch)
tree4fe30e37dd8939d8f22028e39451fcb06d94c94a
parent35e678e80d80d948628b3ba7a822a7f8a2ab083e (diff)
downloadpkgsrc-f04ab337a2786e9acede06e093a983b83ad99fb9.tar.gz
Back out explicit inclusion of /etc/mk.conf. It's not necessary.
-rw-r--r--print/a2ps/Makefile82
1 files changed, 25 insertions, 57 deletions
diff --git a/print/a2ps/Makefile b/print/a2ps/Makefile
index 384170d7012..630009234c9 100644
--- a/print/a2ps/Makefile
+++ b/print/a2ps/Makefile
@@ -3,7 +3,7 @@
# Date created: 18 August 1997
# Whom: Chuck Robey (chuckr@freebsd.org)
#
-# $NetBSD: Makefile,v 1.5 1998/02/22 17:11:53 frueauf Exp $
+# $NetBSD: Makefile,v 1.6 1998/02/23 11:47:07 agc Exp $
# FreeBSD Id: Makefile,v 1.12 1998/02/15 21:24:42 steve Exp
#
@@ -17,71 +17,39 @@ MAINTAINER= chuckr@FreeBSD.org
GNU_CONFIGURE= yes
MAN1= a2ps.1 ogonkify.1
-# Include local make config file here. It is essential to have this
-# precede any override targets (those that override defaults in
-# <bsd.port.mk> that test variables that may be set here. Note that
-# this inclusion is otherwise redundant, since <bsd.port.mk> includes
-# <bsd.own.mk>, which includes it.
-
-OPSYS!= uname -s
-.if (${OPSYS} == "FreeBSD")
-.if exists(/etc/make.conf)
-.include "/etc/make.conf"
-.endif
-.else
-.if exists(/etc/mk.conf)
-.include "/etc/mk.conf"
-.endif
-.endif
-
-PAPERSIZE?=
STRIP=
CONFIGURE_ARGS+= --with-medium=${PAPERSIZE}
CONFIGURE_ENV+= LPR=lpr
ALL_TARGET= all PAPERSIZE=${PAPERSIZE}
-Letter::
- $(MAKE) PAPERSIZE=Letter
-
-letter::
- $(MAKE) PAPERSIZE=Letter
-
-Letterdj::
- $(MAKE) PAPERSIZE=Letterdj
-
-letterdj::
- $(MAKE) PAPERSIZE=Letterdj
-
-A4::
- $(MAKE) PAPERSIZE=A4
-
-a4::
- $(MAKE) PAPERSIZE=A4
-
pre-build:
${TOUCH} ${WRKSRC}/doc/*.info
${TOUCH} ${WRKSRC}/doc/*.dvi
-pre-extract:
-.if empty(PAPERSIZE)
- @${ECHO}
- @${ECHO} "PAPERSIZE not specified."
- @${ECHO}
- @${ECHO} "Must specify PAPERSIZE as one of A4, Letter, or Letterdj,"
- @${ECHO} "either using setenv, or via Makefile targets of the same"
- @${ECHO} "name. Note that each PAPERSIZE has a leading capital letter,"
- @${ECHO} "and Letterdj allows a slightly larger margins for DeskJets."
- @${FALSE}
-.elif $(PAPERSIZE)!=A4 && $(PAPERSIZE)!=Letter && $(PAPERSIZE)!=Letterdj
- @${ECHO}
- @${ECHO} "PAPERSIZE incorrect value: $(PAPERSIZE)."
- @${ECHO}
- @${ECHO} "Must specify PAPERSIZE as one of A4, Letter, or Letterdj,"
- @${ECHO} "either using setenv, or via Makefile targets of the same"
- @${ECHO} "name. Note that each PAPERSIZE has a leading capital letter,"
- @${ECHO} "and Letterdj allows a slightly larger margins for DeskJets."
- @${FALSE}
-.endif
+pre-configure:
+ @(case "X${PAPERSIZE}" in \
+ XA4|XLetter|XLetterdj) \
+ goodsize=yes; \
+ ;; \
+ X"") \
+ goodsize=no; \
+ ${ECHO} "PAPERSIZE not specified."; \
+ ;; \
+ *) \
+ goodsize=no; \
+ ${ECHO} "PAPERSIZE incorrect value: ${PAPERSIZE}."; \
+ ;; \
+ esac; \
+ if [ $$goodsize = "no" ]; then \
+ ${ECHO} ""; \
+ ${ECHO} "Must specify PAPERSIZE as one of A4, Letter,"; \
+ ${ECHO} "or Letterdj, either in the environment, or "; \
+ ${ECHO} "via Makefile definitions of the same name. "; \
+ ${ECHO} "Note that each PAPERSIZE has a leading "; \
+ ${ECHO} "capital letter, and Letterdj allows a "; \
+ ${ECHO} "slightly larger margins for DeskJets."; \
+ ${FALSE}; \
+ fi)
.include <bsd.port.mk>