svn commit: r339245 - in head/x11: bgrot bgrot/files deskpaint deskpaint/files imwheel imwheel/files keynav libdnd libdnd/files sselp xaniroc xascii xautolock xbanner xbanner/files xbrightness xcli...

Thu Jan 9 14:49:00 UTC 2014

Author: vanilla
Date: Thu Jan  9 14:48:54 2014
New Revision: 339245
URL: http://svnweb.freebsd.org/changeset/ports/339245

Log:
  Support stagedir.
  
  Approved by:	portmgr (blanket infrastructure)

Modified:
  head/x11/bgrot/Makefile
  head/x11/bgrot/files/patch-Makefile
  head/x11/bgrot/pkg-plist
  head/x11/deskpaint/Makefile
  head/x11/deskpaint/files/patch-Makefile
  head/x11/imwheel/Makefile
  head/x11/imwheel/files/patch-Makefile.in
  head/x11/imwheel/pkg-plist
  head/x11/keynav/Makefile
  head/x11/libdnd/Makefile
  head/x11/libdnd/files/patch-ab
  head/x11/libdnd/pkg-plist
  head/x11/sselp/Makefile
  head/x11/xaniroc/Makefile
  head/x11/xascii/Makefile
  head/x11/xautolock/Makefile
  head/x11/xbanner/Makefile
  head/x11/xbanner/files/patch-aa
  head/x11/xbrightness/Makefile
  head/x11/xclick/Makefile
  head/x11/xcut/Makefile
  head/x11/xidle/Makefile
  head/x11/xkbctrl/Makefile
  head/x11/xrestop/Makefile
  head/x11/xsnow/Makefile
  head/x11/xtacy/Makefile

Modified: head/x11/bgrot/Makefile
==============================================================================

--- head/x11/bgrot/Makefile	Thu Jan  9 14:40:14 2014	(r339244)
+++ head/x11/bgrot/Makefile	Thu Jan  9 14:48:54 2014	(r339245)
@@ -16,11 +16,4 @@ RUN_DEPENDS=	xv:${PORTSDIR}/graphics/xv
 USES=		shebangfix perl5
 SHEBANG_FILES=	*.pl
 
-MAN1=		bgrot.1
-MANCOMPRESSED=	yes
-
-NO_STAGE=	yes
-post-install:
-	@${CAT} pkg-message
-
 .include <bsd.port.mk>

Modified: head/x11/bgrot/files/patch-Makefile
==============================================================================
--- head/x11/bgrot/files/patch-Makefile	Thu Jan  9 14:40:14 2014	(r339244)
+++ head/x11/bgrot/files/patch-Makefile	Thu Jan  9 14:48:54 2014	(r339245)
@@ -1,5 +1,5 @@
---- Makefile.orig	Wed Jun 21 05:50:30 2000
-+++ Makefile	Fri Nov 25 17:13:07 2005
+--- Makefile.orig	2000-06-21 18:50:30.000000000 +0800
++++ Makefile	2014-01-09 21:37:58.000000000 +0800
 @@ -4,12 +4,13 @@
  # Written by Matthew Fuller <fullermd at over-yonder.net>
  
@@ -16,7 +16,7 @@
  
  # DIRMODE: Permission bits for directories
  # FILEMODE: Permission bits for files
-@@ -22,7 +23,7 @@
+@@ -22,7 +23,7 @@ BINOWN = bin
  BINGRP = bin
  
  # MANDIR: Where is your manpage base?
@@ -25,16 +25,27 @@
  
  # OK, that's about it for user stuff
  # Touch the rest of this file at your own risk
-@@ -52,7 +53,7 @@
+@@ -48,15 +49,15 @@ help: info
+ install:
+ 	@echo Installing...
+ .if !exists(${BINDIR})
+-	-mkdir -m ${DIRMODE} ${BINDIR}
++	-mkdir -m ${DIRMODE} $(DESTDIR)${BINDIR}
  .endif
  	@echo Installing files...
- 	-install -o ${BINOWN} -g ${BINGRP} -m ${FILEMODE} -c ${INSTALLFILES} ${BINDIR}
+-	-install -o ${BINOWN} -g ${BINGRP} -m ${FILEMODE} -c ${INSTALLFILES} ${BINDIR}
 -	-install -o ${BINOWN} -g ${BINGRP} -m ${FILEMODE} -c bgrot.conf ${CONFDIR}
-+	-install -o ${BINOWN} -g ${BINGRP} -m ${FILEMODE} -c bgrot.conf.skel ${CONFDIR}
++	-install -o ${BINOWN} -g ${BINGRP} -m ${FILEMODE} -c ${INSTALLFILES} $(DESTDIR)${BINDIR}
++	-install -o ${BINOWN} -g ${BINGRP} -m ${FILEMODE} -c bgrot.conf.skel $(DESTDIR)${CONFDIR}
  	@echo Compressing manpage...
  	@gzip -c bgrot.1 > bgrot.1.gz
  	@echo Installing manpage...
-@@ -88,7 +89,7 @@
+-	-install -o ${BINOWN} -g ${BINGRP} -m ${FILEMODE} -c bgrot.1.gz ${MANDIR}/man1
++	-install -o ${BINOWN} -g ${BINGRP} -m ${FILEMODE} -c bgrot.1.gz $(DESTDIR)${MANDIR}/man1
+ 	@echo Installation completed
+ 	@echo Read the file README for usage information
+ 
+@@ -88,7 +89,7 @@ uninstall:
  		rm -f ${BINDIR}/$${entry}; \
  	done
  	@echo Uninstalling configuration...

Modified: head/x11/bgrot/pkg-plist
==============================================================================
--- head/x11/bgrot/pkg-plist	Thu Jan  9 14:40:14 2014	(r339244)
+++ head/x11/bgrot/pkg-plist	Thu Jan  9 14:48:54 2014	(r339245)
@@ -1,7 +1,7 @@
 bin/background.sh
 bin/bgrandom.pl
+bin/bgrotman.pl
 bin/createlist.sh
 bin/masterlistgen.sh
-bin/bgrotman.pl
 etc/bgrot.conf.skel
 man/man1/bgrot.1.gz

Modified: head/x11/deskpaint/Makefile
==============================================================================
--- head/x11/deskpaint/Makefile	Thu Jan  9 14:40:14 2014	(r339244)
+++ head/x11/deskpaint/Makefile	Thu Jan  9 14:48:54 2014	(r339245)
@@ -15,5 +15,4 @@ PLIST_FILES=	bin/deskpaint
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-NO_STAGE=	yes
 .include <bsd.port.mk>

Modified: head/x11/deskpaint/files/patch-Makefile
==============================================================================
--- head/x11/deskpaint/files/patch-Makefile	Thu Jan  9 14:40:14 2014	(r339244)
+++ head/x11/deskpaint/files/patch-Makefile	Thu Jan  9 14:48:54 2014	(r339245)
@@ -1,5 +1,5 @@
---- Makefile.orig	2009-10-22 02:19:16.000000000 -0400
-+++ Makefile	2012-02-14 19:03:52.000000000 -0500
+--- Makefile.orig	2009-10-22 14:19:16.000000000 +0800
++++ Makefile	2014-01-09 21:39:59.000000000 +0800
 @@ -1,9 +1,10 @@
 -prefix  = /usr/local
 -XROOT   = /usr/X11R6
@@ -13,4 +13,4 @@
  		$(CC) $(CFLAGS) *.c -o deskpaint
  
 +install:
-+		${BSD_INSTALL_PROGRAM} -s deskpaint $(prefix)/bin
++		${BSD_INSTALL_PROGRAM} -s deskpaint $(DESTDIR)$(prefix)/bin

Modified: head/x11/imwheel/Makefile
==============================================================================
--- head/x11/imwheel/Makefile	Thu Jan  9 14:40:14 2014	(r339244)
+++ head/x11/imwheel/Makefile	Thu Jan  9 14:48:54 2014	(r339245)
@@ -18,9 +18,6 @@ USES=		gmake
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-gpm
 
-MAN1=		imwheel.1
-
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-patch:
@@ -30,8 +27,8 @@ post-patch:
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/EMACS ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/EMACS ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>

Modified: head/x11/imwheel/files/patch-Makefile.in
==============================================================================
--- head/x11/imwheel/files/patch-Makefile.in	Thu Jan  9 14:40:14 2014	(r339244)
+++ head/x11/imwheel/files/patch-Makefile.in	Thu Jan  9 14:48:54 2014	(r339245)
@@ -1,11 +1,24 @@
---- Makefile.in.orig    Sun Aug 29 06:36:33 2004
-+++ Makefile.in Sun Nov  7 08:30:31 2004
-@@ -215,7 +215,7 @@
+--- Makefile.in.orig	2004-08-29 18:36:33.000000000 +0800
++++ Makefile.in	2014-01-09 21:48:23.000000000 +0800
+@@ -215,7 +215,7 @@ imwheel_LDADD = @GETOPT_LIBS@ -L$(top_bu
  imwheel_DEPENDENCIES = imwheel.o util.o cfg.o jax/libjax.a
  man_MANS = imwheel.1
  EXTRA_DIST = BUGS FREEBSD EMACS M-BA47 BUGS see imwheel.1.html imwheel.1 TODO imwheelrc @extras_dist@ @mdump_dist@ lefty.sh imwheel.spec slack.sh
 -ETCDIR = /etc/X11/imwheel
 +ETCDIR = ${PREFIX}/etc
  all: config.h
-        $(MAKE) $(AM_MAKEFLAGS) all-recursive
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+ 
+@@ -782,9 +782,9 @@ install-exec-hook:
+ @SUID_TRUE@	chown @suid@ $$progname ; \
+ @SUID_TRUE@	chmod u+s $$progname
+ 	$(mkinstalldirs) $(ETCDIR)
+-	-[ -f /etc/imwheelrc ] && mv /etc/imwheelrc $(ETCDIR)/imwheelrc || true
+-	-[ -f /etc/X11/imwheelrc ] && mv /etc/X11/imwheelrc $(ETCDIR)/imwheelrc || true
+-	-[ -f $(ETCDIR)/imwheelrc ] && install -m 644 imwheelrc $(ETCDIR)/imwheelrc.new || install -m 644 imwheelrc $(ETCDIR)/imwheelrc
++	-[ -f /etc/imwheelrc ] && mv /etc/imwheelrc $(DESTDIR)$(ETCDIR)/imwheelrc || true
++	-[ -f /etc/X11/imwheelrc ] && mv /etc/X11/imwheelrc $(DESTDIR)$(ETCDIR)/imwheelrc || true
++	-[ -f $(ETCDIR)/imwheelrc ] && install -m 644 imwheelrc $(DESTDIR)$(ETCDIR)/imwheelrc.new || install -m 644 imwheelrc $(DESTDIR)$(ETCDIR)/imwheelrc
+ 
+ extras: $(EXTRA_PROGRAMS)
  

Modified: head/x11/imwheel/pkg-plist
==============================================================================
--- head/x11/imwheel/pkg-plist	Thu Jan  9 14:40:14 2014	(r339244)
+++ head/x11/imwheel/pkg-plist	Thu Jan  9 14:48:54 2014	(r339245)
@@ -1,5 +1,6 @@
 bin/imwheel
 etc/imwheelrc
-%%PORTDOCS%%%%DOCSDIR%%/README
+man/man1/imwheel.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/EMACS
+%%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%@dirrm %%DOCSDIR%%

Modified: head/x11/keynav/Makefile
==============================================================================
--- head/x11/keynav/Makefile	Thu Jan  9 14:40:14 2014	(r339244)
+++ head/x11/keynav/Makefile	Thu Jan  9 14:48:54 2014	(r339245)
@@ -20,14 +20,13 @@ USE_XORG=	xtst x11 xinerama
 PLIST_FILES=	bin/keynav
 PORTEXAMPLES=	keynavrc
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/keynav ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/keynav ${STAGEDIR}${PREFIX}/bin
 .if !defined(NOPORTEXAMPLES)
-	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/keynavrc ${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/keynavrc ${STAGEDIR}${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.post.mk>

Modified: head/x11/libdnd/Makefile
==============================================================================
--- head/x11/libdnd/Makefile	Thu Jan  9 14:40:14 2014	(r339244)
+++ head/x11/libdnd/Makefile	Thu Jan  9 14:48:54 2014	(r339245)
@@ -20,13 +20,12 @@ CPPFLAGS+=	-I${LOCALBASE}/include/
 LDFLAGS+=	-L${LOCALBASE}/lib/
 MAKE_JOBS_UNSAFE=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${PREFIX}/share/doc/libdnd
-	${INSTALL_MAN} ${WRKDIR}/DND/DNDdoc/* ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/libdnd
+	${INSTALL_MAN} ${WRKDIR}/DND/DNDdoc/* ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>

Modified: head/x11/libdnd/files/patch-ab
==============================================================================
--- head/x11/libdnd/files/patch-ab	Thu Jan  9 14:40:14 2014	(r339244)
+++ head/x11/libdnd/files/patch-ab	Thu Jan  9 14:48:54 2014	(r339245)
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Thu May 22 21:18:22 1997
-+++ Makefile.in	Sat Sep 26 21:59:37 1998
-@@ -13,6 +13,10 @@
+--- Makefile.in.orig	1997-05-23 10:18:22.000000000 +0800
++++ Makefile.in	2014-01-09 20:47:32.000000000 +0800
+@@ -13,6 +13,10 @@ LDFLAGS = @LDFLAGS@
  RANLIB = @RANLIB@
  
  LIBS = @LIBS@ @X_LIBS@ @X_PRE_LIBS@ -lXmu -lXaw -lXt -lX11 @X_EXTRA_LIBS@
@@ -11,7 +11,7 @@
  
  prefix = @prefix@
  exec_prefix = @exec_prefix@
-@@ -23,20 +33,30 @@
+@@ -23,20 +27,30 @@ COMPILE = $(CC) $(INCLUDES) $(CFLAGS) -c
  CXXCOMPILE = $(CXX) $(INCLUDES) $(CXXFLAGS) -c
  LINK = $(CC) $(LDFLAGS) -o $@
  
@@ -24,15 +24,17 @@
 +all: libC libCpp dndtest libC-so libCpp-so
  
  install: libCpp libC
- 	install -d $(INC_DIR)
+-	install -d $(INC_DIR)
 -	install DragAndDrop.h DragAndDropTypes.h $(INC_DIR)
-+	install -c -m 644 DragAndDrop.h DragAndDropTypes.h $(INC_DIR)
- 	install -d $(LIB_DIR)
+-	install -d $(LIB_DIR)
 -	install libDnd.a libDnd++.a $(LIB_DIR)
-+	install -c -m 644 libDnd.a libDnd++.a $(LIB_DIR)
-+	install -c $(DNDLIB) $(DNDPLUSLIB) $(LIB_DIR)
-+	ln -sf $(DNDLIB) $(LIB_DIR)/libDnd.so
-+	ln -sf $(DNDPLUSLIB) $(LIB_DIR)/libDnd++.so
++	install -d $(DESTDIR)$(INC_DIR)
++	install -c -m 644 DragAndDrop.h DragAndDropTypes.h $(DESTDIR)$(INC_DIR)
++	install -d $(DESTDIR)$(LIB_DIR)
++	install -c -m 644 libDnd.a libDnd++.a $(DESTDIR)$(LIB_DIR)
++	install -c $(DNDLIB) $(DNDPLUSLIB) $(DESTDIR)$(LIB_DIR)
++	cd $(DESTDIR)/$(LIB_DIR); ln -sf $(DNDLIB) libDnd.so
++	cd $(DESTDIR)/$(LIB_DIR); ln -sf $(DNDPLUSLIB) libDnd++.so
  
  libC: libDnd.a
  
@@ -45,7 +47,7 @@
  dndtest: dndtest.c libDnd.a
  	rm -f dndtest
  	$(COMPILE) dndtest.c
-@@ -57,6 +77,16 @@
+@@ -57,6 +71,16 @@ libDnd++.a: DragAndDrop.c
  	$(AR) cru libDnd++.a DragAndDrop.o
  	$(RANLIB) libDnd++.a
  

Modified: head/x11/libdnd/pkg-plist
==============================================================================
--- head/x11/libdnd/pkg-plist	Thu Jan  9 14:40:14 2014	(r339244)
+++ head/x11/libdnd/pkg-plist	Thu Jan  9 14:48:54 2014	(r339245)
@@ -1,14 +1,14 @@
 include/OffiX/DragAndDrop.h
 include/OffiX/DragAndDropTypes.h
-lib/libDnd.a
 lib/libDnd++.a
-lib/libDnd.so
-lib/libDnd.so.1
 lib/libDnd++.so
 lib/libDnd++.so.1
+lib/libDnd.a
+lib/libDnd.so
+lib/libDnd.so.1
 %%PORTDOCS%%%%DOCSDIR%%/DND.dvi
 %%PORTDOCS%%%%DOCSDIR%%/DNDa4.ps
 %%PORTDOCS%%%%DOCSDIR%%/DNDletter.ps
 %%PORTDOCS%%%%DOCSDIR%%/README
- at dirrm include/OffiX
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+ at dirrm include/OffiX

Modified: head/x11/sselp/Makefile
==============================================================================
--- head/x11/sselp/Makefile	Thu Jan  9 14:40:14 2014	(r339244)
+++ head/x11/sselp/Makefile	Thu Jan  9 14:48:54 2014	(r339245)
@@ -14,5 +14,4 @@ USE_XORG=	x11
 
 PLIST_FILES=	bin/sselp
 
-NO_STAGE=	yes
 .include <bsd.port.mk>

Modified: head/x11/xaniroc/Makefile
==============================================================================
--- head/x11/xaniroc/Makefile	Thu Jan  9 14:40:14 2014	(r339244)
+++ head/x11/xaniroc/Makefile	Thu Jan  9 14:48:54 2014	(r339245)
@@ -14,10 +14,8 @@ COMMENT=	Animate your root-cursor
 
 USES=		imake
 USE_XORG=	ice sm x11 xaw xext xmu xpm xt
-MAN1=		xaniroc.1
-PLIST_FILES=	bin/xaniroc
+PLIST_FILES=	bin/xaniroc man/man1/xaniroc.1.gz
 
-NO_STAGE=	yes
 post-extract:
 	${MV} ${WRKSRC}/manpage.1 ${WRKSRC}/xaniroc.man
 

Modified: head/x11/xascii/Makefile
==============================================================================
--- head/x11/xascii/Makefile	Thu Jan  9 14:40:14 2014	(r339244)
+++ head/x11/xascii/Makefile	Thu Jan  9 14:48:54 2014	(r339245)
@@ -15,8 +15,6 @@ COMMENT=	Display an ASCII table in decim
 MAKE_ARGS+=	PREFIX=${PREFIX}
 USES=		imake
 USE_XORG=	x11 xt xaw
-MAN1=		xascii.1
-PLIST_FILES=	bin/xascii
+PLIST_FILES=	bin/xascii man/man1/xascii.1.gz
 
-NO_STAGE=	yes
 .include <bsd.port.mk>

Modified: head/x11/xautolock/Makefile
==============================================================================
--- head/x11/xautolock/Makefile	Thu Jan  9 14:40:14 2014	(r339244)
+++ head/x11/xautolock/Makefile	Thu Jan  9 14:48:54 2014	(r339245)
@@ -21,8 +21,6 @@ XLOCK_DESC=	Force dependency on x11/xloc
 
 XLOCK_RUN_DEPENDS=	xlock:${PORTSDIR}/x11/xlockmore
 
-MAN1=		xautolock.1
-PLIST_FILES=	bin/xautolock
+PLIST_FILES=	bin/xautolock man/man1/xautolock.1.gz
 
-NO_STAGE=	yes
 .include <bsd.port.mk>

Modified: head/x11/xbanner/Makefile
==============================================================================
--- head/x11/xbanner/Makefile	Thu Jan  9 14:40:14 2014	(r339244)
+++ head/x11/xbanner/Makefile	Thu Jan  9 14:48:54 2014	(r339245)
@@ -14,7 +14,6 @@ COMMENT=	Make your XDM login screen look
 
 USE_XORG=	xpm x11
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-patch:
@@ -23,14 +22,14 @@ post-patch:
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/samples/XBanner.ad \
-		${PREFIX}/lib/X11/app-defaults/XBanner
+		${STAGEDIR}${PREFIX}/lib/X11/app-defaults/XBanner
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${PREFIX}/share/doc/XBanner
-	${INSTALL_DATA} ${WRKSRC}/QuickStart ${PREFIX}/share/doc/XBanner
-	${INSTALL_DATA} ${WRKSRC}/docs/* ${PREFIX}/share/doc/XBanner
-	@${MKDIR} ${PREFIX}/share/examples/XBanner
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/XBanner
+	${INSTALL_DATA} ${WRKSRC}/QuickStart ${STAGEDIR}${PREFIX}/share/doc/XBanner
+	${INSTALL_DATA} ${WRKSRC}/docs/* ${STAGEDIR}${PREFIX}/share/doc/XBanner
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/examples/XBanner
 	${INSTALL_DATA} ${WRKSRC}/samples/_other_ideas/* \
-		${PREFIX}/share/examples/XBanner
+		${STAGEDIR}${PREFIX}/share/examples/XBanner
 .endif
 
 .include <bsd.port.mk>

Modified: head/x11/xbanner/files/patch-aa
==============================================================================
--- head/x11/xbanner/files/patch-aa	Thu Jan  9 14:40:14 2014	(r339244)
+++ head/x11/xbanner/files/patch-aa	Thu Jan  9 14:48:54 2014	(r339245)
@@ -1,107 +1,64 @@
-*** Makefile.orig	Tue May 13 00:55:59 1997
---- Makefile	Sat Dec 18 03:25:54 1999
-***************
-*** 6,27 ****
-  
-  .SUFFIXES: .c .o
-  
-! CC	=gcc
-  RM	=rm
-  LN	=ln
-! INSTALL	=install
-  CP	=cp
-  TAR	=tar
-  GZIP	=gzip
-  
-  # Binary directory for make install
-! BINDIR	=/usr/local/bin/X11
-  
-  # Library directories for Linux
-! XLIBDIR	=/usr/X11R6/lib
-  
-  # Include directory for gcc (if you get X11/Xlib.h: file not found)
-! #INCDIR =-I/usr/X11R6/include
-  
-  # Library directories for the Ultrix (probably most Unixes)
-  #XLIBDIR =/usr/lib/X11
---- 6,27 ----
-  
-  .SUFFIXES: .c .o
-  
-! CC	?=gcc
-  RM	=rm
-  LN	=ln
-! INSTALL	?=install
-  CP	=cp
-  TAR	=tar
-  GZIP	=gzip
-  
-  # Binary directory for make install
-! BINDIR	=$(PREFIX)/bin
-  
-  # Library directories for Linux
-! XLIBDIR	=$(LOCALBASE)/lib
-  
-  # Include directory for gcc (if you get X11/Xlib.h: file not found)
-! INCDIR =-I$(LOCALBASE)/include
-  
-  # Library directories for the Ultrix (probably most Unixes)
-  #XLIBDIR =/usr/lib/X11
-***************
-*** 34,40 ****
-  	$(CC) $(INCDIR) $(CFLAGS) $(XPM) -c $*.c
-  
-  # Linux CFLAGS (actually generic gcc)
-! CFLAGS=-Wall -O2
-  
-  # Want static binaries?
-  #CFLAGS=-Wall -O2 -static
---- 34,40 ----
-  	$(CC) $(INCDIR) $(CFLAGS) $(XPM) -c $*.c
-  
-  # Linux CFLAGS (actually generic gcc)
-! #CFLAGS=-Wall -O2
-  
-  # Want static binaries?
-  #CFLAGS=-Wall -O2 -static
-***************
-*** 48,54 ****
-  # Most Linux users won't be troubled by this. Actually almost nobody will
-  # be troubled by this. It just might save me a couple of emails...
-  # Just change it to wherever your libX11.a resides.
-! LDFLAGS=-L$(XLIBDIR)
-  
-  all: xbanner freetemp random_effect xb_check 
-  
---- 48,54 ----
-  # Most Linux users won't be troubled by this. Actually almost nobody will
-  # be troubled by this. It just might save me a couple of emails...
-  # Just change it to wherever your libX11.a resides.
-! LDFLAGS+=-L$(XLIBDIR)
-  
-  all: xbanner freetemp random_effect xb_check 
-  
-***************
-*** 70,79 ****
-  xb_check: xb_check.o 
-  	$(CC) $(CFLAGS) -o xb_check xb_check.o 
-  
-! install: freetemp xbanner xb_check 
-! 	$(INSTALL) --strip --mode "0755" --owner root --group bin freetemp $(BINDIR)/freetemp
-! 	$(INSTALL) --strip --mode "0755" --owner root --group bin xbanner $(BINDIR)/xbanner
-! 	$(INSTALL) --strip --mode "0755" --owner root --group bin xb_check $(BINDIR)/xb_check
-  
-  strip: exe
-  	strip xbanner freetemp xb_check random_effect
---- 70,80 ----
-  xb_check: xb_check.o 
-  	$(CC) $(CFLAGS) -o xb_check xb_check.o 
-  
-! install: freetemp xbanner xb_check random_effect 
-! 	${BSD_INSTALL_PROGRAM} freetemp $(BINDIR)/freetemp
-! 	${BSD_INSTALL_PROGRAM} xbanner $(BINDIR)/xbanner
-! 	${BSD_INSTALL_PROGRAM} xb_check $(BINDIR)/xb_check
-! 	${BSD_INSTALL_PROGRAM} random_effect $(BINDIR)/random_effect
-  
-  strip: exe
-  	strip xbanner freetemp xb_check random_effect
+--- Makefile.orig	1997-05-12 23:55:59.000000000 +0800
++++ Makefile	2014-01-09 21:06:36.000000000 +0800
+@@ -6,22 +6,22 @@
+ 
+ .SUFFIXES: .c .o
+ 
+-CC	=gcc
++CC	?=gcc
+ RM	=rm
+ LN	=ln
+-INSTALL	=install
++INSTALL	?=install
+ CP	=cp
+ TAR	=tar
+ GZIP	=gzip
+ 
+ # Binary directory for make install
+-BINDIR	=/usr/local/bin/X11
++BINDIR	=$(PREFIX)/bin
+ 
+ # Library directories for Linux
+-XLIBDIR	=/usr/X11R6/lib
++XLIBDIR	=$(LOCALBASE)/lib
+ 
+ # Include directory for gcc (if you get X11/Xlib.h: file not found)
+-#INCDIR =-I/usr/X11R6/include
++INCDIR =-I$(LOCALBASE)/include
+ 
+ # Library directories for the Ultrix (probably most Unixes)
+ #XLIBDIR =/usr/lib/X11
+@@ -34,7 +34,7 @@ XPMLIB  =-lXpm
+ 	$(CC) $(INCDIR) $(CFLAGS) $(XPM) -c $*.c
+ 
+ # Linux CFLAGS (actually generic gcc)
+-CFLAGS=-Wall -O2
++#CFLAGS=-Wall -O2
+ 
+ # Want static binaries?
+ #CFLAGS=-Wall -O2 -static
+@@ -48,7 +48,7 @@ CFLAGS=-Wall -O2
+ # Most Linux users won't be troubled by this. Actually almost nobody will
+ # be troubled by this. It just might save me a couple of emails...
+ # Just change it to wherever your libX11.a resides.
+-LDFLAGS=-L$(XLIBDIR)
++LDFLAGS+=-L$(XLIBDIR)
+ 
+ all: xbanner freetemp random_effect xb_check 
+ 
+@@ -70,10 +70,11 @@ random_effect: random_effect.o 
+ xb_check: xb_check.o 
+ 	$(CC) $(CFLAGS) -o xb_check xb_check.o 
+ 
+-install: freetemp xbanner xb_check 
+-	$(INSTALL) --strip --mode "0755" --owner root --group bin freetemp $(BINDIR)/freetemp
+-	$(INSTALL) --strip --mode "0755" --owner root --group bin xbanner $(BINDIR)/xbanner
+-	$(INSTALL) --strip --mode "0755" --owner root --group bin xb_check $(BINDIR)/xb_check
++install: freetemp xbanner xb_check random_effect 
++	${BSD_INSTALL_PROGRAM} freetemp $(DESTDIR)$(BINDIR)/freetemp
++	${BSD_INSTALL_PROGRAM} xbanner $(DESTDIR)$(BINDIR)/xbanner
++	${BSD_INSTALL_PROGRAM} xb_check $(DESTDIR)$(BINDIR)/xb_check
++	${BSD_INSTALL_PROGRAM} random_effect $(DESTDIR)$(BINDIR)/random_effect
+ 
+ strip: exe
+ 	strip xbanner freetemp xb_check random_effect

Modified: head/x11/xbrightness/Makefile
==============================================================================
--- head/x11/xbrightness/Makefile	Thu Jan  9 14:40:14 2014	(r339244)
+++ head/x11/xbrightness/Makefile	Thu Jan  9 14:48:54 2014	(r339245)
@@ -12,9 +12,6 @@ COMMENT=	Brightness and gamma correction
 USE_XORG=	x11 xxf86vm ice xmu xt xaw
 USES=		imake
 
-PLIST_FILES=	bin/xbrightness
+PLIST_FILES=	bin/xbrightness man/man1/xbrightness.1.gz
 
-MAN1=		xbrightness.1
-
-NO_STAGE=	yes
 .include <bsd.port.mk>

Modified: head/x11/xclick/Makefile
==============================================================================
--- head/x11/xclick/Makefile	Thu Jan  9 14:40:14 2014	(r339244)
+++ head/x11/xclick/Makefile	Thu Jan  9 14:48:54 2014	(r339245)
@@ -17,13 +17,12 @@ USE_XORG=	x11 xtst xext xfixes xi
 
 PLIST_FILES=	bin/${PORTNAME}
 
-NO_STAGE=	yes
 do-build:
 	@cd ${WRKSRC} && \
 		${CC} -L${LOCALBASE}/lib -I${LOCALBASE}/include click.c \
 			-lX11 -lXtst -o ${PORTNAME}
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>

Modified: head/x11/xcut/Makefile
==============================================================================
--- head/x11/xcut/Makefile	Thu Jan  9 14:40:14 2014	(r339244)
+++ head/x11/xcut/Makefile	Thu Jan  9 14:48:54 2014	(r339245)
@@ -14,8 +14,6 @@ COMMENT=	Manipulate X cut buffers from t
 
 USES=		imake
 USE_XORG=	x11
-MAN1=		xcut.1
-PLIST_FILES=	bin/xcut
+PLIST_FILES=	bin/xcut man/man1/xcut.1.gz
 
-NO_STAGE=	yes
 .include <bsd.port.mk>

Modified: head/x11/xidle/Makefile
==============================================================================
--- head/x11/xidle/Makefile	Thu Jan  9 14:40:14 2014	(r339244)
+++ head/x11/xidle/Makefile	Thu Jan  9 14:48:54 2014	(r339245)
@@ -17,14 +17,10 @@ MAKE_ARGS+=	X11LIBDIR="${LOCALBASE}/lib"
 		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 
 USE_XORG=	x11 xscrnsaver
-PLIST_FILES=	bin/xidle
-MAN1=		xidle.1
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+PLIST_FILES=	bin/xidle man/man1/xidle.1.gz
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/xidle ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/xidle.1 ${PREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/xidle ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/xidle.1 ${STAGEDIR}${PREFIX}/man/man1
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/x11/xkbctrl/Makefile
==============================================================================
--- head/x11/xkbctrl/Makefile	Thu Jan  9 14:40:14 2014	(r339244)
+++ head/x11/xkbctrl/Makefile	Thu Jan  9 14:48:54 2014	(r339245)
@@ -18,7 +18,6 @@ USES=		imake
 USE_XORG=	x11 xkbfile
 NO_WRKSUBDIR=	yes
 
-NO_STAGE=	yes
 do-extract:
 		@${RM} -rf ${WRKDIR}
 		@${MKDIR} ${WRKDIR}
@@ -27,6 +26,6 @@ do-extract:
 		done
 
 do-install:
-		@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+		@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>

Modified: head/x11/xrestop/Makefile
==============================================================================
--- head/x11/xrestop/Makefile	Thu Jan  9 14:40:14 2014	(r339244)
+++ head/x11/xrestop/Makefile	Thu Jan  9 14:48:54 2014	(r339245)
@@ -19,8 +19,6 @@ CONFIGURE_ENV=	XLIBS="-L${LOCALBASE}/lib
 LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS+=	-I${LOCALBASE}/include
 
-MAN1=		xrestop.1
-PLIST_FILES=	bin/xrestop
+PLIST_FILES=	bin/xrestop man/man1/xrestop.1.gz
 
-NO_STAGE=	yes
 .include <bsd.port.mk>

Modified: head/x11/xsnow/Makefile
==============================================================================
--- head/x11/xsnow/Makefile	Thu Jan  9 14:40:14 2014	(r339244)
+++ head/x11/xsnow/Makefile	Thu Jan  9 14:48:54 2014	(r339245)
@@ -12,10 +12,8 @@ COMMENT=	Create a snowy and Santa-y desk
 
 USES=		imake
 USE_XORG=	xpm
-MAN6=		xsnow.6
-PLIST_FILES=	bin/xsnow
+PLIST_FILES=	bin/xsnow man/man6/xsnow.6.gz
 
-NO_STAGE=	yes
 post-configure:
 	@${REINPLACE_CMD} \
 		-e 's: BINDIR .*:BINDIR=${PREFIX}/bin:' \

Modified: head/x11/xtacy/Makefile
==============================================================================
--- head/x11/xtacy/Makefile	Thu Jan  9 14:40:14 2014	(r339244)
+++ head/x11/xtacy/Makefile	Thu Jan  9 14:48:54 2014	(r339245)
@@ -15,10 +15,8 @@ COMMENT=	X11 trippy color-cycling toy
 
 USES=		imake
 USE_XORG=	x11 xext
-MAN1=		xtacy.1
-PLIST_FILES=	bin/xtacy
+PLIST_FILES=	bin/xtacy man/man1/xtacy.1.gz
 
 WRKSRC=		${WRKDIR}/Xtacy
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
