--- wikisrc/pkgsrc/intro_to_packaging.mdwn 2014/07/08 14:44:38 1.3 +++ wikisrc/pkgsrc/intro_to_packaging.mdwn 2014/07/08 14:52:13 1.4 @@ -92,7 +92,7 @@ long ago in pkgsrc-wip Makefile: -{% highlight make %} +[[!format make """ # [[!paste id=rcsid1]][[!paste id=rcsid2]] PKGNAME= osxinfo-0.1 @@ -113,7 +113,7 @@ WRKSRC= ${WRKDIR}/osxinfo-${GHCOMMIT} .include "../../databases/sqlite3/buildlink3.mk" .include "../../mk/bsd.pkg.mk" -{% endhighlight %} +"""]] DESCR: @@ -200,7 +200,7 @@ these targets, like The framework uses an `mk.conf` file, usually found in /etc. Here's how mine looks: -{% highlight make %} +[[!format make """ # Tue Oct 15 21:21:46 CEST 2013 .ifdef BSD_PKG_MK # begin pkgsrc settings @@ -232,7 +232,7 @@ PKG_DEVELOPER= yes SIGN_PACKAGES= gpg PKG_DEFAULT_OPTIONS+= -pulseaudio -x264 -imlib2-amd64 -dconf .endif # end pkgsrc settings -{% endhighlight %} +"""]] - I use `DISTDIR`, `PACKAGES`, `WRKOBJDIR` to move distfiles, packages and source files somewhere else to keep my pkgsrc tree @@ -316,7 +316,7 @@ on the program's homepage. Here's how they look like at the moment: Makefile: -{% highlight make %} +[[!format make """ # [[!paste id=rcsid1]][[!paste id=rcsid2]] DISTNAME= 2bwm-0.1 @@ -329,7 +329,7 @@ COMMENT= Fast floating WM written LICENSE= isc .include "../../mk/bsd.pkg.mk" -{% endhighlight %} +"""]] distinfo: @@ -399,7 +399,7 @@ in our Makefile. Clean, build again, and add more dependencies until it passes the build stage. Here's how my Makefile ends up looking like: -{% highlight make %} +[[!format make """ # [[!paste id=rcsid1]][[!paste id=rcsid2]] DISTNAME= 2bwm-0.1 @@ -416,7 +416,7 @@ LICENSE= isc .include "../../x11/xcb-util-keysyms/buildlink3.mk" .include "../../x11/xcb-util/buildlink3.mk" .include "../../mk/bsd.pkg.mk" -{% endhighlight %} +"""]] #### install phase @@ -456,7 +456,7 @@ how 2bwm installs: From 2bwm's Makefile: -{% highlight make %} +[[!format make """ install: $(TARGETS) test -d $(DESTDIR)$(PREFIX)/bin || mkdir -p $(DESTDIR)$(PREFIX)/bin install -pm 755 2bwm $(DESTDIR)$(PREFIX)/bin @@ -464,7 +464,7 @@ install: $(TARGETS) test -d $(DESTDIR)$(MANPREFIX)/man1 || mkdir -p $(DESTDIR)$(MANPREFIX)/man1 install -pm 644 2bwm.man $(DESTDIR)$(MANPREFIX)/man1/2bwm.1 install -pm 644 hidden.man $(DESTDIR)$(MANPREFIX)/man1/hidden.1 -{% endhighlight %} +"""]] This looks fine since it installs in a `DESTDIR`/`PREFIX` but it sets @@ -554,14 +554,14 @@ You should be able to fix the prefix err the patching explained above thanks to the sed substitution framework. Here's how it looks like in my port Makefile: -{% highlight make %} +[[!format make """ SUBST_CLASSES+= makefile SUBST_STAGE.makefile= pre-build SUBST_MESSAGE.makefile= Fixing makefile SUBST_FILES.makefile= Makefile SUBST_SED.makefile= -e 's,/usr/local,${PREFIX},g' SUBST_SED.makefile+= -e 's,share/man,${PKGMANDIR},g' -{% endhighlight %} +"""]] As you can see, you can do multiple commands on multiple files, it is very useful for very small fixes like this. @@ -617,7 +617,7 @@ You can also send me an email or talk to You can create port options with the `options.mk` file, like for `wm/dwm` -{% highlight make %} +[[!format make """ # [[!paste id=rcsid1]][[!paste id=rcsid2]] PKG_OPTIONS_VAR= PKG_OPTIONS.dwm @@ -642,7 +642,7 @@ SUBST_FILES.options= config.mk SUBST_SED.options+= -e '/^XINERAMA/d' . include "../../x11/libX11/buildlink3.mk" .endif -{% endhighlight %} +"""]] This file should be included in the Makefile: @@ -682,7 +682,7 @@ on a FreeBSD server with a bootstrapped I use this `zsh` function to : -{% highlight bash %} +[[!format make """ add () { # upload the package to remote server scp $1 yrmt@saveosx.org:/usr/local/www/saveosx/packages/Darwin/2013Q4/x86_64/All/ 2> /dev/null @@ -695,7 +695,7 @@ add () { # pkgin update sudo pkgin update } -{% endhighlight %} +"""]] - upload a package - update the package summary, which is an archive containing @@ -735,9 +735,9 @@ add () { And this shell alias to upload all my built packages, but I still need to run `add()` mentionned above to update the pkg_summary -{% highlight bash %} +[[!format bash """ up='rsync -avhz --progress /pkgsrc/packages/ root@saveosx.org:/usr/local/www/saveosx/packages/Darwin/2013Q4/x86_64/' -{% endhighlight %} +"""]] Then you should be able to set the url in repositories.conf to use your packages with pkgin. You can also install them directly with @@ -767,7 +767,7 @@ earlier like this: pkgsrc supports fetching archives from specific git commits on GitHub like this: -{% highlight make %} +[[!format make """ PKGNAME= 2bwm-0.1 CATEGORIES= wm GHCOMMIT= 52a097ca644eb571b22a135951c945fcca57a25c @@ -775,7 +775,7 @@ DISTNAME= ${GHCOMMIT} MASTER_SITES= https://github.com/venam/2bwm/archive/ DIST_SUBDIR= 2bwm WRKSRC= ${WRKDIR}/2bwm-${GHCOMMIT} -{% endhighlight %} +"""]] You can then easily update the git commit and the distinfo with it to update the program. @@ -786,24 +786,24 @@ You can do all Makefile operations direc like this: -{% highlight make %} +[[!format make """ post-extract: ${CHMOD} a-x ${WRKSRC}/elementary/apps/48/internet-mail.svg do-install: ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/icons cd ${WRKSRC} && pax -rw -pe . ${DESTDIR}${PREFIX}/share/icons/ -{% endhighlight %} +"""]] To install, but you can also build programs from the Makefile. This is what qt4-sqlite3 uses: -{% highlight make %} +[[!format make """ do-build: cd ${WRKSRC}/src/tools/bootstrap && env ${MAKE_ENV} ${GMAKE} cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE} cd ${WRKSRC}/src/plugins/sqldrivers/sqlite && env ${MAKE_ENV} ${GMAKE} -{% endhighlight %} +"""]] You can install the following type of files: