svn commit: r339339 - in head/x11: deskmenu deskmenu/files gcb gdkxft gmessage gmessage/files gtk-theme-switch gtk-theme-switch/files gtk-theme-switch2 gtk-theme-switch2/files lsw mrxvt multi-aterm...
Vanilla I. Shu
vanilla at FreeBSD.org
Fri Jan 10 09:32:21 UTC 2014
Author: vanilla
Date: Fri Jan 10 09:32:14 2014
New Revision: 339339
URL: http://svnweb.freebsd.org/changeset/ports/339339
Log:
Support stagedir.
Approved by: portmgr (blanket infrastructure)
Modified:
head/x11/deskmenu/Makefile
head/x11/deskmenu/files/patch-Makefile
head/x11/gcb/Makefile
head/x11/gdkxft/Makefile
head/x11/gdkxft/pkg-plist
head/x11/gmessage/Makefile
head/x11/gmessage/files/patch-aa
head/x11/gtk-theme-switch/Makefile
head/x11/gtk-theme-switch/files/patch-aa (contents, props changed)
head/x11/gtk-theme-switch/pkg-plist
head/x11/gtk-theme-switch2/Makefile
head/x11/gtk-theme-switch2/files/patch-Makefile
head/x11/lsw/Makefile
head/x11/mrxvt/Makefile
head/x11/mrxvt/pkg-plist (contents, props changed)
head/x11/multi-aterm/Makefile
head/x11/multi-aterm/pkg-plist
head/x11/mxico/Makefile
head/x11/mxico/pkg-plist
head/x11/numlockx/Makefile
head/x11/peeper/Makefile
head/x11/rxvt-devel/Makefile
head/x11/rxvt-devel/pkg-plist
head/x11/rxvt/Makefile
head/x11/settitle/Makefile
head/x11/sisctrl/Makefile
head/x11/xfishtank/Makefile
head/x11/xtermcontrol/Makefile
head/x11/xtrlock/Makefile
head/x11/xxkb/Makefile
Directory Properties:
head/x11/mrxvt/pkg-descr (props changed)
Modified: head/x11/deskmenu/Makefile
==============================================================================
--- head/x11/deskmenu/Makefile Fri Jan 10 09:29:28 2014 (r339338)
+++ head/x11/deskmenu/Makefile Fri Jan 10 09:32:14 2014 (r339339)
@@ -16,8 +16,7 @@ USES= gmake
USE_GNOME= gtk12
USE_CSTD= gnu89
-NO_STAGE= yes
post-install:
- ${STRIP_CMD} ${PREFIX}/bin/deskmenu
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/deskmenu
.include <bsd.port.mk>
Modified: head/x11/deskmenu/files/patch-Makefile
==============================================================================
--- head/x11/deskmenu/files/patch-Makefile Fri Jan 10 09:29:28 2014 (r339338)
+++ head/x11/deskmenu/files/patch-Makefile Fri Jan 10 09:32:14 2014 (r339339)
@@ -1,5 +1,5 @@
---- Makefile.orig Sun Jan 19 15:41:43 2003
-+++ Makefile Sun Jan 19 15:42:30 2003
+--- Makefile.orig 2001-05-22 18:44:52.000000000 +0800
++++ Makefile 2014-01-10 14:41:23.000000000 +0800
@@ -1,8 +1,7 @@
-CC = gcc
-CFLAGS = -g -O2 -Wall `gtk-config --cflags`
@@ -12,7 +12,7 @@
LDPATH = -L$(XROOT)/lib
PROG = deskmenu
-@@ -10,7 +9,6 @@
+@@ -10,7 +9,6 @@ HEADERS = $(PROG).h
RCFILE = -DRCFILE=\".deskmenurc\"
DEBUG = #-DDEBUG
DEFINES = $(RCFILE) $(DEBUG)
@@ -20,12 +20,12 @@
OBJS = $(PROG).o popup.o workspaces.o windows.o
-@@ -23,7 +21,7 @@
+@@ -23,7 +21,7 @@ $(OBJS): %.o: %.c $(HEADERS)
$(CC) $(CFLAGS) $(DEFINES) $(INCLUDES) -c $< -o $@
install: all
- install $(PROG) $(PREFIX)/bin
-+ $(BSD_INSTALL_PROGRAM) $(PROG) $(PREFIX)/bin
++ $(BSD_INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(PREFIX)/bin
clean:
rm -f $(PROG) $(OBJS)
Modified: head/x11/gcb/Makefile
==============================================================================
--- head/x11/gcb/Makefile Fri Jan 10 09:29:28 2014 (r339338)
+++ head/x11/gcb/Makefile Fri Jan 10 09:32:14 2014 (r339339)
@@ -16,7 +16,6 @@ USES= pkgconfig
USE_BZIP2= yes
USE_GNOME= gtk20
-NO_STAGE= yes
post-patch:
@${REINPLACE_CMD} -e 's|#!/bin/bash|#!${SH}|' \
${WRKSRC}/configure
@@ -25,10 +24,11 @@ post-patch:
${WRKSRC}/Makefile
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.png ${PREFIX}/share/icons
+ ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+ ${MKDIR} ${STAGEDIR}${PREFIX}/share/icons
+ ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/icons
${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.desktop \
- ${PREFIX}/share/applications
- ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.png ${PREFIX}/share/pixmaps
+ ${STAGEDIR}${PREFIX}/share/applications
+ ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps
.include <bsd.port.mk>
Modified: head/x11/gdkxft/Makefile
==============================================================================
--- head/x11/gdkxft/Makefile Fri Jan 10 09:29:28 2014 (r339338)
+++ head/x11/gdkxft/Makefile Fri Jan 10 09:32:14 2014 (r339339)
@@ -22,9 +22,6 @@ CONFIGURE_ARGS= --sbindir=${PREFIX}/bin
--without-gnome
USE_LDCONFIG= yes
-MAN8= gdkxft_sysinstall.8
-
-NO_STAGE= yes
.include <bsd.port.options.mk>
post-patch:
@@ -44,8 +41,8 @@ post-patch:
post-install:
.if ${PORT_OPTIONS:MDOCS}
- @${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
.endif
.include <bsd.port.mk>
Modified: head/x11/gdkxft/pkg-plist
==============================================================================
--- head/x11/gdkxft/pkg-plist Fri Jan 10 09:29:28 2014 (r339338)
+++ head/x11/gdkxft/pkg-plist Fri Jan 10 09:32:14 2014 (r339339)
@@ -3,5 +3,6 @@ etc/gdkxft.conf
lib/libgdkxft.a
lib/libgdkxft.la
lib/libgdkxft.so
-%%PORTDOCS%%share/doc/gdkxft/README
-%%PORTDOCS%%@dirrm share/doc/gdkxft
+man/man8/gdkxft_sysinstall.8.gz
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
Modified: head/x11/gmessage/Makefile
==============================================================================
--- head/x11/gmessage/Makefile Fri Jan 10 09:29:28 2014 (r339338)
+++ head/x11/gmessage/Makefile Fri Jan 10 09:32:14 2014 (r339339)
@@ -13,5 +13,4 @@ COMMENT= Gtk+ clone of xmessage. display
PLIST_FILES= bin/gmessage
USE_GNOME= gtk12
-NO_STAGE= yes
.include <bsd.port.mk>
Modified: head/x11/gmessage/files/patch-aa
==============================================================================
--- head/x11/gmessage/files/patch-aa Fri Jan 10 09:29:28 2014 (r339338)
+++ head/x11/gmessage/files/patch-aa Fri Jan 10 09:32:14 2014 (r339339)
@@ -1,5 +1,5 @@
---- Makefile.orig Thu May 27 19:58:06 1999
-+++ Makefile Sat Jul 1 17:48:44 2000
+--- Makefile.orig 1999-05-27 18:58:06.000000000 +0800
++++ Makefile 2014-01-10 14:20:30.000000000 +0800
@@ -1,6 +1,6 @@
-CC = gcc
-CFLAGS = `gtk-config --cflags`
@@ -10,12 +10,12 @@
all: gmessage
-@@ -8,7 +8,7 @@
+@@ -8,7 +8,7 @@ gmessage: gmessage.c
$(CC) $(CFLAGS) gmessage.c -o gmessage $(OBJS) $(LDLIBS)
install: gmessage
- cp ./gmessage /usr/local/bin
-+ ${BSD_INSTALL_PROGRAM} gmessage ${PREFIX}/bin
++ ${BSD_INSTALL_PROGRAM} gmessage $(DESTDIR)${PREFIX}/bin
clean:
$(RM) *.o core gmessage
Modified: head/x11/gtk-theme-switch/Makefile
==============================================================================
--- head/x11/gtk-theme-switch/Makefile Fri Jan 10 09:29:28 2014 (r339338)
+++ head/x11/gtk-theme-switch/Makefile Fri Jan 10 09:32:14 2014 (r339339)
@@ -3,7 +3,7 @@
PORTNAME= gtk-theme-switch
PORTVERSION= 1.0.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11
MASTER_SITES= http://www.muhri.net/
PKGNAMESUFFIX= 1
@@ -14,15 +14,12 @@ COMMENT= Command line tool for switching
USE_GNOME= gtk12
USES= gmake
-MAN1= gtk-theme-switch.1
-
-NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MDOCS}
post-install:
- ${MKDIR} ${PREFIX}/share/gtk-theme-switch
- ${INSTALL_MAN} ${WRKSRC}/readme ${PREFIX}/share/gtk-theme-switch/README
+ ${MKDIR} ${STAGEDIR}${PREFIX}/${DOCSDIR}
+ ${INSTALL_MAN} ${WRKSRC}/readme ${STAGEDIR}${PREFIX}/${DOCSDIR}/README
.endif
.include <bsd.port.mk>
Modified: head/x11/gtk-theme-switch/files/patch-aa
==============================================================================
--- head/x11/gtk-theme-switch/files/patch-aa Fri Jan 10 09:29:28 2014 (r339338)
+++ head/x11/gtk-theme-switch/files/patch-aa Fri Jan 10 09:32:14 2014 (r339339)
@@ -1,8 +1,5 @@
-
-$FreeBSD$
-
---- Makefile.orig Fri Apr 13 17:57:24 2001
-+++ Makefile Tue Apr 17 09:31:20 2001
+--- Makefile.orig 2003-06-11 14:02:59.000000000 +0800
++++ Makefile 2014-01-10 14:11:54.000000000 +0800
@@ -1,7 +1,8 @@
-GCC = cc
-PREFIX=/usr/local
@@ -16,18 +13,19 @@ $FreeBSD$
VERSION = 1.0.1
all: switch
-@@ -12,11 +13,10 @@
+@@ -12,11 +13,10 @@ clean:
-rm -f switch *~
install: all
- strip switch
- mkdir -p ${PREFIX}/bin
+- mkdir -p ${PREFIX}/bin
- mkdir -p ${PREFIX}/man
- install -c switch ${PREFIX}/bin
- install -c switch.1 ${PREFIX}/man
-+ mkdir -p ${PREFIX}/man/man1
-+ $(BSD_INSTALL_PROGRAM) switch ${PREFIX}/bin/gtk-theme-switch
-+ $(BSD_INSTALL_MAN) switch.1 ${PREFIX}/man/man1/gtk-theme-switch.1
++ mkdir -p $(DESTDIR)${PREFIX}/bin
++ mkdir -p $(DESTDIR)${PREFIX}/man/man1
++ $(BSD_INSTALL_PROGRAM) switch $(DESTDIR)${PREFIX}/bin/gtk-theme-switch
++ $(BSD_INSTALL_MAN) switch.1 $(DESTDIR)${PREFIX}/man/man1/gtk-theme-switch.1
dist: clean
rm -rf /tmp/gtk-theme-switch-$(VERSION)
Modified: head/x11/gtk-theme-switch/pkg-plist
==============================================================================
--- head/x11/gtk-theme-switch/pkg-plist Fri Jan 10 09:29:28 2014 (r339338)
+++ head/x11/gtk-theme-switch/pkg-plist Fri Jan 10 09:32:14 2014 (r339339)
@@ -1,3 +1,4 @@
bin/gtk-theme-switch
-%%PORTDOCS%%share/gtk-theme-switch/README
- at dirrm share/gtk-theme-switch
+man/man1/gtk-theme-switch.1.gz
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
Modified: head/x11/gtk-theme-switch2/Makefile
==============================================================================
--- head/x11/gtk-theme-switch2/Makefile Fri Jan 10 09:29:28 2014 (r339338)
+++ head/x11/gtk-theme-switch2/Makefile Fri Jan 10 09:32:14 2014 (r339339)
@@ -14,8 +14,6 @@ USES= gmake pkgconfig
USE_XORG= x11
USE_GNOME= gtk20
-MAN1= switch2.1
-PLIST_FILES= bin/switch2
+PLIST_FILES= bin/switch2 man/man1/switch2.1.gz
-NO_STAGE= yes
.include <bsd.port.mk>
Modified: head/x11/gtk-theme-switch2/files/patch-Makefile
==============================================================================
--- head/x11/gtk-theme-switch2/files/patch-Makefile Fri Jan 10 09:29:28 2014 (r339338)
+++ head/x11/gtk-theme-switch2/files/patch-Makefile Fri Jan 10 09:32:14 2014 (r339339)
@@ -1,5 +1,5 @@
---- Makefile.orig Wed Jun 11 01:16:36 2003
-+++ Makefile Mon Dec 17 23:11:09 2007
+--- Makefile.orig 2003-06-11 13:16:36.000000000 +0800
++++ Makefile 2014-01-10 09:40:04.000000000 +0800
@@ -1,13 +1,13 @@
-GCC = cc
-PREFIX=/usr/local
@@ -21,14 +21,18 @@
${GCC} -o switch2 switch.c ${CFLAGS} ${LIBS}
clean:
-@@ -17,8 +17,8 @@
+@@ -15,10 +15,10 @@ clean:
+
+ install: all
strip switch2
- mkdir -p ${PREFIX}/bin
- mkdir -p ${PREFIX}/man
+- mkdir -p ${PREFIX}/bin
+- mkdir -p ${PREFIX}/man
- install -c switch2 ${PREFIX}/bin
- install -c switch.1 ${PREFIX}/man
-+ install -c -m 555 switch2 ${PREFIX}/bin
-+ install -c -m 444 switch.1 ${PREFIX}/man/man1/switch2.1
++ mkdir -p $(DESTDIR)${PREFIX}/bin
++ mkdir -p $(DESTDIR)${PREFIX}/man
++ install -c -m 555 switch2 $(DESTDIR)${PREFIX}/bin
++ install -c -m 444 switch.1 $(DESTDIR)${PREFIX}/man/man1/switch2.1
dist: clean
rm -rf /tmp/gtk-theme-switch-$(VERSION)
Modified: head/x11/lsw/Makefile
==============================================================================
--- head/x11/lsw/Makefile Fri Jan 10 09:29:28 2014 (r339338)
+++ head/x11/lsw/Makefile Fri Jan 10 09:32:14 2014 (r339339)
@@ -11,21 +11,19 @@ COMMENT= Lists the titles of all running
MAKE_ARGS= PREFIX="${PREFIX}" X11LIB="${LOCALBASE}/lib" \
X11INC="${LOCALBASE}/include" CC="${CC}"
-PLIST_FILES= bin/lsw
+PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-MAN1= lsw.1
USE_XORG= x11 xt xproto xext
-NO_STAGE= yes
post-patch:
@${REINPLACE_CMD} -e 's|-I/usr/include||;s|-L/usr/lib||;s|= -Os|+=|'\
-e 's|-DHAVE_SHADOW_H||' ${WRKSRC}/config.mk
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/
- ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MANPREFIX}/man/man1
+ ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
+ ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
.include <bsd.port.mk>
Modified: head/x11/mrxvt/Makefile
==============================================================================
--- head/x11/mrxvt/Makefile Fri Jan 10 09:29:28 2014 (r339338)
+++ head/x11/mrxvt/Makefile Fri Jan 10 09:32:14 2014 (r339339)
@@ -19,7 +19,6 @@ CONFLICTS= mrxvt-0.5.*
GNU_CONFIGURE= yes
USE_XORG= x11
-NO_STAGE= yes
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 900007
@@ -49,8 +48,6 @@ PORTDOCS= TIPS \
mrxvtset.pl
.endif
-MAN1= mrxvt.1
-
pre-everything::
@${ECHO_MSG} "=========================================>"
@${ECHO_MSG} "For Japanese support use make -DWITH_JAPANESE install"
@@ -64,6 +61,6 @@ post-patch:
.endif
post-install:
- ${CHMOD} 4511 ${PREFIX}/bin/mrxvt
+ ${CHMOD} 4511 ${STAGEDIR}${PREFIX}/bin/mrxvt
.include <bsd.port.post.mk>
Modified: head/x11/mrxvt/pkg-plist
==============================================================================
--- head/x11/mrxvt/pkg-plist Fri Jan 10 09:29:28 2014 (r339338)
+++ head/x11/mrxvt/pkg-plist Fri Jan 10 09:32:14 2014 (r339339)
@@ -1,4 +1,5 @@
bin/mrxvt
+man/man1/mrxvt.1.gz
share/pixmaps/mrxvt-csh.png
share/pixmaps/mrxvt-csh.xpm
share/pixmaps/mrxvt-root.png
Modified: head/x11/multi-aterm/Makefile
==============================================================================
--- head/x11/multi-aterm/Makefile Fri Jan 10 09:29:28 2014 (r339338)
+++ head/x11/multi-aterm/Makefile Fri Jan 10 09:32:14 2014 (r339339)
@@ -15,7 +15,6 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS=--with-xpm=${LOCALBASE}
DOCS= AUTHORS ChangeLog INSTALL TODO
-MAN1= multi-aterm.1
.if defined(WITH_UTMP)
CONFIGURE_ARGS+= --enable-utmp
@@ -25,7 +24,6 @@ CONFIGURE_ARGS+= --enable-utmp
CONFIGURE_ARGS+= --enable-wtmp
.endif
-NO_STAGE= yes
pre-everything::
@${ECHO_MSG} ""
@${ECHO_MSG} "You can specify the following options:"
@@ -34,8 +32,8 @@ pre-everything::
.if !defined(NOPORTDOCS)
post-install:
- @${MKDIR} ${DOCSDIR}
- cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
.endif
.include <bsd.port.mk>
Modified: head/x11/multi-aterm/pkg-plist
==============================================================================
--- head/x11/multi-aterm/pkg-plist Fri Jan 10 09:29:28 2014 (r339338)
+++ head/x11/multi-aterm/pkg-plist Fri Jan 10 09:32:14 2014 (r339339)
@@ -1,5 +1,6 @@
@comment $FreeBSD$
bin/multi-aterm
+man/man1/multi-aterm.1.gz
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
%%PORTDOCS%%%%DOCSDIR%%/INSTALL
Modified: head/x11/mxico/Makefile
==============================================================================
--- head/x11/mxico/Makefile Fri Jan 10 09:29:28 2014 (r339338)
+++ head/x11/mxico/Makefile Fri Jan 10 09:32:14 2014 (r339339)
@@ -16,14 +16,12 @@ COMMENT= Rotating Object on the screen (
USES= imake
USE_XORG= x11 xext
WRKSRC= ${WRKDIR}/${PORTNAME}
-MAN1= mxico.1
-NO_STAGE= yes
post-install:
.if !defined(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}
- @(cd ${WRKSRC}; ${INSTALL_DATA} polyhedron/READMEj ${DOCSDIR})
- @(cd ${WRKSRC}; ${INSTALL_DATA} polyhedron/README ${DOCSDIR})
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ @(cd ${WRKSRC}; ${INSTALL_DATA} polyhedron/READMEj ${STAGEDIR}${DOCSDIR})
+ @(cd ${WRKSRC}; ${INSTALL_DATA} polyhedron/README ${STAGEDIR}${DOCSDIR})
.endif
.include <bsd.port.mk>
Modified: head/x11/mxico/pkg-plist
==============================================================================
--- head/x11/mxico/pkg-plist Fri Jan 10 09:29:28 2014 (r339338)
+++ head/x11/mxico/pkg-plist Fri Jan 10 09:32:14 2014 (r339339)
@@ -1,4 +1,5 @@
bin/mxico
+man/man1/mxico.1.gz
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/READMEj
%%PORTDOCS%%@dirrm %%DOCSDIR%%
Modified: head/x11/numlockx/Makefile
==============================================================================
--- head/x11/numlockx/Makefile Fri Jan 10 09:29:28 2014 (r339338)
+++ head/x11/numlockx/Makefile Fri Jan 10 09:32:14 2014 (r339339)
@@ -20,5 +20,4 @@ PLIST_FILES= bin/numlockx
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-NO_STAGE= yes
.include <bsd.port.mk>
Modified: head/x11/peeper/Makefile
==============================================================================
--- head/x11/peeper/Makefile Fri Jan 10 09:29:28 2014 (r339338)
+++ head/x11/peeper/Makefile Fri Jan 10 09:32:14 2014 (r339339)
@@ -16,14 +16,13 @@ MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}
LIBS="`${IMLIB_CONFIG} --libs-gdk`"
ALL_TARGET= peeper
-NO_STAGE= yes
.include <bsd.port.options.mk>
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/peeper ${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/peeper ${STAGEDIR}${PREFIX}/bin
.if ${PORT_OPTIONS:MDOCS}
- @${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
.endif
.include <bsd.port.mk>
Modified: head/x11/rxvt-devel/Makefile
==============================================================================
--- head/x11/rxvt-devel/Makefile Fri Jan 10 09:29:28 2014 (r339338)
+++ head/x11/rxvt-devel/Makefile Fri Jan 10 09:32:14 2014 (r339339)
@@ -41,9 +41,6 @@ CONFIGURE_ARGS= --enable-utmp --enable-l
--enable-mousewheel --disable-languages
USE_LDCONFIG= yes
-MAN1= rxvt.1
-
-NO_STAGE= yes
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 900007
@@ -144,6 +141,6 @@ post-patch:
${WRKSRC}/src/Makefile.in
post-install:
- @${CHMOD} 4711 ${PREFIX}/bin/rxvt
+ @${CHMOD} 4711 ${STAGEDIR}${PREFIX}/bin/rxvt
.include <bsd.port.post.mk>
Modified: head/x11/rxvt-devel/pkg-plist
==============================================================================
--- head/x11/rxvt-devel/pkg-plist Fri Jan 10 09:29:28 2014 (r339338)
+++ head/x11/rxvt-devel/pkg-plist Fri Jan 10 09:32:14 2014 (r339339)
@@ -5,3 +5,4 @@ lib/librxvt.a
lib/librxvt.la
lib/librxvt.so
lib/librxvt.so.1
+man/man1/rxvt.1.gz
Modified: head/x11/rxvt/Makefile
==============================================================================
--- head/x11/rxvt/Makefile Fri Jan 10 09:29:28 2014 (r339338)
+++ head/x11/rxvt/Makefile Fri Jan 10 09:32:14 2014 (r339339)
@@ -31,11 +31,8 @@ CONFIGURE_ARGS= --enable-ttygid \
--with-xpm --enable-xpm-background \
--with-xpm-includes=${LOCALBASE}/include/X11 \
--with-xpm-library=${LOCALBASE}/lib
-MAN1= rxvt.1
-PLIST_FILES= bin/rxvt
+PLIST_FILES= bin/rxvt man/man1/${PORTNAME}.1.gz
-
-NO_STAGE= yes
.include <bsd.port.pre.mk>
# fails to build with new utmpx
@@ -96,6 +93,6 @@ post-patch:
@${REINPLACE_CMD} -e 's|getpt()|posix_openpt(0)|' ${WRKSRC}/configure
post-install:
- @${CHMOD} 4711 ${PREFIX}/bin/rxvt
+ @${CHMOD} 4711 ${STAGEDIR}${PREFIX}/bin/rxvt
.include <bsd.port.post.mk>
Modified: head/x11/settitle/Makefile
==============================================================================
--- head/x11/settitle/Makefile Fri Jan 10 09:29:28 2014 (r339338)
+++ head/x11/settitle/Makefile Fri Jan 10 09:32:14 2014 (r339339)
@@ -11,9 +11,6 @@ COMMENT= Program for setting the title o
WRKSRC= ${WRKDIR}/settitle
-MAN1= settitle.1
-MANCOMPRESSED= maybe
-PLIST_FILES= bin/settitle
+PLIST_FILES= bin/settitle man/man1/${PORTNAME}.1.gz
-NO_STAGE= yes
.include <bsd.port.mk>
Modified: head/x11/sisctrl/Makefile
==============================================================================
--- head/x11/sisctrl/Makefile Fri Jan 10 09:29:28 2014 (r339338)
+++ head/x11/sisctrl/Makefile Fri Jan 10 09:32:14 2014 (r339339)
@@ -18,8 +18,6 @@ CONFIGURE_ARGS= --with-xv-path=${LOCALB
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-PLIST_FILES= bin/sisctrl
-MAN1= sisctrl.1x
+PLIST_FILES= bin/sisctrl man/man1/sisctrl.1x.gz
-NO_STAGE= yes
.include <bsd.port.mk>
Modified: head/x11/xfishtank/Makefile
==============================================================================
--- head/x11/xfishtank/Makefile Fri Jan 10 09:29:28 2014 (r339338)
+++ head/x11/xfishtank/Makefile Fri Jan 10 09:32:14 2014 (r339339)
@@ -15,7 +15,6 @@ USES= imake
USE_XORG= x11 xext
WRKSRC= ${WRKDIR}/xfishtank2.0
-NO_STAGE= yes
post-patch:
cd ${WRKDIR}/xfishtank2.0; make clean
Modified: head/x11/xtermcontrol/Makefile
==============================================================================
--- head/x11/xtermcontrol/Makefile Fri Jan 10 09:29:28 2014 (r339338)
+++ head/x11/xtermcontrol/Makefile Fri Jan 10 09:32:14 2014 (r339339)
@@ -17,8 +17,6 @@ GNU_CONFIGURE= yes
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
CPPFLAGS+= -I${LOCALBASE}/include
-PLIST_FILES= bin/xtermcontrol
-MAN1= ${PORTNAME}.1
+PLIST_FILES= bin/xtermcontrol man/man1/${PORTNAME}.1.gz
-NO_STAGE= yes
.include <bsd.port.mk>
Modified: head/x11/xtrlock/Makefile
==============================================================================
--- head/x11/xtrlock/Makefile Fri Jan 10 09:29:28 2014 (r339338)
+++ head/x11/xtrlock/Makefile Fri Jan 10 09:32:14 2014 (r339339)
@@ -22,10 +22,9 @@ CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib -lX11 -lcrypt
MAN1= xtrlock.1
-PLIST_FILES= bin/xtrlock
+PLIST_FILES= bin/xtrlock man/man1/${PORTNAME}.1.gz
BINMODE= 4555
-NO_STAGE= yes
post-extract:
@${LN} -sf xtrlock.man ${WRKSRC}/xtrlock.1
@@ -38,7 +37,7 @@ do-build:
(cd ${WRKSRC} && ${CC} ${CFLAGS} -o xtrlock xtrlock.c ${LDFLAGS})
do-install:
- (cd ${WRKSRC} && ${INSTALL_PROGRAM} xtrlock ${PREFIX}/bin)
- (cd ${WRKSRC} && ${INSTALL_MAN} xtrlock.1 ${MANPREFIX}/man/man1)
+ (cd ${WRKSRC} && ${INSTALL_PROGRAM} xtrlock ${STAGEDIR}${PREFIX}/bin)
+ (cd ${WRKSRC} && ${INSTALL_MAN} xtrlock.1 ${STAGEDIR}${MANPREFIX}/man/man1)
.include <bsd.port.mk>
Modified: head/x11/xxkb/Makefile
==============================================================================
--- head/x11/xxkb/Makefile Fri Jan 10 09:29:28 2014 (r339338)
+++ head/x11/xxkb/Makefile Fri Jan 10 09:32:14 2014 (r339339)
@@ -16,12 +16,10 @@ USES= iconv imake
USE_XORG= xpm
WRKSRC= ${WRKDIR}/${PORTNAME}
-MAN1= ${PORTNAME}.1
PORTDOCS= README CHANGES.ru README.ru
OPTIONS_DEFINE= LIBRSVG2 DOCS
-NO_STAGE= yes
.include <bsd.port.pre.mk>
.if ${PORT_OPTIONS:MLIBRSVG2}
@@ -37,8 +35,8 @@ post-build:
post-install:
.if ${PORT_OPTIONS:MDOCS}
- @${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
.endif
.include <bsd.port.post.mk>
More information about the svn-ports-all
mailing list