[pkgsrc/trunk]: pkgsrc/sysutils/mc Merge Makefile.common back into Makefile n...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a3882d61b062
branches:  trunk
changeset: 485753:a3882d61b062
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon Dec 20 15:58:27 2004 +0000

description:
Merge Makefile.common back into Makefile now that gmc is gone.

diffstat:

 sysutils/mc/Makefile        |  52 +++++++++++++++++++++++++++++++++++++++-----
 sysutils/mc/Makefile.common |  48 -----------------------------------------
 2 files changed, 46 insertions(+), 54 deletions(-)

diffs (120 lines):

diff -r b748cda88ab9 -r a3882d61b062 sysutils/mc/Makefile
--- a/sysutils/mc/Makefile      Mon Dec 20 15:49:25 2004 +0000
+++ b/sysutils/mc/Makefile      Mon Dec 20 15:58:27 2004 +0000
@@ -1,18 +1,58 @@
-# $NetBSD: Makefile,v 1.45 2004/11/12 05:20:43 erh Exp $
+# $NetBSD: Makefile,v 1.46 2004/12/20 15:58:27 wiz Exp $
 # FreeBSD Id: Makefile,v 1.16 1997/11/30 19:37:48 vanilla Exp
 #
 
+DISTNAME=              mc-4.5.51
 PKGREVISION=           5
+CATEGORIES=            sysutils
+MASTER_SITES+=         ${MASTER_SITE_GNOME:=stable/sources/mc/}
+
+MAINTAINER=            tech-pkg%NetBSD.org@localhost
+HOMEPAGE=              http://www.ibiblio.org/mc/
 COMMENT=               Midnight Commander, a free Norton Commander Clone
 
-CONFIGURE_ARGS+=       --without-x
+BUILD_USES_MSGFMT=     YES
+
+CONFLICTS+=            gmc-[0-9]*
+
+USE_BUILDLINK3=                YES
+USE_PKGLOCALEDIR=      YES
+USE_GNU_TOOLS+=                make
+
+GNU_CONFIGURE=         YES
+CONFIGURE_ARGS+=       --without-included-gettext
+CONFIGURE_ARGS+=       --with-netrc --with-included-slang
+CONFIGURE_ARGS+=       --with-samba
+CONFIGURE_ARGS+=       --without-gnome
+CONFIGURE_ARGS+=       --without-tk
 CONFIGURE_ARGS+=       --without-tm-x-support
-CONFIGURE_ARGS+=       --without-gnome
+CONFIGURE_ARGS+=       --without-x
+
+# Don't pick up readline if it's installed in the build environment.
+#
+CONFIGURE_ENV+=                ac_cv_header_history_h=no
+CONFIGURE_ENV+=                ac_cv_header_readline_h=no
+CONFIGURE_ENV+=                ac_cv_header_readline_history_h=no
+CONFIGURE_ENV+=                ac_cv_header_readline_readline_h=no
+
+CONFIGURE_ENV+=                LOCALBASE=${LOCALBASE:Q}
+CONFIGURE_ENV+=                PKGLOCALEDIR=${PKGLOCALEDIR:Q}
+
+LIBS+=                 -lm -ltermcap           # -lslang
+CPPFLAGS+=             -Dunix
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CFLAGS+= -DSunOS
+.endif
 
 # Remove unwanted directories in a non-GNOME installation.
 #
 post-install:
-       cd ${PREFIX}; ${RMDIR} -p share/idl 2>/dev/null || ${TRUE}
-       cd ${PREFIX}; ${RMDIR} -p share/pixmaps/mc 2>/dev/null || ${TRUE}
+       ${RMDIR} -p ${PREFIX}/share/idl 2>/dev/null || ${TRUE}
+       ${RMDIR} -p ${PREFIX}/share/pixmaps/mc 2>/dev/null || ${TRUE}
 
-.include "../../sysutils/mc/Makefile.common"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/glib/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff -r b748cda88ab9 -r a3882d61b062 sysutils/mc/Makefile.common
--- a/sysutils/mc/Makefile.common       Mon Dec 20 15:49:25 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-# $NetBSD: Makefile.common,v 1.24 2004/05/04 08:08:19 wiz Exp $
-
-DISTNAME=              mc-4.5.51
-CATEGORIES+=           sysutils
-MASTER_SITES+=         ${MASTER_SITE_GNOME:=stable/sources/mc/}
-
-MAINTAINER=            tech-pkg%NetBSD.org@localhost
-HOMEPAGE=              http://www.ibiblio.org/mc/
-
-BUILD_USES_MSGFMT=     yes
-
-CONFLICTS+=            mc-[0-9]* gmc-[0-9]*
-
-DISTINFO_FILE=         ${.CURDIR}/../../sysutils/mc/distinfo
-PATCHDIR=              ${.CURDIR}/../../sysutils/mc/patches
-
-USE_BUILDLINK3=                yes
-USE_PKGLOCALEDIR=      yes
-USE_GNU_TOOLS+=                make
-
-GNU_CONFIGURE=         # defined
-CONFIGURE_ARGS+=       --without-included-gettext
-CONFIGURE_ARGS+=       --with-netrc --with-included-slang
-CONFIGURE_ARGS+=       --with-samba
-CONFIGURE_ARGS+=       --without-tk
-
-# Don't pick up readline if it's installed in the build environment.
-#
-CONFIGURE_ENV+=                ac_cv_header_history_h=no
-CONFIGURE_ENV+=                ac_cv_header_readline_h=no
-CONFIGURE_ENV+=                ac_cv_header_readline_history_h=no
-CONFIGURE_ENV+=                ac_cv_header_readline_readline_h=no
-
-CONFIGURE_ENV+=                LOCALBASE="${LOCALBASE}"
-CONFIGURE_ENV+=                PKGLOCALEDIR="${PKGLOCALEDIR}"
-
-LIBS+=                 -lm -ltermcap           # -lslang
-CPPFLAGS+=             -Dunix
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-CFLAGS+= -DSunOS
-.endif
-
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/glib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"