From 9e0de73588ff38d0a568d363fb78c36c95aa018f Mon Sep 17 00:00:00 2001 From: Kevin Lo Date: Tue, 11 Jul 2000 08:59:38 +0000 Subject: Update to 1.0b2 PR: 19826 Submitted by: KATO Tsuguru --- sysutils/wmmount/Makefile | 31 ++++++++++++----------- sysutils/wmmount/distinfo | 2 +- sysutils/wmmount/files/patch-aa | 55 ++++++++++++++++++++++++++++++++--------- sysutils/wmmount/files/patch-ab | 35 ++++++++++++++++++++++++++ sysutils/wmmount/files/patch-ac | 13 ++++++++++ sysutils/wmmount/pkg-descr | 3 +-- sysutils/wmmount/pkg-plist | 2 +- 7 files changed, 112 insertions(+), 29 deletions(-) create mode 100644 sysutils/wmmount/files/patch-ab create mode 100644 sysutils/wmmount/files/patch-ac (limited to 'sysutils/wmmount') diff --git a/sysutils/wmmount/Makefile b/sysutils/wmmount/Makefile index f075f2aa9821..50f23340519b 100644 --- a/sysutils/wmmount/Makefile +++ b/sysutils/wmmount/Makefile @@ -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 diff --git a/sysutils/wmmount/distinfo b/sysutils/wmmount/distinfo index d73ddeaf3103..ebb11f86fb2a 100644 --- a/sysutils/wmmount/distinfo +++ b/sysutils/wmmount/distinfo @@ -1 +1 @@ -MD5 (wmmount-1.0-beta1.tgz) = f77926476c52cda5e52deb731784341a +MD5 (wmmount-1.0-beta2.tgz) = 54e6fe0a5842b7f9963730499f750549 diff --git a/sysutils/wmmount/files/patch-aa b/sysutils/wmmount/files/patch-aa index b0a1ffbb48ce..80207791974c 100644 --- a/sysutils/wmmount/files/patch-aa +++ b/sysutils/wmmount/files/patch-aa @@ -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 --git a/sysutils/wmmount/files/patch-ab b/sysutils/wmmount/files/patch-ab new file mode 100644 index 000000000000..ada3e84affd8 --- /dev/null +++ b/sysutils/wmmount/files/patch-ab @@ -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 --git a/sysutils/wmmount/files/patch-ac b/sysutils/wmmount/files/patch-ac new file mode 100644 index 000000000000..892b12789c17 --- /dev/null +++ b/sysutils/wmmount/files/patch-ac @@ -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 --git a/sysutils/wmmount/pkg-descr b/sysutils/wmmount/pkg-descr index 7a76bde38097..9b28dc423411 100644 --- a/sysutils/wmmount/pkg-descr +++ b/sysutils/wmmount/pkg-descr @@ -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 --git a/sysutils/wmmount/pkg-plist b/sysutils/wmmount/pkg-plist index c6be649b484b..e12118a36447 100644 --- a/sysutils/wmmount/pkg-plist +++ b/sysutils/wmmount/pkg-plist @@ -3,6 +3,6 @@ lib/X11/wmmount/blank.xpm 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 -- cgit v1.2.3