Changeset c60c604


Ignore:
Timestamp:
09/26/13 11:36:52 (10 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2
Children:
1b89eeb
Parents:
55ea386
Message:

Add a new "mkports.sh" helper script, which will convert the git tree into
the pcbsd-utils & pcbsd-utils-qt4 ports.

While here, convert the pcbsd-utils port to use STAGING

Files:
1 added
42 edited

Legend:

Unmodified
Added
Removed
  • src-sh/Makefile

    r55ea386 rc60c604  
    2020CHK_DIR_EXISTS= test -d 
    2121MKDIR         = mkdir -p 
     22PREFIX?= $(STAGEDIR)/usr/local 
    2223SUBTARGETS    =  \ 
    2324                sub-libsh \ 
  • src-sh/about/Makefile

    r1620346 rc60c604  
    55####### Compiler, tools and options 
    66 
     7PREFIX?= /usr/local 
    78AR            = ar cqs 
    8 QMAKE         = /usr/local/bin/qmake-qt4 
    99TAR           = tar -cf 
    1010COMPRESS      = gzip -9f 
     
    3232 
    3333install_scripts: first FORCE 
    34         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/  
    35         -$(INSTALL_FILE) about $(INSTALL_ROOT)/usr/local/bin/ 
     34        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
     35        -$(INSTALL_FILE) about $(INSTALL_ROOT)$(PREFIX)/bin/ 
    3636 
    3737 
    3838uninstall_scripts:  FORCE 
    39         -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/bin/about 
    40         -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/bin/  
     39        -$(DEL_FILE) -r $(INSTALL_ROOT)$(PREFIX)/bin/about 
     40        -$(DEL_DIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
    4141 
    4242 
    4343install_dochmod: first FORCE 
    44         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/  
    45         chmod 755 /usr/local/bin/about 
     44        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
     45        chmod 755 $(PREFIX)/bin/about 
    4646 
    4747 
  • src-sh/de-info/Makefile

    r1620346 rc60c604  
    44 
    55####### Compiler, tools and options 
    6  
     6PREFIX?= /usr/local 
    77AR            = ar cqs 
    88RANLIB        =  
     
    3131 
    3232install_scripts: first FORCE 
    33         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/  
    34         -$(INSTALL_FILE) de-info $(INSTALL_ROOT)/usr/local/bin/ 
     33        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
     34        -$(INSTALL_FILE) de-info $(INSTALL_ROOT)$(PREFIX)/bin/ 
    3535 
    3636uninstall_scripts:  FORCE 
    37         -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/bin/de-info 
    38         -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/bin/  
     37        -$(DEL_FILE) -r $(INSTALL_ROOT)$(PREFIX)/bin/de-info 
     38        -$(DEL_DIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
    3939 
    4040install_dochmod: first FORCE 
    41         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/  
    42         chmod 755 /usr/local/bin/de-info 
     41        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
     42        chmod 755 $(PREFIX)/bin/de-info 
    4343 
    4444install_ddirs: first FORCE 
    45         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/share/pcbsd/de-profiles/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/share/pcbsd/de-profiles/  
    46         -$(INSTALL_DIR) de-profiles $(INSTALL_ROOT)/usr/local/share/pcbsd 
     45        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/de-profiles/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/de-profiles/  
     46        -$(INSTALL_DIR) de-profiles $(INSTALL_ROOT)$(PREFIX)/share/pcbsd 
    4747 
    4848uninstall_ddirs:  FORCE 
    49         -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/share/pcbsd/de-profiles/  
     49        -$(DEL_DIR) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/de-profiles/  
    5050 
    5151install:  install_scripts install_dochmod install_ddirs FORCE 
  • src-sh/libsh/Makefile

    r1620346 rc60c604  
    55####### Compiler, tools and options 
    66 
     7PREFIX?= /usr/local 
    78AR            = ar cqs 
    89TAR           = tar -cf 
     
    3132 
    3233install_scripts: first FORCE 
    33         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/share/pcbsd/scripts/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/share/pcbsd/scripts/ 
    34         -$(INSTALL_FILE) functions.sh $(INSTALL_ROOT)/usr/local/share/pcbsd/scripts/ 
     34        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/scripts/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/scripts/ 
     35        -$(INSTALL_FILE) functions.sh $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/scripts/ 
    3536 
    3637 
    3738uninstall_scripts:  FORCE 
    38         -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/share/pcbsd/scripts/functions.sh 
    39         -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/share/pcbsd/scripts 
     39        -$(DEL_FILE) -r $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/scripts/functions.sh 
     40        -$(DEL_DIR) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/scripts 
    4041 
    4142 
    4243install_dochmod: first FORCE 
    43         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/share/pcbsd/scripts/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/share/pcbsd/scripts/  
    44         chmod 755 /usr/local/share/pcbsd/scripts/functions.sh 
     44        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/scripts/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/scripts/  
     45        chmod 755 $(PREFIX)/share/pcbsd/scripts/functions.sh 
    4546 
    4647 
  • src-sh/lpreserver/Makefile

    rc684936 rc60c604  
    55####### Install 
    66 
     7PREFIX?= /usr/local 
     8 
    79all: 
    810 
    911install_doinstall: 
    10         sh install.sh 
     12        sh install.sh $(PREFIX) 
    1113 
    1214install:  install_doinstall 
  • src-sh/lpreserver/install.sh

    rc684936 rc60c604  
    11#!/bin/sh 
     2 
     3if [ -z "$1" ] ; then 
     4   STAGEDIR="/usr/local" 
     5else 
     6   STAGEDIR="$1" 
     7fi 
     8 
    29# lpreserver install script 
    3 PROGDIR="/usr/local/share/lpreserver" 
     10PROGDIR="${STAGEDIR}/share/lpreserver" 
    411 
    512mkdir -p ${PROGDIR} >/dev/null 2>/dev/null 
     
    815cd ${DIR} 
    916 
    10 cp lpreserver /usr/local/bin/lpreserver 
    11 chmod 755 /usr/local/bin/lpreserver 
     17cp lpreserver ${STAGEDIR}/bin/lpreserver 
     18chmod 755 ${STAGEDIR}/bin/lpreserver 
    1219 
    1320if [ -d "${PROGDIR}/backend" ] ; then 
  • src-sh/pbi-manager/Makefile

    r1620346 rc60c604  
    22# Makefile for building: pbi-manager 
    33############################################################################# 
     4 
     5PREFIX?= $(STAGEDIR) 
    46 
    57####### Install 
     
    810 
    911install_doinstall: 
    10         sh install.sh 
     12        sh install.sh $(PREFIX) 
    1113 
    1214install:  install_doinstall 
  • src-sh/pbi-manager/install.sh

    re747491 rc60c604  
    5353do 
    5454  rm ${LB}/man/man1/${i}.gz >/dev/null 2>/dev/null 
    55   cp man1/${i} ${LB}/man/man1/${i} 
     55  gzip -c man1/${i} > ${LB}/man/man1/${i}.gz 
    5656done 
    5757 
     
    6060do 
    6161  rm ${LB}/man/man5/${i}.gz >/dev/null 2>/dev/null 
    62   cp man5/${i} ${LB}/man/man5/${i} 
     62  gzip -c man5/${i} > ${LB}/man/man5/${i}.gz 
    6363done 
    6464 
     
    6868do 
    6969  rm ${LB}/man/man8/${i}.gz >/dev/null 2>/dev/null 
    70   cp man8/${i} ${LB}/man/man8/${i} 
     70  gzip -c man8/${i} > ${LB}/man/man8/${i}.gz 
    7171done 
    7272 
     
    8383 
    8484# If this is a new install, add the PC-BSD master repo 
    85 if [ ! -d "/var/db/pbi/keys" ] ; then 
    86         pbi_addrepo ${DIR}/repo/pcbsd.rpo 
    87 fi 
     85#if [ ! -d "/var/db/pbi/keys" ] ; then 
     86#       pbi_addrepo ${DIR}/repo/pcbsd.rpo 
     87#fi 
    8888 
    8989# Copy the default PC-BSD repo file 
     
    9797cp ${DIR}/etc/pbi.conf ${LB}/etc/pbi.conf 
    9898 
    99 if [ ! -d "/usr/pbi" ] ; then mkdir /usr/pbi ; fi 
    100  
    10199# Create the wrapper binary 
    102100cd ${DIR}/wrapper 
     
    104102  # Build 32bit wrapper 
    105103  echo "Building i386 wrapper..." 
    106   rm .pbiwrapper >/dev/null 2>/dev/null 
     104  rm pbiwrapper >/dev/null 2>/dev/null 
    107105  make clean 
    108106  make DEFINES="-mtune=i386 -march=i386 -m32" 
    109107  make install 
    110   chown root:wheel /usr/pbi/.pbiwrapper  
    111   chmod 644 /usr/pbi/.pbiwrapper 
    112   mv /usr/pbi/.pbiwrapper ${LB}/share/pbi-manager/.pbiwrapper-i386 
     108  chown root:wheel pbiwrapper  
     109  chmod 644 pbiwrapper 
     110  mv pbiwrapper ${LB}/share/pbi-manager/.pbiwrapper-i386 
    113111else 
    114112  touch ${LB}/share/pbi-manager/.pbiwrapper-i386 
     
    119117DEFINES="" 
    120118export DEFINES 
    121 rm .pbiwrapper >/dev/null 2>/dev/null 
     119rm pbiwrapper >/dev/null 2>/dev/null 
    122120make clean 
    123121make DEFINES="" 
    124122make install DEFINES="" 
    125 chown root:wheel /usr/pbi/.pbiwrapper  
    126 chmod 644 /usr/pbi/.pbiwrapper 
    127 mv /usr/pbi/.pbiwrapper ${LB}/share/pbi-manager/.pbiwrapper-`uname -m` 
     123chown root:wheel pbiwrapper  
     124chmod 644 pbiwrapper 
     125mv pbiwrapper ${LB}/share/pbi-manager/.pbiwrapper-`uname -m` 
  • src-sh/pbi-manager/pbi-manager

    re858767 rc60c604  
    75177517 
    75187518# Source our shared PCBSD functions 
    7519 . /usr/local/share/pcbsd/scripts/functions.sh 
     7519if [ -z "$ALTPROGPREFIX" ] ; then 
     7520  . ${ALTPROGPREFIX}/share/pcbsd/scripts/functions.sh 
     7521else 
     7522  . /usr/local/share/pcbsd/scripts/functions.sh 
     7523fi 
    75207524 
    75217525# Set the default umask 
  • src-sh/pbi-manager/wrapper/Makefile

    r1620346 rc60c604  
    1515AR            = ar cqs 
    1616RANLIB        =  
    17 QMAKE         = /usr/local/bin/qmake-qt4 
    1817TAR           = tar -cf 
    1918COMPRESS      = gzip -9f 
     
    4140SOURCES       = main.c  
    4241OBJECTS       = main.o 
    43 MAKE_TARGET   = .pbiwrapper 
    44 DESTDIR       = /usr/pbi/ 
    45 TARGET        = .pbiwrapper 
     42MAKE_TARGET   = pbiwrapper 
     43TARGET        = pbiwrapper 
    4644 
    4745first: all 
     
    7068 
    7169$(TARGET):  $(OBJECTS)   
    72         @$(CHK_DIR_EXISTS) /usr/pbi/ || $(MKDIR) /usr/pbi/ 
    7370        $(CC) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) 
    7471 
     
    125122 
    126123install_scripts: first FORCE 
    127         -@$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/pbi || $(MKDIR) $(INSTALL_ROOT)/usr/pbi/ 
    128         -$(INSTALL_FILE) .pbiwrapper $(INSTALL_ROOT)/usr/pbi/.pbiwrapper 
    129124 
    130125install:   FORCE install_scripts 
  • src-sh/pbi-manager10/Makefile

    r651bd28 rc60c604  
    22# Makefile for building: pbi-manager 
    33############################################################################# 
     4 
     5PREFIX?= /usr/local 
    46 
    57####### Install 
     
    810 
    911install_doinstall: 
    10         sh install.sh 
     12        sh install.sh $(PREFIX) 
    1113 
    1214install:  install_doinstall 
  • src-sh/pbreg/Makefile

    r1620346 rc60c604  
    55####### Compiler, tools and options 
    66 
     7PREFIX?= /usr/local 
    78AR            = ar cqs 
    89TAR           = tar -cf 
     
    3132 
    3233install_scripts: first FORCE 
    33         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/  
    34         -$(INSTALL_FILE) pbreg $(INSTALL_ROOT)/usr/local/bin/ 
     34        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
     35        -$(INSTALL_FILE) pbreg $(INSTALL_ROOT)$(PREFIX)/bin/ 
    3536 
    3637 
    3738uninstall_scripts:  FORCE 
    38         -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/bin/pbreg 
    39         -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/bin/  
     39        -$(DEL_FILE) -r $(INSTALL_ROOT)$(PREFIX)/bin/pbreg 
     40        -$(DEL_DIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
    4041 
    4142 
    4243install_dochmod: first FORCE 
    43         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/  
    44         chmod 755 /usr/local/bin/pbreg 
     44        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
     45        chmod 755 $(PREFIX)/bin/pbreg 
    4546 
    4647 
  • src-sh/pc-adctl/bin/Makefile

    r1620346 rc60c604  
     1PREFIX?= /usr/local 
     2 
    13FILES=pc-adctl pc-ldapctl 
    24 
    35FILESMODE=0555 
    4 FILESDIR=/usr/local/bin 
     6FILESDIR=$(PREFIX)/bin 
    57NO_OBJ= 
    68 
  • src-sh/pc-adctl/conf/Makefile

    r5e00148 rc60c604  
     1PREFIX?= /usr/local 
    12FILES=pc-activedirectory.conf pc-ldap.conf 
    23 
    34FILESMODE=0400 
    4 FILESDIR=/usr/local/etc/ 
     5FILESDIR=$(PREFIX)/etc/ 
    56NO_OBJ= 
    67 
  • src-sh/pc-adctl/pc-krbconf/Makefile

    r1620346 rc60c604  
    55.include <bsd.own.mk> 
    66 
     7PREFIX?= /usr/local 
    78MAN= 
    89PROGOWN=        root 
    910PROGGRP=        wheel 
    1011PROGMODE=       0555 
    11 DESTDIR=        /usr/local/bin 
     12DESTDIR=        $(PREFIX)/bin 
    1213 
    1314PROG=   pc-krbconf 
  • src-sh/pc-adctl/pc-ldapconf/Makefile

    r1620346 rc60c604  
    55.include <bsd.own.mk> 
    66 
     7PREFIX?= /usr/local 
    78MAN= 
    89PROGOWN=        root 
    910PROGGRP=        wheel 
    1011PROGMODE=       0555 
    11 DESTDIR=        /usr/local/bin 
     12DESTDIR=        $(PREFIX)/bin 
    1213 
    1314PROG=   pc-ldapconf 
  • src-sh/pc-adctl/pc-nssconf/Makefile

    r1620346 rc60c604  
    55.include <bsd.own.mk> 
    66 
     7PREFIX?= /usr/local 
    78MAN= 
    89PROGOWN=        root 
    910PROGGRP=        wheel 
    1011PROGMODE=       0555 
    11 DESTDIR=        /usr/local/bin 
     12DESTDIR=        $(PREFIX)/bin 
    1213 
    1314PROG=   pc-nssconf 
  • src-sh/pc-adctl/pc-nssldapconf/Makefile

    r1620346 rc60c604  
    55.include <bsd.own.mk> 
    66 
     7PREFIX?= /usr/local 
    78MAN= 
    89PROGOWN=        root 
    910PROGGRP=        wheel 
    1011PROGMODE=       0555 
    11 DESTDIR=        /usr/local/bin 
     12DESTDIR=        $(PREFIX)/bin 
    1213 
    1314PROG=   pc-nssldapconf 
  • src-sh/pc-adctl/pc-pamconf/Makefile

    r1620346 rc60c604  
    55.include <bsd.own.mk> 
    66 
     7PREFIX?= /usr/local 
    78MAN= 
    89PROGOWN=        root 
    910PROGGRP=        wheel 
    1011PROGMODE=       0555 
    11 DESTDIR=        /usr/local/bin 
     12DESTDIR=        $(PREFIX)/bin 
    1213 
    1314PROG=   pc-pamconf 
  • src-sh/pc-adctl/pc-sambaconf/Makefile

    r1620346 rc60c604  
    55.include <bsd.own.mk> 
    66 
     7PREFIX?= /usr/local 
    78MAN= 
    89PROGOWN=        root 
    910PROGGRP=        wheel 
    1011PROGMODE=       0555 
    11 DESTDIR=        /usr/local/bin 
     12DESTDIR=        $(PREFIX)/bin 
    1213 
    1314PROG=   pc-sambaconf 
  • src-sh/pc-adctl/rc/Makefile

    r1620346 rc60c604  
     1PREFIX?= /usr/local 
    12FILES=rc.activedirectory rc.ldap 
    23 
    34FILESMODE=0444 
    4 FILESDIR=/usr/local/etc/ 
     5FILESDIR=$(PREFIX)/etc/ 
    56NO_OBJ= 
    67 
  • src-sh/pc-adctl/scripts/Makefile

    r1620346 rc60c604  
     1PREFIX?= /usr/local 
    12FILES=pc-activedirectory pc-kerberos pc-kinit pc-nsswitch pc-pam \ 
    23        pc-samba pc-ldap pc-nssldap pc-directory 
    34 
    45FILESMODE=0555 
    5 FILESDIR=/usr/local/etc/rc.d 
     6FILESDIR=$(PREFIX)/etc/rc.d 
    67NO_OBJ= 
    78 
  • src-sh/pc-checkxdisplay/Makefile

    r1620346 rc60c604  
    33############################################################################# 
    44 
     5PREFIX?= /usr/local 
    56FILE          = pc-checkxdisplay 
    67AR            = ar cqs 
     
    2829 
    2930install_scripts: first FORCE 
    30         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/  
    31         -$(INSTALL_FILE) $(FILE) $(INSTALL_ROOT)/usr/local/bin/ 
     31        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
     32        -$(INSTALL_FILE) $(FILE) $(INSTALL_ROOT)$(PREFIX)/bin/ 
    3233 
    3334 
    3435uninstall_scripts:  FORCE 
    35         -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/bin/$(FILE) 
    36         -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/bin/  
     36        -$(DEL_FILE) -r $(INSTALL_ROOT)$(PREFIX)/bin/$(FILE) 
     37        -$(DEL_DIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
    3738 
    3839 
    3940install_dochmod: first FORCE 
    40         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/  
    41         chmod 755 /usr/local/bin/$(FILE) 
     41        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
     42        chmod 755 $(PREFIX)/bin/$(FILE) 
    4243 
    4344 
  • src-sh/pc-extractoverlay/Makefile

    r1620346 rc60c604  
    22# Makefile for building: pc-extractoverlay 
    33############################################################################# 
     4 
     5PREFIX?= /usr/local 
    46 
    57####### Install 
     
    810 
    911install_doinstall: 
    10         sh install.sh 
     12        sh install.sh $(PREFIX) 
    1113 
    1214install:  install_doinstall 
  • src-sh/pc-extractoverlay/install.sh

    r1620346 rc60c604  
    11#!/bin/sh 
    22 
    3 cp pc-extractoverlay /usr/local/bin/pc-extractoverlay 
     3DEFAULT="/usr/local" 
     4 
     5if [ -z "$1" ] ; then 
     6        LB="${DEFAULT}" 
     7else 
     8        LB="${1}" 
     9fi 
     10 
     11cp pc-extractoverlay ${LB}/bin/pc-extractoverlay 
    412if [ $? -ne 0 ] ; then 
    513  exit 1 
    614fi 
    7 chmod 755 /usr/local/bin/pc-extractoverlay 
     15chmod 755 ${LB}/bin/pc-extractoverlay 
    816if [ $? -ne 0 ] ; then 
    917  exit 1 
    1018fi 
    1119 
    12 if [ ! -d "/usr/local/share/pcbsd/conf" ] ; then 
    13   mkdir -p /usr/local/share/pcbsd/conf 
     20if [ ! -d "${LB}/share/pcbsd/conf" ] ; then 
     21  mkdir -p ${LB}/share/pcbsd/conf 
    1422fi 
    15 if [ ! -d "/usr/local/share/pcbsd/distfiles" ] ; then 
    16   mkdir -p /usr/local/share/pcbsd/distfiles 
     23if [ ! -d "${LB}/share/pcbsd/distfiles" ] ; then 
     24  mkdir -p ${LB}/share/pcbsd/distfiles 
    1725fi 
    1826 
    1927# Copy port prune list 
    20 cp prune-port-files /usr/local/share/pcbsd/conf 
     28cp prune-port-files ${LB}/share/pcbsd/conf 
    2129if [ $? -ne 0 ] ; then 
    2230  exit 1 
     
    2432 
    2533# Copy exclude list 
    26 cp port-excludes /usr/local/share/pcbsd/conf 
     34cp port-excludes ${LB}/share/pcbsd/conf 
    2735if [ $? -ne 0 ] ; then 
    2836  exit 1 
    2937fi 
    30 cp desktop-excludes /usr/local/share/pcbsd/conf 
     38cp desktop-excludes ${LB}/share/pcbsd/conf 
    3139if [ $? -ne 0 ] ; then 
    3240  exit 1 
    3341fi 
    34 cp server-excludes /usr/local/share/pcbsd/conf 
     42cp server-excludes ${LB}/share/pcbsd/conf 
    3543if [ $? -ne 0 ] ; then 
    3644  exit 1 
     
    3846 
    3947# Now create overlay.txz file 
    40 tar cvJf /usr/local/share/pcbsd/distfiles/port-overlay.txz -C ports-overlay . 
     48tar cvJ --uname "root" --gname "wheel" -f ${LB}/share/pcbsd/distfiles/port-overlay.txz -C ports-overlay . 
    4149if [ $? -ne 0 ] ; then 
    4250  exit 1 
     
    4452 
    4553# Now create desktop-overlay.txz file 
    46 tar cvJf /usr/local/share/pcbsd/distfiles/desktop-overlay.txz -C desktop-overlay . 
     54tar cvJ --uname "root" --gname "wheel" -f ${LB}/share/pcbsd/distfiles/desktop-overlay.txz -C desktop-overlay . 
    4755if [ $? -ne 0 ] ; then 
    4856  exit 1 
     
    5058 
    5159# Now create server-overlay.txz file 
    52 tar cvJf /usr/local/share/pcbsd/distfiles/server-overlay.txz -C server-overlay . 
     60tar cvJ --uname "root" --gname "wheel" -f ${LB}/share/pcbsd/distfiles/server-overlay.txz -C server-overlay . 
    5361if [ $? -ne 0 ] ; then 
    5462  exit 1 
  • src-sh/pc-fbsdupdatecheck/Makefile

    r1620346 rc60c604  
    11############################################################################# 
    2 # Makefile for building: /usr/local/bin/pc-fbsdupdatecheck 
     2# Makefile for building: $(PREFIX)/bin/pc-fbsdupdatecheck 
    33############################################################################# 
     4PREFIX?= /usr/local 
    45 
    56####### Compiler, tools and options 
     
    1011CFLAGS        = -pipe -O2 -Wall -W $(DEFINES) 
    1112CXXFLAGS      = -pipe -O2 -Wall -W $(DEFINES) 
    12 INCPATH       = -I/usr/local/include -I. -I/usr/local/include 
    1313LINK          = g++ 
    1414LFLAGS        = -Wl,-O1 -pthread 
     
    1616AR            = ar cqs 
    1717RANLIB        =  
    18 QMAKE         = /usr/local/bin/qmake-qt4 
    1918TAR           = tar -cf 
    2019COMPRESS      = gzip -9f 
     
    4342OBJECTS       = main.o 
    4443MAKE_TARGET   = pc-fbsdupdatecheck 
    45 DESTDIR       = /usr/local/bin/ 
     44DESTDIR       = $(PREFIX)/bin/ 
    4645TARGET        = pc-fbsdupdatecheck 
    4746 
     
    7170 
    7271$(TARGET):  $(OBJECTS)   
    73         @$(CHK_DIR_EXISTS) /usr/local/bin/ || $(MKDIR) /usr/local/bin/  
     72        @$(CHK_DIR_EXISTS) $(PREFIX)/bin/ || $(MKDIR) $(PREFIX)/bin/  
    7473        $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) 
    7574 
     
    126125 
    127126install_scripts: first FORCE 
    128         -@$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/ 
    129         -$(INSTALL_FILE) pc-fbsdupdatecheck $(INSTALL_ROOT)/usr/local/bin/ 
     127        -@$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/ 
     128        -$(INSTALL_FILE) pc-fbsdupdatecheck $(INSTALL_ROOT)$(PREFIX)/bin/ 
    130129 
    131130install:   FORCE install_scripts 
  • src-sh/pc-firstgui/Makefile

    r1620346 rc60c604  
    44 
    55####### Compiler, tools and options 
     6 
     7PREFIX?= /usr/local 
    68 
    79AR            = ar cqs 
     
    3133 
    3234install_scripts: first FORCE 
    33         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/  
    34         -$(INSTALL_FILE) pc-firstgui $(INSTALL_ROOT)/usr/local/bin/ 
     35        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
     36        -$(INSTALL_FILE) pc-firstgui $(INSTALL_ROOT)$(PREFIX)/bin/ 
    3537 
    3638 
    3739uninstall_scripts:  FORCE 
    38         -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/bin/pc-firstgui 
    39         -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/bin/  
     40        -$(DEL_FILE) -r $(INSTALL_ROOT)$(PREFIX)/bin/pc-firstgui 
     41        -$(DEL_DIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
    4042 
    4143 
    4244install_dochmod: first FORCE 
    43         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/  
    44         chmod 755 /usr/local/bin/pc-firstgui 
     45        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
     46        chmod 755 $(PREFIX)/bin/pc-firstgui 
    4547 
    4648 
  • src-sh/pc-metapkgmanager/Makefile

    r1620346 rc60c604  
    44 
    55####### Compiler, tools and options 
     6 
     7PREFIX?= /usr/local 
    68 
    79AR            = ar cqs 
     
    3133 
    3234install_scripts: first FORCE 
    33         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/  
    34         -$(INSTALL_FILE) pc-metapkgmanager $(INSTALL_ROOT)/usr/local/bin/ 
    35         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/share/pcbsd/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/share/pcbsd/ 
    36         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/share/pcbsd/metaset/ || rm -rf /usr/local/share/pcbsd/metaset 
    37         cp -r metaset /usr/local/share/pcbsd/metaset 
    38         cd /usr/local/bin/ && ln -f pc-metapkgmanager pc-pkg 
     35        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
     36        -$(INSTALL_FILE) pc-metapkgmanager $(INSTALL_ROOT)$(PREFIX)/bin/ 
     37        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/ 
     38        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/metaset/ || rm -rf $(PREFIX)/share/pcbsd/metaset 
     39        cp -r metaset $(PREFIX)/share/pcbsd/metaset 
     40        cd $(PREFIX)/bin/ && ln -f pc-metapkgmanager pc-pkg 
    3941 
    4042uninstall_scripts:  FORCE 
    41         -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/bin/pc-metapkgmanager 
    42         -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/bin/  
     43        -$(DEL_FILE) -r $(INSTALL_ROOT)$(PREFIX)/bin/pc-metapkgmanager 
     44        -$(DEL_DIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
    4345 
    4446install_dochmod: first FORCE 
    45         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/  
    46         chmod 755 /usr/local/bin/pc-metapkgmanager 
     47        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
     48        chmod 755 $(PREFIX)/bin/pc-metapkgmanager 
    4749 
    4850install:  install_scripts install_dochmod  FORCE 
  • src-sh/pc-runxgui/Makefile

    r1620346 rc60c604  
    22# Makefile for building: pc-runxgui 
    33############################################################################# 
     4 
     5PREFIX?= /usr/local 
    46 
    57AR            = ar cqs 
     
    2729 
    2830install_scripts: first FORCE 
    29         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/  
    30         -$(INSTALL_FILE) pc-runxgui $(INSTALL_ROOT)/usr/local/bin/ 
     31        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
     32        -$(INSTALL_FILE) pc-runxgui $(INSTALL_ROOT)$(PREFIX)/bin/ 
    3133 
    3234 
    3335uninstall_scripts:  FORCE 
    34         -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/bin/pc-runxgui 
    35         -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/bin/  
     36        -$(DEL_FILE) -r $(INSTALL_ROOT)$(PREFIX)/bin/pc-runxgui 
     37        -$(DEL_DIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
    3638 
    3739 
    3840install_dochmod: first FORCE 
    39         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/  
    40         chmod 755 /usr/local/bin/pc-runxgui 
     41        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
     42        chmod 755 $(PREFIX)/bin/pc-runxgui 
    4143 
    4244 
  • src-sh/pc-su/Makefile

    r1620346 rc60c604  
    55####### Compiler, tools and options 
    66 
     7PREFIX?= /usr/local 
     8 
    79AR            = ar cqs 
    8 QMAKE         = /usr/local/bin/qmake-qt4 
    910TAR           = tar -cf 
    1011COMPRESS      = gzip -9f 
     
    3233 
    3334install_scripts: first FORCE 
    34         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/  
    35         -$(INSTALL_FILE) pc-su $(INSTALL_ROOT)/usr/local/bin/ 
     35        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
     36        -$(INSTALL_FILE) pc-su $(INSTALL_ROOT)$(PREFIX)/bin/ 
    3637 
    3738 
    3839uninstall_scripts:  FORCE 
    39         -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/bin/pc-su 
    40         -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/bin/  
     40        -$(DEL_FILE) -r $(INSTALL_ROOT)$(PREFIX)/bin/pc-su 
     41        -$(DEL_DIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
    4142 
    4243 
    4344install_dochmod: first FORCE 
    44         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/  
    45         chmod 755 /usr/local/bin/pc-su 
     45        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
     46        chmod 755 $(PREFIX)/bin/pc-su 
    4647 
    4748 
  • src-sh/pc-sysinstall/Makefile

    r1620346 rc60c604  
    22# Makefile for building: pc-sysinstall 
    33############################################################################# 
     4PREFIX?= /usr/local 
    45 
    56####### Install 
     
    89 
    910install_doinstall: 
    10         sh install.sh 
     11        sh install.sh $(PREFIX) 
    1112 
    1213install: install_doinstall 
  • src-sh/pc-sysinstall/install.sh

    r1620346 rc60c604  
    11#!/bin/sh 
    22 
    3 if [ -z "$LOCALBASE" ] ; then 
     3if [ -z "$1" ] ; then 
    44   LOCALBASE=/usr/local 
     5else 
     6   LOCALBASE="$1" 
    57fi 
    68 
     
    2729    rm ${LOCALBASE}/man/man8/${i}.gz >/dev/null 2>/dev/null 
    2830  fi 
    29   cp man8/${i} ${LOCALBASE}/man/man8/${i} 
     31  gzip -c man8/${i} > ${LOCALBASE}/man/man8/${i}.gz 
    3032done 
    3133 
  • src-sh/pc-thinclient/Makefile

    r1620346 rc60c604  
    22# Makefile for building: pc-xdgutil 
    33############################################################################# 
     4 
     5PREFIX?= /usr/local 
    46 
    57AR            = ar cqs 
     
    2729 
    2830install_scripts: first FORCE 
    29         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/  
    30         -$(INSTALL_FILE) pc-thinclient $(INSTALL_ROOT)/usr/local/bin/ 
     31        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
     32        -$(INSTALL_FILE) pc-thinclient $(INSTALL_ROOT)$(PREFIX)/bin/ 
    3133 
    3234 
    3335uninstall_scripts:  FORCE 
    34         -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/bin/pc-thinclient 
    35         -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/bin/  
     36        -$(DEL_FILE) -r $(INSTALL_ROOT)$(PREFIX)/bin/pc-thinclient 
     37        -$(DEL_DIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
    3638 
    3739 
    3840install_dochmod: first FORCE 
    39         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/  
    40         chmod 755 /usr/local/bin/pc-thinclient 
     41        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
     42        chmod 755 $(PREFIX)/bin/pc-thinclient 
    4143 
    4244 
    4345install_ddirs: first FORCE 
    44         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-thinclient/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-thinclient/  
    45         -$(INSTALL_DIR) resources $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-thinclient/ 
     46        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/pc-thinclient/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/pc-thinclient/  
     47        -$(INSTALL_DIR) resources $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/pc-thinclient/ 
    4648 
    4749uninstall_ddirs:  FORCE 
    48         -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-thinclient/resources 
    49         -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-thinclient/  
     50        -$(DEL_FILE) -r $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/pc-thinclient/resources 
     51        -$(DEL_DIR) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/pc-thinclient/  
    5052 
    5153install:  install_scripts install_dochmod install_ddirs  FORCE 
  • src-sh/pc-updatemanager/Makefile

    r1620346 rc60c604  
    22# Makefile for building: pc-updatemanager 
    33############################################################################# 
     4 
     5PREFIX?= /usr/local 
    46 
    57AR            = ar cqs 
     
    2729 
    2830install_scripts: first FORCE 
    29         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/  
    30         -$(INSTALL_FILE) pc-updatemanager $(INSTALL_ROOT)/usr/local/bin/ 
     31        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
     32        -$(INSTALL_FILE) pc-updatemanager $(INSTALL_ROOT)$(PREFIX)/bin/ 
    3133 
    3234 
    3335uninstall_scripts:  FORCE 
    34         -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/bin/pc-updatemanager 
    35         -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/bin/  
     36        -$(DEL_FILE) -r $(INSTALL_ROOT)$(PREFIX)/bin/pc-updatemanager 
     37        -$(DEL_DIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
    3638 
    3739 
    3840install_dochmod: first FORCE 
    39         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/  
    40         chmod 755 /usr/local/bin/pc-updatemanager 
     41        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
     42        chmod 755 $(PREFIX)/bin/pc-updatemanager 
    4143 
    4244install_conf: first FORCE 
    43         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-updatemanager/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-updatemanager/  
    44         -$(INSTALL_DIR) conf $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-updatemanager/ 
     45        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/pc-updatemanager/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/pc-updatemanager/  
     46        -$(INSTALL_DIR) conf $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/pc-updatemanager/ 
    4547 
    4648 
    4749uninstall_conf:  FORCE 
    48         -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-updatemanager/conf 
    49         -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-updatemanager 
     50        -$(DEL_FILE) -r $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/pc-updatemanager/conf 
     51        -$(DEL_DIR) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/pc-updatemanager 
    5052 
    5153 
  • src-sh/pc-xdgutil/Makefile

    r1620346 rc60c604  
    33############################################################################# 
    44 
     5PREFIX?= /usr/local 
    56AR            = ar cqs 
    67RANLIB        =  
    7 QMAKE         = /usr/local/bin/qmake-qt4 
    88TAR           = tar -cf 
    99COMPRESS      = gzip -9f 
     
    2828 
    2929install_scripts: first FORCE 
    30         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/  
    31         -$(INSTALL_FILE) pc-xdgutil $(INSTALL_ROOT)/usr/local/bin/ 
     30        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
     31        -$(INSTALL_FILE) pc-xdgutil $(INSTALL_ROOT)$(PREFIX)/bin/ 
    3232 
    3333 
    3434uninstall_scripts:  FORCE 
    35         -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/bin/pc-xdgutil 
    36         -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/bin/  
     35        -$(DEL_FILE) -r $(INSTALL_ROOT)$(PREFIX)/bin/pc-xdgutil 
     36        -$(DEL_DIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
    3737 
    3838 
    3939install_dochmod: first FORCE 
    40         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/  
    41         chmod 755 /usr/local/bin/pc-xdgutil 
     40        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
     41        chmod 755 $(PREFIX)/bin/pc-xdgutil 
    4242 
    4343 
    4444install_ddirs: first FORCE 
    45         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-xdgutil/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-xdgutil/  
    46         -$(INSTALL_DIR) desktop-dirs $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-xdgutil/ 
     45        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/pc-xdgutil/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/pc-xdgutil/  
     46        -$(INSTALL_DIR) desktop-dirs $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/pc-xdgutil/ 
    4747 
    4848 
    4949uninstall_ddirs:  FORCE 
    50         -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-xdgutil/desktop-dirs 
    51         -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-xdgutil/  
     50        -$(DEL_FILE) -r $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/pc-xdgutil/desktop-dirs 
     51        -$(DEL_DIR) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/pc-xdgutil/  
    5252 
    5353 
    5454install_xdgmenu: first FORCE 
    55         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-xdgutil/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-xdgutil/  
    56         -$(INSTALL_FILE) menus/applications.menu $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-xdgutil/ 
    57         -$(INSTALL_FILE) menus/xfce-applications.menu $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-xdgutil/ 
     55        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/pc-xdgutil/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/pc-xdgutil/  
     56        -$(INSTALL_FILE) menus/applications.menu $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/pc-xdgutil/ 
     57        -$(INSTALL_FILE) menus/xfce-applications.menu $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/pc-xdgutil/ 
    5858 
    5959 
    6060uninstall_xdgmenu:  FORCE 
    61         -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-xdgutil/applications.menu  
    62          -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-xdgutil/xfce-applications.menu 
    63         -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-xdgutil/  
     61        -$(DEL_FILE) -r $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/pc-xdgutil/applications.menu  
     62         -$(DEL_FILE) -r $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/pc-xdgutil/xfce-applications.menu 
     63        -$(DEL_DIR) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/pc-xdgutil/  
    6464 
    6565install:  install_scripts install_dochmod install_ddirs install_xdgmenu  FORCE 
  • src-sh/port-files/Makefile

    r5e0ae79 rc60c604  
    2828CONFLICTS?=     pbi-manager-[0-9]* 
    2929NO_BUILD=       yes 
    30 NO_STAGE=       yes 
    3130USE_BZIP2=      yes 
    3231USE_PYTHON=     yes 
    33  
    34 MAN1=           pbi_add.1 pbi_browser.1 pbi_create.1 \ 
    35                 pbi_delete.1 \ 
    36                 pbi_icon.1 pbi_indextool.1 pbi_info.1 \ 
    37                 pbi_listrepo.1 pbi_update.1 \ 
    38                 pbi_metatool.1 \ 
    39                 pbi_patch.1 \ 
    40                 pbi_update_hashdir.1 
    41 MAN5=           pbi.conf.5 
    42 MAN8=           pbi_addrepo.8 pbi_autobuild.8 pbi_deleterepo.8 \ 
    43                 pbi_makepatch.8 pbi_makeport.8 pbi_makerepo.8 pbid.8 \ 
    44                 pc-sysinstall.8 
    4532 
    4633.include <bsd.port.pre.mk> 
    4734 
    4835do-install: 
    49         cd ${WRKSRC} && make install 
     36        cd ${WRKSRC} && make install PREFIX=$(STAGEDIR)$(PREFIX) 
    5037 
    5138post-install: 
    52         PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL 
     39        PKG_PREFIX=${STAGEDIR}${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL 
    5340 
    5441.include <bsd.port.post.mk> 
  • src-sh/port-files/pkg-install

    re128d77 rc60c604  
    55 
    66if [ "$2" != "POST-INSTALL" ] ; then 
     7   exit 0 
     8fi 
     9 
     10# If this is during staging, we can skip for now 
     11echo $PREFIX | grep -q '/stage/' 
     12if [ $? -eq 0 ] ; then 
    713   exit 0 
    814fi 
  • src-sh/port-files/pkg-plist

    r4023a66 rc60c604  
    625625share/pbi-manager/icons/patch.png 
    626626share/pbi-manager/pcbsd.rpo 
     627man/man1/pbi_add.1.gz 
     628man/man1/pbi_browser.1.gz 
     629man/man1/pbi_create.1.gz 
     630man/man1/pbi_delete.1.gz 
     631man/man1/pbi_icon.1.gz 
     632man/man1/pbi_indextool.1.gz 
     633man/man1/pbi_info.1.gz 
     634man/man1/pbi_listrepo.1.gz 
     635man/man1/pbi_update.1.gz 
     636man/man1/pbi_metatool.1.gz 
     637man/man1/pbi_patch.1.gz 
     638man/man1/pbi_update_hashdir.1.gz 
     639man/man5/pbi.conf.5.gz 
     640man/man8/pbi_addrepo.8.gz 
     641man/man8/pbi_autobuild.8.gz 
     642man/man8/pbi_deleterepo.8.gz 
     643man/man8/pbi_makepatch.8.gz 
     644man/man8/pbi_makeport.8.gz 
     645man/man8/pbi_makerepo.8.gz 
     646man/man8/pbid.8.gz 
     647man/man8/pc-sysinstall.8.gz 
    627648@dirrm share/pbi-manager/module-examples/firefox/resources 
    628649@dirrm share/pbi-manager/module-examples/firefox/scripts 
     
    655676@dirrm share/pc-sysinstall/examples 
    656677@dirrm share/pc-sysinstall 
    657 @dirrmtry share/pcbsd/icons 
    658678@dirrm share/pcbsd/metaset/trueos/File-Servers 
    659679@dirrm share/pcbsd/metaset/trueos/PostgreSQL 
     
    756776@dirrm share/lpreserver/backend 
    757777@dirrm share/lpreserver 
    758 @unexec rmdir /usr/pbi/.hashdir >/dev/null 2>/dev/null 
    759 @unexec rmdir /usr/pbi/share/applications >/dev/null 2>/dev/null 
    760 @unexec rmdir /usr/pbi/share/desktop-directories >/dev/null 2>/dev/null 
    761 @unexec rmdir /usr/pbi/share/icons/hicolor >/dev/null 2>/dev/null 
    762 @unexec rmdir /usr/pbi/share/icons >/dev/null 2>/dev/null 
    763 @unexec rmdir /usr/pbi/share/mime/packages >/dev/null 2>/dev/null 
    764 @unexec rmdir /usr/pbi/share/mime >/dev/null 2>/dev/null 
    765 @unexec rmdir /usr/pbi/share >/dev/null 2>/dev/null 
    766 @unexec rmdir /usr/pbi/etc/xdg/menus >/dev/null 2>/dev/null 
    767 @unexec rmdir /usr/pbi/etc/xdg >/dev/null 2>/dev/null 
    768 @unexec rmdir /usr/pbi/etc >/dev/null 2>/dev/null 
    769 @unexec rm /usr/pbi/.pbiwrapper-amd64 >/dev/null 2>/dev/null 
    770 @unexec rm /usr/pbi/.pbiwrapper-i386 >/dev/null 2>/dev/null 
    771 @unexec rmdir /usr/pbi >/dev/null 2>/dev/null 
  • src-sh/warden/Makefile

    r1620346 rc60c604  
    22# Makefile for building: warden  
    33############################################################################# 
     4 
     5PREFIX?= /usr/local 
    46 
    57####### Install 
     
    810 
    911install_doinstall: 
    10         sh install.sh 
     12        sh install.sh $(PREFIX) 
    1113 
    1214install:  install_doinstall 
  • src-sh/warden/install.sh

    r1620346 rc60c604  
    11#!/bin/sh 
    22# Warden install script 
    3 PROGDIR="/usr/local/share/warden" 
     3 
     4DEFAULT="/usr/local" 
     5 
     6if [ -z "$1" ] ; then 
     7        LB="${DEFAULT}" 
     8else 
     9        LB="${1}" 
     10fi 
     11 
     12PROGDIR="${LB}/share/warden" 
    413 
    514mkdir -p ${PROGDIR} >/dev/null 2>/dev/null 
     
    1120cd ${DIR} 
    1221 
    13 cp bin/warden /usr/local/bin/warden 
    14 chmod 755 /usr/local/bin/warden 
     22cp bin/warden ${LB}/bin/warden 
     23chmod 755 ${LB}/bin/warden 
    1524 
    1625# Save existing settings  
    17 if [ -e "/usr/local/etc/warden.conf" ] ; then 
    18   NIC=`grep '^NIC:' /usr/local/etc/warden.conf | awk '{print $2}'` 
    19   WTMP=`grep '^WTMP:' /usr/local/etc/warden.conf | awk '{print $2}'` 
    20   JDIR=`grep '^JDIR:' /usr/local/etc/warden.conf | awk '{print $2}'` 
     26if [ -e "${LB}/etc/warden.conf" ] ; then 
     27  NIC=`grep '^NIC:' ${LB}/etc/warden.conf | awk '{print $2}'` 
     28  WTMP=`grep '^WTMP:' ${LB}/etc/warden.conf | awk '{print $2}'` 
     29  JDIR=`grep '^JDIR:' ${LB}/etc/warden.conf | awk '{print $2}'` 
    2130  ONIC=`grep '^NIC:' conf/warden.conf` 
    2231  OWTMP=`grep '^WTMP:' conf/warden.conf` 
     
    2433fi 
    2534 
    26 cp conf/warden.conf /usr/local/etc/warden.conf 
    27 chmod 644 /usr/local/etc/warden.conf 
     35cp conf/warden.conf ${LB}/etc/warden.conf 
     36chmod 644 ${LB}/etc/warden.conf 
    2837 
    2938# Save the settings 
    3039if [ -n "$NIC" ] ; then 
    31    sed -i '' "s|$ONIC|NIC: $NIC|g" /usr/local/etc/warden.conf 
    32    sed -i '' "s|$OWTMP|WTMP: $WTMP|g" /usr/local/etc/warden.conf 
    33    sed -i '' "s|$OJDIR|JDIR: $JDIR|g" /usr/local/etc/warden.conf 
     40   sed -i '' "s|$ONIC|NIC: $NIC|g" ${LB}/etc/warden.conf 
     41   sed -i '' "s|$OWTMP|WTMP: $WTMP|g" ${LB}/etc/warden.conf 
     42   sed -i '' "s|$OJDIR|JDIR: $JDIR|g" ${LB}/etc/warden.conf 
    3443fi 
    3544 
     
    4756 
    4857# Setup rc.d 
    49 cp scripts/rc.d/wardenrc /usr/local/etc/rc.d/wardenrc 
    50 chmod 755 /usr/local/etc/rc.d/wardenrc 
     58cp scripts/rc.d/wardenrc ${LB}/etc/rc.d/wardenrc 
     59chmod 755 ${LB}/etc/rc.d/wardenrc 
    5160 
    5261cp agent.png ${PROGDIR}/ 
  • src-sh/xtrafiles/Makefile

    r1620346 rc60c604  
    22# Makefile for building: pc-extractoverlay 
    33############################################################################# 
     4 
     5PREFIX?= /usr/local 
    46 
    57####### Install 
     
    810 
    911install_doinstall: 
    10         sh install.sh 
     12        sh install.sh $(PREFIX) 
    1113 
    1214install:  install_doinstall 
  • src-sh/xtrafiles/install.sh

    r1620346 rc60c604  
    11#!/bin/sh 
    22 
     3DEFAULT="/usr/local" 
     4 
     5if [ -z "$1" ] ; then 
     6        LB="${DEFAULT}" 
     7else 
     8        LB="${1}" 
     9fi 
     10 
    311# Copy files to system 
    4 tar cvf - -C local . 2>/dev/null | tar xvf - -C /usr/local 
     12tar cvf - -C local . 2>/dev/null | tar xvf - -C ${LB} 
    513if [ $? -ne 0 ] ; then 
    614  exit 1 
Note: See TracChangeset for help on using the changeset viewer.