Date: Mon, 10 Jul 2000 08:30:24 -0700 (PDT) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/19826: Update port: sysutils/wmmount to 1.0b2 Message-ID: <20000710153024.124A437BA8B@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 19826 >Category: ports >Synopsis: Update port: sysutils/wmmount to 1.0b2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Jul 10 08:40:01 PDT 2000 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.0-RELEASE i386 >Organization: >Environment: >Description: - Update to version 1.0b2 New file: patches/patch-ab patches/patch-ac >How-To-Repeat: >Fix: diff -urN /usr/ports/sysutils/wmmount/Makefile sysutils/wmmount/Makefile --- /usr/ports/sysutils/wmmount/Makefile Mon Apr 24 19:03:42 2000 +++ sysutils/wmmount/Makefile Tue Jun 27 22:53:00 2000 @@ -6,33 +6,36 @@ # PORTNAME= wmmount -PORTVERSION= 1.0b1 +PORTVERSION= 1.0b2 CATEGORIES= sysutils windowmaker afterstep MASTER_SITES= http://www.geocities.com/SiliconValley/Vista/2471/files/ -DISTNAME= wmmount-1.0-beta1 +DISTNAME= ${PORTNAME}-1.0-beta2 EXTRACT_SUFX= .tgz MAINTAINER= ozz@FreeBSD.org.ru -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm +LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \ + Xpm.4:${PORTSDIR}/graphics/xpm -WRKSRC= ${WRKDIR}/wmmount USE_IMAKE= yes NO_INSTALL_MANPAGES= yes -post-extract: - @ if [ -r /etc/fstab ]; then \ - ${WRKSRC}/system.wmmount.awk >${WRKSRC}/system.wmmount; \ - else \ - ${CP} ${WRKSRC}/system.wmmount.eg ${WRKSRC}/system.wmmount; \ - fi +post-patch: +.for file in system.wmmount.eg system.wmmount.sh + @${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/config/${file} +.endfor +.if exists(/etc/fstab) + @${SH} ${WRKSRC}/config/system.wmmount.sh > ${WRKSRC}/system.wmmount +.else + @${CP} ${WRKSRC}/config/system.wmmount.eg ${WRKSRC}/system.wmmount +.endif do-install: - @ ${MKDIR} ${PREFIX}/lib/X11/wmmount - @ ${INSTALL_PROGRAM} ${WRKSRC}/wmmount ${PREFIX}/bin - @ ${INSTALL_DATA} ${WRKSRC}/system.wmmount ${PREFIX}/lib/X11/wmmount + ${INSTALL_PROGRAM} ${WRKSRC}/wmmount ${PREFIX}/bin + @${MKDIR} ${PREFIX}/lib/X11/wmmount + ${INSTALL_DATA} ${WRKSRC}/system.wmmount ${PREFIX}/lib/X11/wmmount .for image in blank.xpm cdrom.xpm floppy.xpm harddisk.xpm zip.xpm - @ ${INSTALL_DATA} ${WRKSRC}/EXTRAS/${image} ${PREFIX}/lib/X11/wmmount + ${INSTALL_DATA} ${WRKSRC}/lib/${image} ${PREFIX}/lib/X11/wmmount .endfor .include <bsd.port.mk> diff -urN /usr/ports/sysutils/wmmount/files/md5 sysutils/wmmount/files/md5 --- /usr/ports/sysutils/wmmount/files/md5 Sat Jul 24 12:34:43 1999 +++ sysutils/wmmount/files/md5 Tue Jun 27 22:25:21 2000 @@ -1 +1 @@ -MD5 (wmmount-1.0-beta1.tgz) = f77926476c52cda5e52deb731784341a +MD5 (wmmount-1.0-beta2.tgz) = 54e6fe0a5842b7f9963730499f750549 diff -urN /usr/ports/sysutils/wmmount/patches/patch-aa sysutils/wmmount/patches/patch-aa --- /usr/ports/sysutils/wmmount/patches/patch-aa Wed May 5 12:16:44 1999 +++ sysutils/wmmount/patches/patch-aa Tue Jun 27 22:37:01 2000 @@ -1,11 +1,44 @@ ---- system.wmmount.eg.orig Sun Sep 6 00:11:18 1998 -+++ system.wmmount.eg Wed May 5 11:29:11 1999 -@@ -74,7 +74,7 @@ - # Details of at least one mointpoint must be specified. - # References to invalid iconnumbers will cause crashes. - --mountname Linux -+mountname FreeBSD - mountpoint / - iconnumber 3 - usagedisplay Free +--- config/system.wmmount.eg.orig Fri Jun 18 04:41:41 1999 ++++ config/system.wmmount.eg Tue Jun 27 22:33:35 2000 +@@ -8,7 +8,7 @@ + # See the README file for a more complete notice. + + # This configuration file to be saved as +-# /usr/X11R6/lib/X11/wmmount/system.wmmount or as ~/.wmmount. ++# %%PREFIX%%/lib/X11/wmmount/system.wmmount or as ~/.wmmount. + + # Commands must appear (without a '#') at the beginning of the line. + +@@ -25,7 +25,7 @@ + # Tell wmmount what to do when you double-click on the information box. + # This entry may be ommitted. + +-#opencmd=/usr/X11R6/bin/nxterm -T '%n - %m' -e mc %m ++#opencmd=%%PREFIX%%/bin/nxterm -T '%n - %m' -e mc %m + #opencmd=kfmclient exec %m + + # Choose fonts for the information box. +@@ -39,10 +39,10 @@ + # Ensure all icons exist and are accessible. + # At least one icon must be specified. + +-icon /usr/X11R6/lib/X11/wmmount/cdrom.xpm +-icon /usr/X11R6/lib/X11/wmmount/floppy.xpm +-icon /usr/X11R6/lib/X11/wmmount/zip.xpm +-icon /usr/X11R6/lib/X11/wmmount/harddisk.xpm ++icon %%PREFIX%%/lib/X11/wmmount/cdrom.xpm ++icon %%PREFIX%%/lib/X11/wmmount/floppy.xpm ++icon %%PREFIX%%/lib/X11/wmmount/zip.xpm ++icon %%PREFIX%%/lib/X11/wmmount/harddisk.xpm + + # Give details of all mountpoints. + +@@ -62,7 +62,7 @@ + # overridden for particular mountpoints. + + mountpoint / +-name=Linux ++name=FreeBSD + iconnumber=3 + usagedisplay=1 + diff -urN /usr/ports/sysutils/wmmount/patches/patch-ab sysutils/wmmount/patches/patch-ab --- /usr/ports/sysutils/wmmount/patches/patch-ab Thu Jan 1 09:00:00 1970 +++ sysutils/wmmount/patches/patch-ab Tue Jun 27 22:36:49 2000 @@ -0,0 +1,35 @@ +--- config/system.wmmount.sh.orig Fri Jun 18 04:41:41 1999 ++++ config/system.wmmount.sh Tue Jun 27 22:34:30 2000 +@@ -24,7 +24,7 @@ + # See the README file for a more complete notice. + + # This configuration file to be saved as +-# /usr/X11R6/lib/X11/wmmount/system.wmmount or as ~/.wmmount. ++# %%PREFIX%%/lib/X11/wmmount/system.wmmount or as ~/.wmmount. + + # Commands must appear (without a '#') at the beginning of the line. + +@@ -41,7 +41,7 @@ + # Tell wmmount what to do when you double-click on the information box. + # This entry may be ommitted. + +-#opencmd=/usr/X11R6/bin/nxterm -T '%n - %m' -e mc %m ++#opencmd=%%PREFIX%%/bin/nxterm -T '%n - %m' -e mc %m + #opencmd=kfmclient exec %m + + # Choose fonts for the information box. +@@ -55,10 +55,10 @@ + # Ensure all icons exist and are accessible. + # At least one icon must be specified. + +-icon /usr/X11R6/lib/X11/wmmount/cdrom.xpm +-icon /usr/X11R6/lib/X11/wmmount/floppy.xpm +-icon /usr/X11R6/lib/X11/wmmount/zip.xpm +-icon /usr/X11R6/lib/X11/wmmount/harddisk.xpm ++icon %%PREFIX%%/lib/X11/wmmount/cdrom.xpm ++icon %%PREFIX%%/lib/X11/wmmount/floppy.xpm ++icon %%PREFIX%%/lib/X11/wmmount/zip.xpm ++icon %%PREFIX%%/lib/X11/wmmount/harddisk.xpm + + # Give details of all mountpoints. + diff -urN /usr/ports/sysutils/wmmount/patches/patch-ac sysutils/wmmount/patches/patch-ac --- /usr/ports/sysutils/wmmount/patches/patch-ac Thu Jan 1 09:00:00 1970 +++ sysutils/wmmount/patches/patch-ac Tue Jun 27 22:55:56 2000 @@ -0,0 +1,13 @@ +--- Imakefile.orig Fri Jun 18 04:41:41 1999 ++++ Imakefile Tue Jun 27 22:55:53 2000 +@@ -1,7 +1,9 @@ + DEPLIBS = $(DEPXLIB) + XPMLIB = -lXpm + +-LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) ++LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -lgnugetopt -L${LOCALBASE}/lib ++ ++EXTRA_INCLUDES = -I${LOCALBASE}/include + + SRCS = dockapp.c wmmount.c + OBJS = dockapp.o wmmount.o diff -urN /usr/ports/sysutils/wmmount/pkg/DESCR sysutils/wmmount/pkg/DESCR --- /usr/ports/sysutils/wmmount/pkg/DESCR Mon May 3 13:21:53 1999 +++ sysutils/wmmount/pkg/DESCR Mon Jul 10 20:19:20 2000 @@ -1,5 +1,4 @@ -wmmount - The WindowMaker universal mount point -05/09/98 Release 1.0 Beta1 +wmmount - The Window Maker universal mount point In addition, individual users can create their own configuration files, saving them as ~/.wmmount diff -urN /usr/ports/sysutils/wmmount/pkg/PLIST sysutils/wmmount/pkg/PLIST --- /usr/ports/sysutils/wmmount/pkg/PLIST Sun Feb 28 20:17:14 1999 +++ sysutils/wmmount/pkg/PLIST Mon Jul 10 20:19:33 2000 @@ -3,6 +3,6 @@ lib/X11/wmmount/cdrom.xpm lib/X11/wmmount/floppy.xpm lib/X11/wmmount/harddisk.xpm -lib/X11/wmmount/zip.xpm lib/X11/wmmount/system.wmmount +lib/X11/wmmount/zip.xpm @dirrm lib/X11/wmmount >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20000710153024.124A437BA8B>