- Respect DESTDIR

- fix some portlint warnings

PR:		ports/101908
Submitted by:	Gea-Suan Lin <gslin_AT_gslin dot org>

2 files changed, 104 insertions, 103 deletions

diff --git a/chinese/xemacs/Makefile b/chinese/xemacs/Makefile
index 53638a0..abd914e 100644
--- a/chinese/xemacs/Makefile
+++ b/chinese/xemacs/Makefile
@@ -25,15 +25,15 @@ USE_XPM=	yes
 STRIP=
 HAS_CONFIGURE=	yes
 XEMACS_ARCH=	${MACHINE_ARCH}--freebsd
-CONFIGURE_ARGS=	${XEMACS_ARCH} --prefix=${PREFIX} \
+CONFIGURE_ARGS=	${XEMACS_ARCH} --prefix=${TARGETDIR} \
 		--with-mule \
 		--with-xfs \
 		--with-clash-detection \
 		--lockdir=/var/run/emacs/lock \
 		--with-sound=native \
-		--site-includes=${PREFIX}/include \
-		--site-libraries=${PREFIX}/lib \
-		--sitelispdir="${PREFIX}/lib/xemacs/site-lisp ${PREFIX}/share/emacs/site-lisp" \
+		--site-includes=${LOCALBASE}/include \
+		--site-libraries=${LOCALBASE}/lib \
+		--sitelispdir="${LOCALBASE}/lib/xemacs/site-lisp ${LOCALBASE}/share/emacs/site-lisp" \
 		--with-session=yes \
 		--with-menubars=lucid --with-xim=xlib
 MAN1=		ctags.1 etags.1 gnuattach.1 gnuclient.1 gnudoit.1 \
@@ -79,21 +79,21 @@ CONFIGURE_ARGS+=	--with-xface=no --with-offix=no
 
 post-install:
 .for file in b2m ctags etags gnuclient ${DISTNAME}
-	strip ${PREFIX}/bin/${file}
+	strip ${TARGETDIR}/bin/${file}
 .endfor
 # ``make install'' does not set the permissions like pkg_add does.
 	${CHMOD} 1777 /var/run/emacs/lock
-	${CHMOD} 755 ${PREFIX}/lib/xemacs/site-lisp
-	${CHMOD} 755 ${PREFIX}/share/emacs/site-lisp
-	${RM} -f ${PREFIX}/bin/send-pr
-	${RM} -f ${PREFIX}/lib/xemacs-20.4/lisp/mule/mule-init.el.orig
-# Install xemacs20.sh into ${PREFIX}/etc/rc.d
-	@if [ ! -d ${PREFIX}/etc/rc.d ]; then ${MKDIR} ${PREFIX}/etc/rc.d; fi
-	${INSTALL_SCRIPT} ${FILESDIR}/xemacs20.sh ${PREFIX}/etc/rc.d
+	${CHMOD} 755 ${TARGETDIR}/lib/xemacs/site-lisp
+	${CHMOD} 755 ${TARGETDIR}/share/emacs/site-lisp
+	${RM} -f ${TARGETDIR}/bin/send-pr
+	${RM} -f ${TARGETDIR}/lib/xemacs-20.4/lisp/mule/mule-init.el.orig
+# Install xemacs20.sh into ${TARGETDIR}/etc/rc.d
+	@if [ ! -d ${TARGETDIR}/etc/rc.d ]; then ${MKDIR} ${TARGETDIR}/etc/rc.d; fi
+	${INSTALL_SCRIPT} ${FILESDIR}/xemacs20.sh ${TARGETDIR}/etc/rc.d
 # Install Chinese Big5 related files.
-	@${MKDIR} ${PREFIX}/lib/xemacs-20.4/etc/app-defaults/zh_TW.Big5
-	@${INSTALL_DATA} ${FILESDIR}/Emacs ${PREFIX}/lib/xemacs-20.4/etc/app-defaults/zh_TW.Big5
-	@${INSTALL_DATA} ${FILESDIR}/sample.emacs ${PREFIX}/lib/xemacs-20.4/etc/app-defaults/zh_TW.Big5
+	@${MKDIR} ${TARGETDIR}/lib/xemacs-20.4/etc/app-defaults/zh_TW.Big5
+	@${INSTALL_DATA} ${FILESDIR}/Emacs ${TARGETDIR}/lib/xemacs-20.4/etc/app-defaults/zh_TW.Big5
+	@${INSTALL_DATA} ${FILESDIR}/sample.emacs ${TARGETDIR}/lib/xemacs-20.4/etc/app-defaults/zh_TW.Big5
 # Display XIM usages.
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/chinese/xemacs/pkg-plist b/chinese/xemacs/pkg-plist
index 16aa984..d9f6bf9 100644
--- a/chinese/xemacs/pkg-plist
+++ b/chinese/xemacs/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 bin/b2m
 bin/ctags
 bin/etags
@@ -3439,92 +3440,92 @@ lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/DOC
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/add-little-package.sh
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/add-big-package.sh
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/config.values
-@dirrm lib/xemacs-%%XEMACS_VER%%/etc/app-defaults/ja
-@dirrm lib/xemacs-%%XEMACS_VER%%/etc/app-defaults/zh_TW.Big5
-@dirrm lib/xemacs-%%XEMACS_VER%%/etc/app-defaults
-@dirrm lib/xemacs-%%XEMACS_VER%%/etc/auctex/style
-@dirrm lib/xemacs-%%XEMACS_VER%%/etc/auctex
-@dirrm lib/xemacs-%%XEMACS_VER%%/etc/custom
-@dirrm lib/xemacs-%%XEMACS_VER%%/etc/e
-@dirrm lib/xemacs-%%XEMACS_VER%%/etc/eos
-@dirrm lib/xemacs-%%XEMACS_VER%%/etc/frame-icon
-@dirrm lib/xemacs-%%XEMACS_VER%%/etc/gnats
-@dirrm lib/xemacs-%%XEMACS_VER%%/etc/gnus
-@dirrm lib/xemacs-%%XEMACS_VER%%/etc/gnusrefcard
-@dirrm lib/xemacs-%%XEMACS_VER%%/etc/idd
-@dirrm lib/xemacs-%%XEMACS_VER%%/etc/message
-@dirrm lib/xemacs-%%XEMACS_VER%%/etc/mine
-@dirrm lib/xemacs-%%XEMACS_VER%%/etc/mule
-@dirrm lib/xemacs-%%XEMACS_VER%%/etc/sgml/ISO_8879:1986/entities
-@dirrm lib/xemacs-%%XEMACS_VER%%/etc/sgml/ISO_8879:1986
-@dirrm lib/xemacs-%%XEMACS_VER%%/etc/sgml/cdtd
-@dirrm lib/xemacs-%%XEMACS_VER%%/etc/sgml
-@dirrm lib/xemacs-%%XEMACS_VER%%/etc/skk
-@dirrm lib/xemacs-%%XEMACS_VER%%/etc/smilies
-@dirrm lib/xemacs-%%XEMACS_VER%%/etc/sounds
-@dirrm lib/xemacs-%%XEMACS_VER%%/etc/sparcworks
-@dirrm lib/xemacs-%%XEMACS_VER%%/etc/tests/external-widget
-@dirrm lib/xemacs-%%XEMACS_VER%%/etc/tests
-@dirrm lib/xemacs-%%XEMACS_VER%%/etc/time
-@dirrm lib/xemacs-%%XEMACS_VER%%/etc/toolbar
-@dirrm lib/xemacs-%%XEMACS_VER%%/etc/vm
-@dirrm lib/xemacs-%%XEMACS_VER%%/etc/w3
-@dirrm lib/xemacs-%%XEMACS_VER%%/etc
-@dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%
-@dirrm lib/xemacs-%%XEMACS_VER%%/info
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/apel
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/auctex
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/bytecomp
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/calendar
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/cc-mode
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/cl
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/comint
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/custom
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/edebug
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/ediff
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/efs
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/egg
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/electric
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/emulators
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/eos
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/eterm
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/games
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/gnats
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/gnus
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/hm--html-menus
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/ilisp
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/iso
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/its
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/language
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/leim/quail
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/leim
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/locale/ja
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/locale
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/mailcrypt
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/mel
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/mh-e
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/modes
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/mu
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/mule
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/packages
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/pcl-cvs
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/prim
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/psgml
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/rmail
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/skk
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/sunpro
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/term
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/tl
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/tm
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/tooltalk
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/utils
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/vc
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/viper
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/vm
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/w3
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/x11
-@dirrm lib/xemacs-%%XEMACS_VER%%/lisp
-@dirrm lib/xemacs-%%XEMACS_VER%%
-@dirrm lib/xemacs/site-lisp
-@dirrm lib/xemacs
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/etc/app-defaults/ja
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/etc/app-defaults/zh_TW.Big5
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/etc/app-defaults
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/etc/auctex/style
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/etc/auctex
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/etc/custom
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/etc/e
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/etc/eos
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/etc/frame-icon
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/etc/gnats
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/etc/gnus
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/etc/gnusrefcard
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/etc/idd
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/etc/message
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/etc/mine
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/etc/mule
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/etc/sgml/ISO_8879:1986/entities
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/etc/sgml/ISO_8879:1986
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/etc/sgml/cdtd
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/etc/sgml
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/etc/skk
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/etc/smilies
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/etc/sounds
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/etc/sparcworks
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/etc/tests/external-widget
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/etc/tests
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/etc/time
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/etc/toolbar
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/etc/vm
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/etc/w3
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/etc
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/info
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp/apel
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp/auctex
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp/bytecomp
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp/calendar
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp/cc-mode
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp/cl
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp/comint
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp/custom
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp/edebug
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp/ediff
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp/efs
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp/egg
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp/electric
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp/emulators
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp/eos
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp/eterm
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp/games
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp/gnats
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp/gnus
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp/hm--html-menus
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp/ilisp
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp/iso
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp/its
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp/language
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp/leim/quail
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp/leim
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp/locale/ja
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp/locale
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp/mailcrypt
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp/mel
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp/mh-e
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp/modes
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp/mu
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp/mule
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp/packages
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp/pcl-cvs
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp/prim
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp/psgml
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp/rmail
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp/skk
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp/sunpro
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp/term
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp/tl
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp/tm
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp/tooltalk
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp/utils
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp/vc
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp/viper
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp/vm
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp/w3
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp/x11
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/lisp
+@dirrmtry lib/xemacs-%%XEMACS_VER%%
+@dirrmtry lib/xemacs/site-lisp
+@dirrmtry lib/xemacs
 @unexec rm -rf /var/run/xemacs