[Midnightbsd-cvs] mports: x11/xscreensaver: Remove unneeded files.

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri Jun 13 10:37:53 EDT 2008 

Log Message:
-----------
Remove unneeded files.

Modified Files:
--------------
    mports/x11/xscreensaver:
        Makefile (r1.6 -> r1.7)
    mports/x11/xscreensaver/files:
        patch-driver_Makefile.in (r1.1 -> r1.2)

Added Files:
-----------
    mports/x11/xscreensaver/files:
        xscreensaver.pam (r1.1)

Removed Files:
-------------
    mports/x11/xscreensaver/files:
        patch-hacks_apple2-main.c
        patch-hacks_phosphor.c
        patch-hacks_webcollage

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/x11/xscreensaver/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -L x11/xscreensaver/Makefile -L x11/xscreensaver/Makefile -u -r1.6 -r1.7
--- x11/xscreensaver/Makefile
+++ x11/xscreensaver/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	xscreensaver
 PORTVERSION=	5.05
-PORTREVISION=   0
+PORTREVISION=   1
 CATEGORIES?=	x11
 MASTER_SITES=	http://www.jwz.org/xscreensaver/ \
 		http://dougbarton.us/Downloads/
@@ -45,9 +45,6 @@
 .if defined(WITH_ALL_FORTUNES)
 CONFIGURE_ARGS+=	--with-fortune="/usr/games/fortune -sa"
 .endif
-.if defined(WITH_SETUID_HACKS)
-CONFIGURE_ARGS+=	--with-setuid-hacks
-.endif
 .if defined(WITH_KERBEROS)
 CONFIGURE_ARGS+=	--with-kerberos
 .else
@@ -60,6 +57,9 @@
 CONFIGURE_ARGS+=	--without-pam
 PLIST_SUB+=		PAM="@comment not installed: "
 .endif
+.if defined(WITH_SETUID_HACKS)
+CONFIGURE_ARGS+=	--with-setuid-hacks
+.endif
 
 .undef HAVE_GNOME
 
@@ -130,17 +130,17 @@
 .for f in driver/passwd-pam.c driver/xscreensaver.man
 	@ ${CP} ${WRKSRC}/${f} ${WRKSRC}/${f}.presed
 	@ ${SED} -e "s#/etc/pam.d#${PREFIX}/etc/pam.d#g" \
-		${WRKSRC}/${f}.presed > ${WRKSRC}/${f}
+	    ${WRKSRC}/${f}.presed > ${WRKSRC}/${f}
 .endfor
 	@ ${CP} ${FILESDIR}/xscreensaver.pam ${WRKSRC}/driver/xscreensaver.pam
 .else
 	@ ${CP} ${WRKSRC}/driver/Makefile.in ${WRKSRC}/driver/Makefile.in.post
 	@ ${SED} -e "s#install-xml install-pam#install-xml#" \
-		${WRKSRC}/driver/Makefile.in.post > ${WRKSRC}/driver/Makefile.in
+	    ${WRKSRC}/driver/Makefile.in.post > ${WRKSRC}/driver/Makefile.in
 .endif
 
 post-install:
-	@(if test -x ${LOCALBASE}/bin/xscreensaver-hacks/webcollage-helper; then \
+	@(if test -x ${PREFIX}/bin/xscreensaver-hacks/webcollage-helper; then \
 		${ECHO} "bin/xscreensaver-hacks/webcollage-helper" | \
 			${CAT} - ${TMPPLIST} > ${TMPPLIST}.cat && \
 			${MV} ${TMPPLIST}.cat ${TMPPLIST}; fi)
--- x11/xscreensaver/files/patch-hacks_phosphor.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- hacks/phosphor.c.orig	Fri Mar 31 19:50:00 2006
-+++ hacks/phosphor.c	Sun Jun  4 00:01:46 2006
-@@ -41,6 +41,10 @@
- # ifdef HAVE_UTIL_H
- #  include <util.h>
- # endif
-+#include <sys/types.h>
-+#include <sys/ioctl.h>
-+#include <termios.h>
-+#include <libutil.h>
- #endif /* HAVE_FORKPTY */
- 
- #include "screenhack.h"
--- x11/xscreensaver/files/patch-hacks_apple2-main.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- hacks/apple2-main.c.orig	Sun Mar 26 21:34:17 2006
-+++ hacks/apple2-main.c	Sun Jun  4 00:01:46 2006
-@@ -39,6 +39,10 @@
- # ifdef HAVE_UTIL_H
- #  include <util.h>
- # endif
-+#include <sys/types.h>
-+#include <sys/ioctl.h>
-+#include <termios.h>
-+#include <libutil.h>
- #endif /* HAVE_FORKPTY */
- 
- #include "screenhack.h"
--- x11/xscreensaver/files/patch-hacks_webcollage
+++ /dev/null
@@ -1,23 +0,0 @@
---- hacks/webcollage.orig	Wed May 17 16:58:51 2006
-+++ hacks/webcollage	Sun Jun  4 00:01:46 2006
-@@ -38,6 +38,9 @@
- #
- # Driftnet is the Unix implementation of the MacOS "EtherPEG" program.
- 
-+BEGIN {
-+    eval "use bytes";
-+}
- 
- require 5;
- use strict;
-@@ -53,10 +56,6 @@
- require POSIX;
- use Fcntl ':flock'; # import LOCK_* constants
- use POSIX qw(strftime);
--
--use bytes;  # Larry can take Unicode and shove it up his ass sideways.
--            # Perl 5.8.0 causes us to start getting incomprehensible
--            # errors about UTF-8 all over the place without this.
- 
- 
- my $progname = $0; $progname =~ s at .*/@@g;
--- /dev/null
+++ x11/xscreensaver/files/xscreensaver.pam
@@ -0,0 +1,2 @@
+auth		include		system
+account		include		system
Index: patch-driver_Makefile.in
===================================================================
RCS file: /home/cvs/mports/x11/xscreensaver/files/patch-driver_Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -L x11/xscreensaver/files/patch-driver_Makefile.in -L x11/xscreensaver/files/patch-driver_Makefile.in -u -r1.1 -r1.2
--- x11/xscreensaver/files/patch-driver_Makefile.in
+++ x11/xscreensaver/files/patch-driver_Makefile.in
@@ -1,39 +1,28 @@
---- driver/Makefile.in.orig	Tue May 23 16:01:35 2006
-+++ driver/Makefile.in	Sun Jun  4 00:01:46 2006
-@@ -121,7 +121,7 @@
- 		  test-randr    xdpyinfo
+--- driver/Makefile.in.orig	2007-11-13 00:39:35.000000000 -0800
++++ driver/Makefile.in	2007-12-08 23:23:01.000000000 -0800
+@@ -81,8 +81,8 @@
  
- MOTIF_LIBS	= @MOTIF_LIBS@ @XPM_LIBS@ $(XMU_LIBS)
--GTK_LIBS	= @GTK_LIBS@ $(XMU_LIBS)
-+GTK_LIBS	= @GTK_LIBS@ @XPM_LIBS@ $(XMU_LIBS)
- XML_LIBS	= @XML_LIBS@
- 
- XDPMS_LIBS	= @XDPMS_LIBS@
-@@ -236,9 +236,8 @@
- MEN		= $(MEN_1) @MEN_OSX@
  
+ AD_DIR		= @APPDEFAULTS@
+-PAM_DIR		= /etc/pam.d
+-PAM_CONF	= /etc/pam.conf
++PAM_DIR		= ${prefix}/etc/pam.d
++PAM_CONF	= ${prefix}/etc/pam.conf
+ 
+ UTILS_SRC	= $(srcdir)/../utils
+ UTILS_BIN	= ../utils
+@@ -239,7 +239,6 @@
  EXTRAS		= README Makefile.in \
--		  XScreenSaver.ad.in XScreenSaver-Xm.ad xscreensaver.pam \
-+		  XScreenSaver.ad.in XScreenSaver-Xm.ad \
+ 		  XScreenSaver.ad.in XScreenSaver-Xm.ad xscreensaver.pam \
  		  xscreensaver-demo.glade2 xscreensaver-demo.glade2p \
 -		  screensaver-properties.desktop.in \
  		  .gdbinit
  VMSFILES	= compile_axp.com compile_decc.com link_axp.com link_decc.com \
  		  vms-getpwnam.c vms-pwd.h vms-hpwd.c vms-validate.c \
-@@ -257,7 +256,7 @@
- tests: $(TEST_EXES)
- 
- install:   install-program   install-ad    install-scripts \
--	   install-gnome     install-man   install-xml install-pam
-+	   install-gnome     install-man   install-xml
- uninstall: uninstall-program uninstall-ad  \
- 	   uninstall-gnome   uninstall-man uninstall-xml  
- 
-@@ -486,21 +485,6 @@
-  $$e ""									     ;\
+@@ -490,21 +489,6 @@
  	  fi ;								\
  	fi
--
+ 
 -# screensaver-properties.desktop
 -# into /usr/share/applications/
 -install-gnome:: screensaver-properties.desktop
@@ -48,6 +37,7 @@
 -		$(INSTALL_DATA) screensaver-properties.desktop		      \
 -		  $(install_prefix)$(GTK_APPDIR)/$$name2		     ;\
 -	 fi
- 
+-
  
  # xscreensaver.xpm
+ # into /usr/share/pixmaps/

More information about the Midnightbsd-cvs mailing list