Attachment 69805 Details for Bug 102029 – file.diff

[patch] file.diff

file.diff (text/plain), 7.96 KB, created by Jim Pirzyk on 2006-08-14 21:10:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jim Pirzyk

Created: 2006-08-14 21:10:17 UTC

Size: 7.96 KB

patch

obsolete

>diff -Nru psgconf.orig/Makefile psgconf/Makefile
>--- psgconf.orig/Makefile	Sun Jul 23 05:05:32 2006
>+++ psgconf/Makefile	Mon Aug 14 14:52:35 2006
>@@ -6,7 +6,8 @@
> #
> 
> PORTNAME=	psgconf
>-PORTVERSION=	3.2
>+PORTVERSION=	3.2.1
>+PORTREVISION=	1
> CATEGORIES=	sysutils
> MASTER_SITES=	ftp://ftp-dev.cites.uiuc.edu/pub/psgconf/
> 
>@@ -26,7 +27,9 @@
> MAN1=		psgconf.1
> MAN3=		PSGConf.3 \
> 		PSGConf::Action.3 \
>+		PSGConf::Action::ChGrp.3 \
> 		PSGConf::Action::ChMod.3 \
>+		PSGConf::Action::ChOwn.3 \
> 		PSGConf::Action::CopyFile.3 \
> 		PSGConf::Action::CreateFile.3 \
> 		PSGConf::Action::Crontab.3 \
>@@ -186,26 +189,18 @@
> IGNORE=		requires perl 5.6 or newer
> .endif
> 
>-.if ${OSVERSION} <= 600000
>-BROKEN=		does not compile on 4.X/5.X
>-.else
>-BROKEN=		attempts to modify file under /usr/ports, which could be an RO file system
>-.endif
>+PKGINSTALL=	${WRKSRC}/postinstall
> 
> post-patch:
> 	${FIND} ${WRKSRC} -name "*.orig" -delete
> 
> post-build:
> 	cd ${WRKSRC} && ${MAKE} test
>-	${CP} ${WRKSRC}/postinstall ${PKGINSTALL}
> 
> post-install:
> 	-@${MKDIR} ${PREFIX}/etc
> 	@${CP} ${WRKSRC}/etc/psg.conf ${PREFIX}/etc/psg.conf.sample
> 	@${CP} ${WRKSRC}/etc/psgconf_modules ${PREFIX}/etc/psgconf_modules.sample
> 	PKG_PREFIX=${PREFIX} PKG_MGR=FreeBSD::Ports ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
>-
>-post-clean:
>-	@${RM} -f ${PKGINSTALL}
> 
> .include <bsd.port.post.mk>
>diff -Nru psgconf.orig/distinfo psgconf/distinfo
>--- psgconf.orig/distinfo	Sun Jul  2 05:40:32 2006
>+++ psgconf/distinfo	Mon Aug 14 13:43:11 2006
>@@ -1,3 +1,3 @@
>-MD5 (psgconf-3.2.tar.gz) = d51617f6d2e41ef3fcf5eaa3d5f01f05
>-SHA256 (psgconf-3.2.tar.gz) = e55d35e517ea115a903d2d99d2dade0bdfd6c9594a3322f36fe50d0e1f277a95
>-SIZE (psgconf-3.2.tar.gz) = 232351
>+MD5 (psgconf-3.2.1.tar.gz) = d9be38204425f72c611b7a0c51540b35
>+SHA256 (psgconf-3.2.1.tar.gz) = a4a8d31871dc653e359804431534593be807ece10edf8bbcd4dd0074ed988b92
>+SIZE (psgconf-3.2.1.tar.gz) = 234015
>diff -Nru psgconf.orig/files/patch-Makefile.PL psgconf/files/patch-Makefile.PL
>--- psgconf.orig/files/patch-Makefile.PL	Thu Nov 24 07:04:29 2005
>+++ psgconf/files/patch-Makefile.PL	Mon Aug 14 13:45:20 2006
>@@ -6,6 +6,7 @@
>  
> -$etc_dir	= '/etc';
> +$etc_dir	= '$(PREFIX)/etc';
>- $share_dir	= '$(PREFIX)/share/psgconf';
>+-$share_dir	= '/usr/local/share/psgconf';
>++$share_dir	= '$(PREFIX)/share/psgconf';
>  
>  GetOptions(
>diff -Nru psgconf.orig/pkg-plist psgconf/pkg-plist
>--- psgconf.orig/pkg-plist	Sun Jan 22 05:38:23 2006
>+++ psgconf/pkg-plist	Mon Aug 14 15:00:05 2006
>@@ -2,33 +2,40 @@
> @unexec cmp %D/etc/psgconf_modules.sample %D/etc/psgconf_modules && rm %D/etc/psgconf_modules
> etc/psg.conf.sample
> etc/psgconf_modules.sample
>+sbin/ConfigFile2Storable
> sbin/psgconf
>+sbin/psgconf-import
> sbin/platform-name
>-share/psgconf/config/defaults.conf
>-share/psgconf/config/platform-freebsd4.conf
>-share/psgconf/config/platform-freebsd5.conf
>-share/psgconf/config/platform-freebsd6.conf
>-share/psgconf/config/platform-hpux10.conf
>-share/psgconf/config/platform-hpux11.conf
>-share/psgconf/config/platform-irix6.conf
>-share/psgconf/config/platform-ix86-linux2.4.conf
>-share/psgconf/config/platform-rs6000-aix4.3.3.conf
>-share/psgconf/config/platform-rs6000-aix5.1.0.conf
>-share/psgconf/config/platform-sparc-solaris8.conf
>-share/psgconf/config/platform-sparc-solaris9.conf
>-share/psgconf/config/platform-sparc-solaris10.conf
>-share/psgconf/files/magic
>-share/psgconf/files/rc.shutdown
>+%%DATADIR%%/config/defaults.conf
>+%%DATADIR%%/config/platform-fc4.conf
>+%%DATADIR%%/config/platform-freebsd4.conf
>+%%DATADIR%%/config/platform-freebsd5.conf
>+%%DATADIR%%/config/platform-freebsd6.conf
>+%%DATADIR%%/config/platform-hpux10.conf
>+%%DATADIR%%/config/platform-hpux11.conf
>+%%DATADIR%%/config/platform-irix6.conf
>+%%DATADIR%%/config/platform-rhel3.conf
>+%%DATADIR%%/config/platform-rhel4.conf
>+%%DATADIR%%/config/platform-rs6000-aix4.3.3.conf
>+%%DATADIR%%/config/platform-rs6000-aix5.1.0.conf
>+%%DATADIR%%/config/platform-solaris8.conf
>+%%DATADIR%%/config/platform-solaris9.conf
>+%%DATADIR%%/config/platform-solaris10.conf
>+%%DATADIR%%/files/magic
>+%%DATADIR%%/files/rc.shutdown
> %%SITE_PERL%%//%%PERL_ARCH%%/auto/PSGConf/.packlist
> %%SITE_PERL%%/psgconf-intro.pod
> %%SITE_PERL%%/PSGConf.pm
> %%SITE_PERL%%/PSGConf/Action.pm
>+%%SITE_PERL%%/PSGConf/Action/ChGrp.pm
> %%SITE_PERL%%/PSGConf/Action/ChMod.pm
>+%%SITE_PERL%%/PSGConf/Action/ChOwn.pm
> %%SITE_PERL%%/PSGConf/Action/CopyFile.pm
> %%SITE_PERL%%/PSGConf/Action/CreateFile.pm
> %%SITE_PERL%%/PSGConf/Action/Crontab.pm
> %%SITE_PERL%%/PSGConf/Action/File.pm
> %%SITE_PERL%%/PSGConf/Action/GenerateFile.pm
>+%%SITE_PERL%%/PSGConf/Action/GenerateFile/AppConfig.pm
> %%SITE_PERL%%/PSGConf/Action/GenerateFile/BSD_exports.pm
> %%SITE_PERL%%/PSGConf/Action/GenerateFile/EnvFile.pm
> %%SITE_PERL%%/PSGConf/Action/GenerateFile/Literal.pm
>@@ -90,6 +97,7 @@
> %%SITE_PERL%%/PSGConf/Action/PackageManager/FreeBSD/Ports.pm
> %%SITE_PERL%%/PSGConf/Action/PackageManager/RedHat/RHN.pm
> %%SITE_PERL%%/PSGConf/Action/PackageManager/RedHat/RPMS.pm
>+%%SITE_PERL%%/PSGConf/Action/PackageManager/RedHat/Yum.pm
> %%SITE_PERL%%/PSGConf/Action/PackageManager/Solaris.pm
> %%SITE_PERL%%/PSGConf/Action/Remove.pm
> %%SITE_PERL%%/PSGConf/Action/RemoveCrontab.pm
>@@ -99,6 +107,7 @@
> %%SITE_PERL%%/PSGConf/Action/Symlink.pm
> %%SITE_PERL%%/PSGConf/Action/TouchFile.pm
> %%SITE_PERL%%/PSGConf/Action/UntarFile.pm
>+%%SITE_PERL%%/PSGConf/Action/svcs/addpg.pm
> %%SITE_PERL%%/PSGConf/Action/svcs/import.pm
> %%SITE_PERL%%/PSGConf/Action/svcs/setprop.pm
> %%SITE_PERL%%/PSGConf/Control.pm
>@@ -112,9 +121,6 @@
> %%SITE_PERL%%/PSGConf/Control/FreeBSD.pm
> %%SITE_PERL%%/PSGConf/Control/InitScripts.pm
> %%SITE_PERL%%/PSGConf/Control/Inittab.pm
>-%%SITE_PERL%%/PSGConf/Control/Library/crle.pm
>-%%SITE_PERL%%/PSGConf/Control/Library/ld_so_conf.pm
>-%%SITE_PERL%%/PSGConf/Control/Library/ldconfig.pm
> %%SITE_PERL%%/PSGConf/Control/NFS_Client.pm
> %%SITE_PERL%%/PSGConf/Control/NFS_Server.pm
> %%SITE_PERL%%/PSGConf/Control/NTP.pm
>@@ -124,10 +130,12 @@
> %%SITE_PERL%%/PSGConf/Control/Packages.pm
> %%SITE_PERL%%/PSGConf/Control/PostgreSQL.pm
> %%SITE_PERL%%/PSGConf/Control/Printers.pm
>-%%SITE_PERL%%/PSGConf/Control/RHN.pm
> %%SITE_PERL%%/PSGConf/Control/RPC.pm
>+%%SITE_PERL%%/PSGConf/Control/RPC/rstatd.pm
> %%SITE_PERL%%/PSGConf/Control/Resolver.pm
>+%%SITE_PERL%%/PSGConf/Control/RedHat.pm
> %%SITE_PERL%%/PSGConf/Control/SASL.pm
>+%%SITE_PERL%%/PSGConf/Control/SharedLibrary.pm
> %%SITE_PERL%%/PSGConf/Control/ShellStartupFiles.pm
> %%SITE_PERL%%/PSGConf/Control/Shells.pm
> %%SITE_PERL%%/PSGConf/Control/Solaris.pm
>@@ -145,6 +153,7 @@
> %%SITE_PERL%%/PSGConf/Control/sendmail.pm
> %%SITE_PERL%%/PSGConf/Control/sshd.pm
> %%SITE_PERL%%/PSGConf/Control/sudo.pm
>+%%SITE_PERL%%/PSGConf/Control/swatch.pm
> %%SITE_PERL%%/PSGConf/Control/syslog.pm
> %%SITE_PERL%%/PSGConf/Data.pm
> %%SITE_PERL%%/PSGConf/Data/Boolean.pm
>@@ -155,7 +164,17 @@
> %%SITE_PERL%%/PSGConf/Data/List.pm
> %%SITE_PERL%%/PSGConf/Data/String.pm
> %%SITE_PERL%%/PSGConf/Data/Table.pm
>+%%SITE_PERL%%/PSGConf/DataStore.pm
>+%%SITE_PERL%%/PSGConf/DataStore/AppConfig.pm
> %%SITE_PERL%%/PSGConf/DataStore/ConfigFile.pm
>+%%SITE_PERL%%/PSGConf/DataStore/Storable.pm
>+%%SITE_PERL%%/PSGConf/Import/Data/Hash.pm
>+%%SITE_PERL%%/PSGConf/Import/Data/List.pm
>+%%SITE_PERL%%/PSGConf/Import/Data/Table.pm
>+%%SITE_PERL%%/PSGConf/Import/inittab.pm
>+%%SITE_PERL%%/PSGConf/Import/pkg_default_versions.pm
>+%%SITE_PERL%%/PSGConf/Import/ports.pm
>+%%SITE_PERL%%/PSGConf/Import/shells.pm
> %%SITE_PERL%%/PSGConf/Util.pm
> @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PSGConf
> @dirrmtry %%SITE_PERL%%/PSGConf/Action/PackageManager/RedHat
>@@ -166,10 +185,13 @@
> @dirrmtry %%SITE_PERL%%/PSGConf/Action
> @dirrmtry %%SITE_PERL%%/PSGConf/Control/Apache
> @dirrmtry %%SITE_PERL%%/PSGConf/Control/Library
>+@dirrmtry %%SITE_PERL%%/PSGConf/Control/RPC
> @dirrmtry %%SITE_PERL%%/PSGConf/Control
> @dirrmtry %%SITE_PERL%%/PSGConf/Data
> @dirrmtry %%SITE_PERL%%/PSGConf/DataStore
>+@dirrmtry %%SITE_PERL%%/PSGConf/Import/Data
>+@dirrmtry %%SITE_PERL%%/PSGConf/Import
> @dirrmtry %%SITE_PERL%%/PSGConf
>-@dirrmtry share/psgconf/config
>-@dirrmtry share/psgconf/files
>-@dirrmtry share/psgconf
>+@dirrmtry %%DATADIR%%/config
>+@dirrmtry %%DATADIR%%/files
>+@dirrmtry %%DATADIR%%

Actions: View | Diff

Attachments on bug 102029: 69805