PopCorn: create /etc/popcorn only on make_dirs

for #660

srcpkgs/PopCorn/files/popcorn/conf

@@ -1,2 +0,0 @@
-SERVER=popcorn.voidlinux.org
-PORT=8001

srcpkgs/PopCorn/files/popcorn/run

@@ -2,7 +2,8 @@
 
 [ -r ./conf ] && . ./conf
 
-mkdir -p /etc/popcorn
-chown -R _popcorn:_popcorn /etc/popcorn
+: ${SERVER:=popcorn.voidlinux.org}
+: ${PORT:=8001}
+
 chpst -u _popcorn:_popcorn popcorn --server $SERVER --port $PORT
 exec chpst -u _popcorn:_popcorn snooze popcorn --server $SERVER --port $PORT

srcpkgs/PopCorn/files/pqueryd/conf

@@ -1,2 +0,0 @@
-PORT=8002
-DATA_DIR=/srv/www/popcorn/

srcpkgs/PopCorn/files/pqueryd/run

@@ -2,4 +2,7 @@
 
 [ -r ./conf ] && . ./conf
 
+: ${PORT=8002}
+: ${DATA_DIR=/srv/www/popcorn}
+
 exec chpst -u _popcorn:_popcorn pqueryd --checkpoint_enabled=false --port $PORT --data_dir $DATA_DIR

srcpkgs/PopCorn/files/statrepo/conf

@@ -1,2 +0,0 @@
-PORT=8001
-KEY=RESET_KEY

srcpkgs/PopCorn/files/statrepo/run

@@ -2,4 +2,7 @@
 
 [ -r ./conf ] && . ./conf
 
+: ${PORT=8001}
+: ${KEY=RESET_KEY}
+
 exec chpst -u _popcorn:_popcorn statrepo  --port $PORT --reset_key $KEY

srcpkgs/PopCorn/template

@@ -1,9 +1,9 @@
 # Template file for 'PopCorn'
 pkgname=PopCorn
 version=0.3
-revision=3
+revision=4
 build_style=go
-go_import_path="github.com/the-maldridge/popcorn"
+go_import_path=github.com/the-maldridge/popcorn
 go_package="${go_import_path}/cmd/popcorn
  ${go_import_path}/cmd/popcornctl
  ${go_import_path}/cmd/statrepo
@@ -19,9 +19,9 @@ checksum=5e61970c3ba5fd83f6b5b86c30264213461f4a5af8aacd2ba1757333ece05260
 
 system_accounts="_popcorn"
 _popcorn_homedir="/var/lib/popcorn"
-make_dirs="/var/lib/popcorn 0755 _popcorn _popcorn
+make_dirs="
+ /var/lib/popcorn 0755 _popcorn _popcorn
  /etc/popcorn 0755 _popcorn _popcorn"
-conf_files="/etc/sv/popcorn/conf"
 
 pre_build() {
 	cd $GOSRCPATH
@@ -39,8 +39,7 @@ post_install() {
 PopCorn-Server_package() {
 	short_desc+=" - Server"
 	depends="${sourcepkg}>=${version}_${revision}"
-	conf_files="/etc/sv/statrepo/conf
-	 /etc/sv/pqueryd/conf"
+	make_dirs="/srv/www/popcorn 0755 _popcorn _popcorn"
 	pkg_install() {
 		vmove usr/bin/statrepo
 		vmove usr/bin/popcornctl