3 files changed, 5 insertions, 50 deletions

diff --git a/print/a2ps-letter/Makefile b/print/a2ps-letter/Makefile
index cd44bde83f1a..e3057f91ae9c 100644
--- a/print/a2ps-letter/Makefile
+++ b/print/a2ps-letter/Makefile
@@ -3,11 +3,11 @@
 # Date created:         15 July 1998
 # Whom:                 Chuck Robey (chuckr@freebsd.org)
 #
-# $Id: Makefile,v 1.23 1998/11/22 01:56:20 obrien Exp $
+# $Id: Makefile,v 1.24 1998/11/22 07:45:42 chuckr Exp $
 #
 
-DISTNAME=	a2ps-4.10.4
-PKGNAME=	a2ps-${PAPERSIZE}-4.10.4
+DISTNAME=	a2ps-4.12
+PKGNAME=	a2ps-${PAPERSIZE}-4.12
 CATEGORIES=	print
 MASTER_SITES=	http://www-inf.enst.fr/~demaille/ftp/a2ps/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} sheets.map.fixed
@@ -21,7 +21,7 @@ MAN1=		a2ps.1 ogonkify.1 card.1 psmandup.1 fixps.1 pdiff.1
 PAPERSIZE?=	letter
 PAPERSIZECNF=	${PAPERSIZE:S/l/L/:S/a/A/}
 STRIP=
-CONFIGURE_ARGS=	--with-medium=${PAPERSIZECNF}
+CONFIGURE_ARGS=	--with-medium=${PAPERSIZECNF} --sharedstatedir=$(PREFIX)/share/a2ps --sysconfdir=$(PREFIX)/share/a2ps --datadir=$(PREFIX)/share/a2ps --localstatedir=$(PREFIX)/share/a2ps
 
 .if ${PAPERSIZE} != a4 && ${PAPERSIZE} != letter && ${PAPERSIZE} != letterdj
 .BEGIN:
@@ -37,7 +37,6 @@ post-extract:
 	$(CP) $(DISTDIR)/sheets.map.fixed $(WRKSRC)/sheets/sheets.map
 
 post-install:
-	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 	strip ${PREFIX}/bin/a2ps
 	(cd ${WRKSRC}/doc; ${MAKE} install)
 	$(RM) -f $(PREFIX)/lib/liba2ps.la
diff --git a/print/a2ps-letter/distinfo b/print/a2ps-letter/distinfo
index 4b4586e901e3..3296af6da075 100644
--- a/print/a2ps-letter/distinfo
+++ b/print/a2ps-letter/distinfo
@@ -1,2 +1,2 @@
-MD5 (a2ps-4.10.4.tar.gz) = e976c3502e347d323164a5d40c03f17a
+MD5 (a2ps-4.12.tar.gz) = f9e8331f5834525a2178b267b14dfa57
 MD5 (sheets.map.fixed) = d9abef250f395791e934bf788f5fe6d1
diff --git a/print/a2ps-letter/files/patch-ae b/print/a2ps-letter/files/patch-ae
deleted file mode 100644
index 6fcd582b6f76..000000000000
--- a/print/a2ps-letter/files/patch-ae
+++ /dev/null
@@ -1,44 +0,0 @@
---- auxdir/ltmain.sh.orig	Sat Sep 19 10:47:03 1998
-+++ auxdir/ltmain.sh	Sat Sep 19 10:51:53 1998
-@@ -972,6 +972,16 @@
-         versuffix="$current.$revision"
-         ;;
- 
-+      freebsd)
-+	version_vars="$version_vars major versuffix"
-+	major="$current"
-+	if [ $PORTOBJFORMAT = elf ]; then
-+	versuffix="$current"
-+	else
-+	versuffix="$current.$revision"
-+	fi
-+	;;
-+
-       *)
-         $echo "$modename: unknown library version type \`$version_type'" 1>&2
-         echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
---- auxdir/ltconfig.orig	Sat Sep 19 10:46:55 1998
-+++ auxdir/ltconfig	Sat Sep 19 10:50:30 1998
-@@ -1155,10 +1155,21 @@
-   finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
-   ;;
- 
--freebsd2* | freebsd3*)
-+freebsd2*)
-   version_type=sunos
-   library_names_spec='${libname}${release}.so.$versuffix $libname.so'
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+freebsd3* | freebsd4*)
-+  version_type=freebsd
-+  library_names_spec='${libname}${release}.so.$versuffix $libname.so'
-+  if [ $PORTOBJFORMAT = elf ]; then
-+  finish_cmds='PATH="\$PATH:/sbin" OBJFORMAT="$PORTOBJFORMAT" ldconfig -m $libdir'
-+  else
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+  fi
-   shlibpath_var=LD_LIBRARY_PATH
-   ;;
-