[Midnightbsd-cvs] mports: Makefile: First pass at cleaning up the netbsdisms.

[laffer1 at midnightbsd.org]

Log Message:
-----------
First pass at cleaning up the netbsdisms.  This passes everything possible with portlint now.

Modified Files:
--------------
    mports/editors/linux-openoffice2:
        Makefile (r1.1 -> r1.2)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/editors/linux-openoffice2/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -L editors/linux-openoffice2/Makefile -L editors/linux-openoffice2/Makefile -u -r1.1 -r1.2
--- editors/linux-openoffice2/Makefile
+++ editors/linux-openoffice2/Makefile
@@ -5,24 +5,25 @@
 # $MidnightBSD$
 #
 
-PORTNAME=	openoffice2-linux
+PORTNAME=	openoffice2
 PORTVERSION=	${OO_RELEASE}
-DISTNAME=		OOo_${OO_RELEASE}_LinuxIntel_install_en-US
-CATEGORIES=		editors
-
+CATEGORIES=	editors linux
 MASTER_SITES=	${MASTER_SITE_OPENOFFICE:=stable/${OO_RELEASE}/}
+PKGNAMEPREFIX?=	linux-
+DISTNAME=		OOo_${OO_RELEASE}_LinuxIntel_install_en-US
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-MAINTAINER=		luke at midnightbsd.org
-COMMENT=		Integrated office productivity suite (binary pkg)
+MAINTAINER=	luke at midnightbsd.org
+COMMENT=	Integrated office productivity suite (binary pkg)
+LICENSE=	lgpl
 
 ONLY_FOR_ARCHS=	i386 amd64
 
+USE_GCPIO=	yes
 USE_LINUX=	yes
 USE_XLIB=	yes
 NO_BUILD=	yes
 
-
-
 OO_VER=			2.4
 OO_RELEASE=		2.4.0
 PLIST_SUBST+=		VER=${OO_VER:Q}
@@ -30,58 +31,44 @@
 FILES_SUBST+=		VER=${OO_VER:Q}
 
 TEMP?=			${WRKSRC}
-EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
+
 BUILD_DIRS=		# empty
 
-USE_GCPIO=      yes
-#USE_LINUX_RPM=  yes
-#LINUX_DIST_VER= 4
 RPM2CPIO?=              ${LOCALBASE}/bin/rpm2cpio
-
 BUILD_DEPENDS+=       ${RPM2CPIO}:${PORTSDIR}/archivers/rpm
-
 RC_CMD?=           ${RPM2CPIO}
 RC_AFTER_ARGS?=    | ${CPIO} -id --quiet
 
-
-
-EMUL_PKG_FMT=		rpm
-RPMFILES=		${WRKSRC}/RPMS/*.rpm
 RPMFILES= \
-openoffice.org-base-2.4.0-9286.i586.rpm \
-openoffice.org-calc-2.4.0-9286.i586.rpm \
-openoffice.org-core01-2.4.0-9286.i586.rpm \
-openoffice.org-core02-2.4.0-9286.i586.rpm \
-openoffice.org-core03-2.4.0-9286.i586.rpm \
-openoffice.org-core03u-2.4.0-9286.i586.rpm \
-openoffice.org-core04-2.4.0-9286.i586.rpm \
-openoffice.org-core04u-2.4.0-9286.i586.rpm \
-openoffice.org-core05-2.4.0-9286.i586.rpm \
-openoffice.org-core05u-2.4.0-9286.i586.rpm \
-openoffice.org-core06-2.4.0-9286.i586.rpm \
-openoffice.org-core07-2.4.0-9286.i586.rpm \
-openoffice.org-core08-2.4.0-9286.i586.rpm \
-openoffice.org-core09-2.4.0-9286.i586.rpm \
-openoffice.org-core10-2.4.0-9286.i586.rpm \
-openoffice.org-draw-2.4.0-9286.i586.rpm \
-openoffice.org-emailmerge-2.4.0-9286.i586.rpm \
-openoffice.org-gnome-integration-2.4.0-9286.i586.rpm \
-openoffice.org-graphicfilter-2.4.0-9286.i586.rpm \
-openoffice.org-headless-2.4.0-9286.i586.rpm \
-openoffice.org-impress-2.4.0-9286.i586.rpm \
-openoffice.org-javafilter-2.4.0-9286.i586.rpm \
-openoffice.org-kde-integration-2.4.0-9286.i586.rpm \
-openoffice.org-math-2.4.0-9286.i586.rpm \
-openoffice.org-onlineupdate-2.4.0-9286.i586.rpm \
-openoffice.org-pyuno-2.4.0-9286.i586.rpm \
-openoffice.org-testtool-2.4.0-9286.i586.rpm \
-openoffice.org-writer-2.4.0-9286.i586.rpm \
-openoffice.org-xsltfilter-2.4.0-9286.i586.rpm
-
-RPM2PKG_PREFIX=		${PREFIX}
-RPM2PKG_SUBPREFIX=	# empty
-RPM2PKG_STAGE=		do-install
-RUN_LDCONFIG=		no
+	openoffice.org-base-2.4.0-9286.i586.rpm \
+	openoffice.org-calc-2.4.0-9286.i586.rpm \
+	openoffice.org-core01-2.4.0-9286.i586.rpm \
+	openoffice.org-core02-2.4.0-9286.i586.rpm \
+	openoffice.org-core03-2.4.0-9286.i586.rpm \
+	openoffice.org-core03u-2.4.0-9286.i586.rpm \
+	openoffice.org-core04-2.4.0-9286.i586.rpm \
+	openoffice.org-core04u-2.4.0-9286.i586.rpm \
+	openoffice.org-core05-2.4.0-9286.i586.rpm \
+	openoffice.org-core05u-2.4.0-9286.i586.rpm \
+	openoffice.org-core06-2.4.0-9286.i586.rpm \
+	openoffice.org-core07-2.4.0-9286.i586.rpm \
+	openoffice.org-core08-2.4.0-9286.i586.rpm \
+	openoffice.org-core09-2.4.0-9286.i586.rpm \
+	openoffice.org-core10-2.4.0-9286.i586.rpm \
+	openoffice.org-draw-2.4.0-9286.i586.rpm \
+	openoffice.org-emailmerge-2.4.0-9286.i586.rpm \
+	openoffice.org-gnome-integration-2.4.0-9286.i586.rpm \
+	openoffice.org-graphicfilter-2.4.0-9286.i586.rpm \
+	openoffice.org-headless-2.4.0-9286.i586.rpm \
+	openoffice.org-impress-2.4.0-9286.i586.rpm \
+	openoffice.org-javafilter-2.4.0-9286.i586.rpm \
+	openoffice.org-kde-integration-2.4.0-9286.i586.rpm \
+	openoffice.org-math-2.4.0-9286.i586.rpm \
+	openoffice.org-onlineupdate-2.4.0-9286.i586.rpm \
+	openoffice.org-pyuno-2.4.0-9286.i586.rpm \
+	openoffice.org-testtool-2.4.0-9286.i586.rpm \
+	openoffice.org-writer-2.4.0-9286.i586.rpm \
+	openoffice.org-xsltfilter-2.4.0-9286.i586.rpm
 
 WRKSRC=			${WRKDIR}/OOH680_m12_native_packed-1_en-US.9286
 
@@ -127,15 +114,15 @@
 	${MKDIR} ${WRKDIR}/oo
 
 do-install:
-	for file in ${RPMFILES}; do \
-	if !(cd ${WRKDIR}/oo && ${RC_CMD} ${WRKSRC}/RPMS/$$file ${RC_AFTER_ARGS});\
-                then \
+	for fi in ${RPMFILES}; do \
+	if !(cd ${WRKDIR}/oo && ${RC_CMD} ${WRKSRC}/RPMS/$$fi ${RC_AFTER_ARGS});\
+		then \
 			exit 1; \
-                fi \
+		fi \
 	done
 	if [ `${ID} -u` = 0 ]; then \
-                ${CHMOD} -R ug-s ${WRKDIR}/oo; \
-                ${CHOWN} -R 0:0 ${WRKDIR}/oo; \
+		 ${CHMOD} -R ug-s ${WRKDIR}/oo; \
+		${CHOWN} -R 0:0 ${WRKDIR}/oo; \
 	fi
 	${MV} ${WRKDIR}/oo/opt/openoffice.org2.4 ${PREFIX}